diff options
Diffstat (limited to 'system-profiles')
-rw-r--r-- | system-profiles/bcachefs.nix | 12 | ||||
-rw-r--r-- | system-profiles/core/default.nix | 8 | ||||
-rw-r--r-- | system-profiles/lanzaboote.nix | 14 | ||||
-rw-r--r-- | system-profiles/nfsroot.nix | 4 | ||||
-rw-r--r-- | system-profiles/zfs.nix | 2 |
5 files changed, 29 insertions, 11 deletions
diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix index f9f048b9..ebb14b62 100644 --- a/system-profiles/bcachefs.nix +++ b/system-profiles/bcachefs.nix | |||
@@ -1,6 +1,16 @@ | |||
1 | { pkgs, ... } : { | 1 | { pkgs, lib, ... } : { |
2 | config = { | 2 | config = { |
3 | boot.supportedFilesystems.bcachefs = true; | 3 | boot.supportedFilesystems.bcachefs = true; |
4 | environment.systemPackages = with pkgs; [ bcachefs-tools ]; | 4 | environment.systemPackages = with pkgs; [ bcachefs-tools ]; |
5 | |||
6 | boot.kernelPatches = [ | ||
7 | { | ||
8 | name = "bcachefs-casefold-fix"; | ||
9 | patch = null; | ||
10 | extraStructuredConfig = with lib.kernel; { | ||
11 | UNICODE = lib.mkOverride 90 no; | ||
12 | }; | ||
13 | } | ||
14 | ]; | ||
5 | }; | 15 | }; |
6 | } | 16 | } |
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix index 229a007e..e5f9dc16 100644 --- a/system-profiles/core/default.nix +++ b/system-profiles/core/default.nix | |||
@@ -180,13 +180,7 @@ in { | |||
180 | }; | 180 | }; |
181 | environment.systemPackages = with pkgs; [ git-annex scutiger ]; | 181 | environment.systemPackages = with pkgs; [ git-annex scutiger ]; |
182 | } | 182 | } |
183 | ] ++ (optional (options ? system.switch.enableNg) { | 183 | ] ++ (optional (options ? system.rebuild.enableNg) { |
184 | system.switch = lib.mkDefault { | ||
185 | enable = false; | ||
186 | enableNg = true; | ||
187 | }; | ||
188 | }) | ||
189 | ++ (optional (options ? system.rebuild.enableNg) { | ||
190 | system.rebuild.enableNg = lib.mkDefault true; | 184 | system.rebuild.enableNg = lib.mkDefault true; |
191 | }) | 185 | }) |
192 | ++ (optional (options ? services.userborn) { | 186 | ++ (optional (options ? services.userborn) { |
diff --git a/system-profiles/lanzaboote.nix b/system-profiles/lanzaboote.nix new file mode 100644 index 00000000..f1e179cf --- /dev/null +++ b/system-profiles/lanzaboote.nix | |||
@@ -0,0 +1,14 @@ | |||
1 | { flakeInputs, pkgs, ... }: | ||
2 | { | ||
3 | imports = [ | ||
4 | flakeInputs.lanzaboote.nixosModules.lanzaboote | ||
5 | ]; | ||
6 | |||
7 | config = { | ||
8 | environment.systemPackages = [ pkgs.sbctl ]; | ||
9 | boot.lanzaboote = { | ||
10 | enable = true; | ||
11 | pkiBundle = "/var/lib/sbctl"; | ||
12 | }; | ||
13 | }; | ||
14 | } | ||
diff --git a/system-profiles/nfsroot.nix b/system-profiles/nfsroot.nix index b0116d61..e3dc2d2e 100644 --- a/system-profiles/nfsroot.nix +++ b/system-profiles/nfsroot.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { config, options, pkgs, lib, flake, flakeInputs, ... }: | 1 | { config, options, pkgs, lib, flake, ... }: |
2 | 2 | ||
3 | with lib; | 3 | with lib; |
4 | 4 | ||
@@ -86,7 +86,7 @@ in { | |||
86 | mkdir -p /mnt-root/etc/ | 86 | mkdir -p /mnt-root/etc/ |
87 | cp /etc/resolv.conf /mnt-root/etc/resolv.conf | 87 | cp /etc/resolv.conf /mnt-root/etc/resolv.conf |
88 | ''; | 88 | ''; |
89 | networking.useDHCP = true; | 89 | networking.useDHCP = mkImageMediaOverride true; |
90 | networking.resolvconf.enable = false; | 90 | networking.resolvconf.enable = false; |
91 | networking.dhcpcd.persistent = true; | 91 | networking.dhcpcd.persistent = true; |
92 | 92 | ||
diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix index a93dddd2..af9f1c17 100644 --- a/system-profiles/zfs.nix +++ b/system-profiles/zfs.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { pkgs, lib, ... } : { | 1 | { config, pkgs, lib, ... } : { |
2 | config = { | 2 | config = { |
3 | boot = { | 3 | boot = { |
4 | kernelPackages = pkgs.linuxPackages_6_12; | 4 | kernelPackages = pkgs.linuxPackages_6_12; |