diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2024-10-20 21:11:51 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2024-10-20 21:11:51 +0200 |
commit | eb0d6a1274f98de0448a9ddb466e2e30d1721895 (patch) | |
tree | d2fef406e8a1e3f9ebf85a29afac322de365f367 /system-profiles | |
parent | f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2 (diff) | |
download | nixos-eb0d6a1274f98de0448a9ddb466e2e30d1721895.tar nixos-eb0d6a1274f98de0448a9ddb466e2e30d1721895.tar.gz nixos-eb0d6a1274f98de0448a9ddb466e2e30d1721895.tar.bz2 nixos-eb0d6a1274f98de0448a9ddb466e2e30d1721895.tar.xz nixos-eb0d6a1274f98de0448a9ddb466e2e30d1721895.zip |
...
Diffstat (limited to 'system-profiles')
-rw-r--r-- | system-profiles/bcachefs.nix | 5 | ||||
-rw-r--r-- | system-profiles/networkmanager.nix | 4 | ||||
-rw-r--r-- | system-profiles/zfs.nix | 9 |
3 files changed, 8 insertions, 10 deletions
diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix index 65de9f7e..f9f048b9 100644 --- a/system-profiles/bcachefs.nix +++ b/system-profiles/bcachefs.nix | |||
@@ -1,7 +1,6 @@ | |||
1 | { config, pkgs, ... } : { | 1 | { pkgs, ... } : { |
2 | config = { | 2 | config = { |
3 | boot.supportedFilesystems = [ "bcachefs" ]; | 3 | boot.supportedFilesystems.bcachefs = true; |
4 | |||
5 | environment.systemPackages = with pkgs; [ bcachefs-tools ]; | 4 | environment.systemPackages = with pkgs; [ bcachefs-tools ]; |
6 | }; | 5 | }; |
7 | } | 6 | } |
diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix index bc5fd5ff..335b5653 100644 --- a/system-profiles/networkmanager.nix +++ b/system-profiles/networkmanager.nix | |||
@@ -10,7 +10,7 @@ with lib; | |||
10 | dhcp = "internal"; | 10 | dhcp = "internal"; |
11 | dns = mkForce "dnsmasq"; | 11 | dns = mkForce "dnsmasq"; |
12 | logLevel = "INFO"; | 12 | logLevel = "INFO"; |
13 | settings.connectivity.url = "https://online.yggdrasil.li"; | 13 | settings.connectivity.url = "https://online.yggdrasil.li"; |
14 | }; | 14 | }; |
15 | }; | 15 | }; |
16 | 16 | ||
@@ -18,7 +18,5 @@ with lib; | |||
18 | systemd.services."systemd-networkd-wait-online".enable = mkForce false; | 18 | systemd.services."systemd-networkd-wait-online".enable = mkForce false; |
19 | 19 | ||
20 | services.resolved.enable = false; | 20 | services.resolved.enable = false; |
21 | |||
22 | environment.noXlibs = false; | ||
23 | }; | 21 | }; |
24 | } | 22 | } |
diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix index 148cbb7b..49386363 100644 --- a/system-profiles/zfs.nix +++ b/system-profiles/zfs.nix | |||
@@ -1,9 +1,10 @@ | |||
1 | { config, pkgs, ... } : { | 1 | { pkgs, lib, ... } : { |
2 | config = { | 2 | config = { |
3 | boot = { | 3 | boot = { |
4 | kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; | 4 | kernelPackages = pkgs.linuxPackages_6_10; |
5 | supportedFilesystems = [ "zfs" ]; | 5 | zfs.package = pkgs.zfs_2_2; |
6 | zfs.package = pkgs.zfs_unstable; | 6 | |
7 | supportedFilesystems.zfs = true; | ||
7 | }; | 8 | }; |
8 | 9 | ||
9 | environment.systemPackages = with pkgs; [ httm ]; | 10 | environment.systemPackages = with pkgs; [ httm ]; |