summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/skadhi/fs.nix1
-rw-r--r--hosts/skadhi/hw.nix2
-rw-r--r--hosts/skadhi/networking/default.nix8
-rw-r--r--hosts/vidhar/zfs.nix2
4 files changed, 11 insertions, 2 deletions
diff --git a/hosts/skadhi/fs.nix b/hosts/skadhi/fs.nix
index 64d49f7d..73191aa9 100644
--- a/hosts/skadhi/fs.nix
+++ b/hosts/skadhi/fs.nix
@@ -62,6 +62,7 @@
62 mkdir $out 62 mkdir $out
63 install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") (dirs ++ subvols)} 63 install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") (dirs ++ subvols)}
64 install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted} 64 install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted}
65 ln -s /etc/zoneinfo/UTC /persistent/etc/localtime
65 '')) 66 ''))
66 ] ++ lib.concatMap (p: ["--subvol" p]) (subvols ++ restricted); 67 ] ++ lib.concatMap (p: ["--subvol" p]) (subvols ++ restricted);
67 subvolumes = { 68 subvolumes = {
diff --git a/hosts/skadhi/hw.nix b/hosts/skadhi/hw.nix
index ad353208..687f04d8 100644
--- a/hosts/skadhi/hw.nix
+++ b/hosts/skadhi/hw.nix
@@ -5,7 +5,7 @@
5 ]; 5 ];
6 6
7 config = { 7 config = {
8 hardware.framework.laptop13.audioEnhancement.enable = true; 8 hardware.framework.laptop13.audioEnhancement.enable = false;
9 hardware.enableRedistributableFirmware = true; 9 hardware.enableRedistributableFirmware = true;
10 services.fstrim.enable = false; 10 services.fstrim.enable = false;
11 11
diff --git a/hosts/skadhi/networking/default.nix b/hosts/skadhi/networking/default.nix
index ea5a62e2..4d6edd97 100644
--- a/hosts/skadhi/networking/default.nix
+++ b/hosts/skadhi/networking/default.nix
@@ -26,5 +26,13 @@
26 useDHCP = false; 26 useDHCP = false;
27 useNetworkd = true; 27 useNetworkd = true;
28 }; 28 };
29
30 environment.etc."NetworkManager/dnsmasq.d/yggdrasil.conf" = {
31 text = ''
32 server=/yggdrasil/2a03:4000:52:ada:1:1::@yggdrasil
33 server=/141.10.in-addr.arpa/2a03:4000:52:ada:1:1::@yggdrasil
34 server=/1.0.0.0.a.d.a.0.2.5.0.0.0.0.0.4.3.0.a.2.ip6.arpa/2a03:4000:52:ada:1:1::@yggdrasil
35 '';
36 };
29 }; 37 };
30} 38}
diff --git a/hosts/vidhar/zfs.nix b/hosts/vidhar/zfs.nix
index 4b009c0d..62bf1fd1 100644
--- a/hosts/vidhar/zfs.nix
+++ b/hosts/vidhar/zfs.nix
@@ -128,7 +128,7 @@ with lib;
128 users.users.gkleen.createHome = lib.mkForce false; 128 users.users.gkleen.createHome = lib.mkForce false;
129 users.users.mherold.createHome = lib.mkForce false; 129 users.users.mherold.createHome = lib.mkForce false;
130 130
131 systemd.generators."zfs-mount-generator" = "${config.boot.zfs.package}/lib/systemd/system-generator/zfs-mount-generator"; 131 # systemd.generators."zfs-mount-generator" = "${config.boot.zfs.package}/lib/systemd/system-generator/zfs-mount-generator";
132 environment.etc."zfs/zed.d/history_event-zfs-list-cacher.sh".source = "${config.boot.zfs.package}/etc/zfs/zed.d/history_event-zfs-list-cacher.sh"; 132 environment.etc."zfs/zed.d/history_event-zfs-list-cacher.sh".source = "${config.boot.zfs.package}/etc/zfs/zed.d/history_event-zfs-list-cacher.sh";
133 systemd.services.zfs-mount.enable = false; 133 systemd.services.zfs-mount.enable = false;
134 134