florian.richer/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Big refactor #1

Merged
florian.richer merged 15 commits from main-refactor into main 2024-05-28 10:12:33 +02:00
Conversation 0 Commits 15 Files changed 84 +9 -5
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 36ae7b2141 - Show all commits

2
hosts/nixos-test/default.nix
View file

@ -50,7 +50,7 @@
system = { system = {
bluetooth.enable = true; bluetooth.enable = true;
gamingKernel.enable = true; gamingKernel.enable = true;
# keymaps.layout = "fr"; keymaps.layout = "us";
nvidia.enable = true; nvidia.enable = true;
pipewire.enable = true; pipewire.enable = true;
plymouth.enable = true; plymouth.enable = true;

2
modules/system/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
./bluetooth ./bluetooth
./gamingKernel ./gamingKernel
# ./keymaps ./keymaps
./nvidia ./nvidia
./pipewire ./pipewire
./plymouth ./plymouth

10
modules/system/keymaps/default.nix
View file

@ -12,8 +12,12 @@ in
description = '' description = ''
Set key layout (fr, us) Set key layout (fr, us)
''; '';
type = types.string; type = types.str;
}; };
}; };
config = (import ./${cfg.layout}.nix {}); config = mkMerge [
} (mkIf (cfg.layout == "fr") (import ./fr.nix {}))
(mkIf (cfg.layout == "us") (import ./us.nix {}))
];
}