diff options
Diffstat (limited to 'modules/private')
-rw-r--r-- | modules/private/system.nix | 3 | ||||
-rw-r--r-- | modules/private/system/dilion.nix | 14 | ||||
-rw-r--r-- | modules/private/system/eldiron.nix | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/modules/private/system.nix b/modules/private/system.nix index 8c7a6f3..b667ee8 100644 --- a/modules/private/system.nix +++ b/modules/private/system.nix | |||
@@ -61,6 +61,9 @@ | |||
61 | 61 | ||
62 | pkgs.cnagios | 62 | pkgs.cnagios |
63 | nagios-cli | 63 | nagios-cli |
64 | |||
65 | pkgs.pv | ||
66 | pkgs.smartmontools | ||
64 | ]; | 67 | ]; |
65 | }; | 68 | }; |
66 | 69 | ||
diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix index ca9a052..14155ef 100644 --- a/modules/private/system/dilion.nix +++ b/modules/private/system/dilion.nix | |||
@@ -5,6 +5,19 @@ | |||
5 | boot.kernelPackages = pkgs.linuxPackages_latest; | 5 | boot.kernelPackages = pkgs.linuxPackages_latest; |
6 | myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; }; | 6 | myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; }; |
7 | 7 | ||
8 | fileSystems = { | ||
9 | "/" = lib.mkForce { fsType = "zfs"; device = "zpool/root"; }; | ||
10 | "/boot" = { fsType = "ext4"; device = "/dev/disk/by-uuid/fd1c511e-2bc0-49d5-b8bb-95e7e8c8c816"; }; | ||
11 | "/etc" = { fsType = "zfs"; device = "zpool/root/etc"; }; | ||
12 | "/home" = { fsType = "zfs"; device = "zpool/root/home"; }; | ||
13 | "/home/immae" = { fsType = "zfs"; device = "zpool/root/home/immae"; }; | ||
14 | "/tmp" = { fsType = "zfs"; device = "zpool/root/tmp"; }; | ||
15 | "/var" = { fsType = "zfs"; device = "zpool/root/var"; }; | ||
16 | }; | ||
17 | boot.initrd.secrets = { | ||
18 | "/boot/pass.key" = "/boot/pass.key"; | ||
19 | }; | ||
20 | |||
8 | networking = { | 21 | networking = { |
9 | hostId = "27c3048d"; # generated with head -c4 /dev/urandom | od -A none -t x4 | 22 | hostId = "27c3048d"; # generated with head -c4 /dev/urandom | od -A none -t x4 |
10 | firewall.enable = false; | 23 | firewall.enable = false; |
@@ -82,6 +95,7 @@ | |||
82 | install -m 0755 -o root -g root -d /var/lib/caldance | 95 | install -m 0755 -o root -g root -d /var/lib/caldance |
83 | ''; | 96 | ''; |
84 | virtualisation.docker.enable = true; | 97 | virtualisation.docker.enable = true; |
98 | virtualisation.docker.storageDriver = "zfs"; | ||
85 | virtualisation.libvirtd.enable = true; | 99 | virtualisation.libvirtd.enable = true; |
86 | users.extraUsers.immae.extraGroups = [ "libvirtd" "docker" ]; | 100 | users.extraUsers.immae.extraGroups = [ "libvirtd" "docker" ]; |
87 | systemd.services.libvirtd.postStart = '' | 101 | systemd.services.libvirtd.postStart = '' |
diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix index 3fa78a4..8a5d11c 100644 --- a/modules/private/system/eldiron.nix +++ b/modules/private/system/eldiron.nix | |||
@@ -119,7 +119,7 @@ | |||
119 | fsType = "fuse"; | 119 | fsType = "fuse"; |
120 | options = [ "force-user=pub" "create-for-user=wwwrun" "create-for-group=wwwrun" ]; | 120 | options = [ "force-user=pub" "create-for-user=wwwrun" "create-for-group=wwwrun" ]; |
121 | }; | 121 | }; |
122 | environment.systemPackages = [ pkgs.bindfs pkgs.pv pkgs.smartmontools ]; | 122 | environment.systemPackages = [ pkgs.bindfs ]; |
123 | 123 | ||
124 | # This value determines the NixOS release with which your system is | 124 | # This value determines the NixOS release with which your system is |
125 | # to be compatible, in order to avoid breaking some software such as | 125 | # to be compatible, in order to avoid breaking some software such as |