diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2021-04-25 21:32:09 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2021-04-25 21:32:09 +0200 |
| commit | 3fa860e679df07c3cf41c8cb27a92f5539488f81 (patch) | |
| tree | 7aa6f90398daa77c40c5d417281ab8ae16da142f | |
| parent | 09686180a35c7065171690f8df87759fb4279498 (diff) | |
| download | nixos-3fa860e679df07c3cf41c8cb27a92f5539488f81.tar nixos-3fa860e679df07c3cf41c8cb27a92f5539488f81.tar.gz nixos-3fa860e679df07c3cf41c8cb27a92f5539488f81.tar.bz2 nixos-3fa860e679df07c3cf41c8cb27a92f5539488f81.tar.xz nixos-3fa860e679df07c3cf41c8cb27a92f5539488f81.zip | |
ymir: ...
| -rw-r--r-- | ymir.nix | 4 | ||||
| -rw-r--r-- | ymir/hw.nix | 28 |
2 files changed, 26 insertions, 6 deletions
| @@ -38,6 +38,9 @@ in rec { | |||
| 38 | ./utils/nix/module.nix | 38 | ./utils/nix/module.nix |
| 39 | ]; | 39 | ]; |
| 40 | 40 | ||
| 41 | networking.hostId = "34f0d2df"; | ||
| 42 | environment.etc."machine-id".text = "34f0d2df31f8634d8c08d47b15419d26"; | ||
| 43 | |||
| 41 | boot.loader.grub = { | 44 | boot.loader.grub = { |
| 42 | enable = true; | 45 | enable = true; |
| 43 | version = 2; | 46 | version = 2; |
| @@ -1024,6 +1027,7 @@ in rec { | |||
| 1024 | 1027 | ||
| 1025 | security.dhparams = { | 1028 | security.dhparams = { |
| 1026 | enable = true; | 1029 | enable = true; |
| 1030 | stateful = false; | ||
| 1027 | params = { | 1031 | params = { |
| 1028 | nginx.bits = 3072; | 1032 | nginx.bits = 3072; |
| 1029 | "postfix-512".bits = 512; | 1033 | "postfix-512".bits = 512; |
diff --git a/ymir/hw.nix b/ymir/hw.nix index 3ddf1035..a208e114 100644 --- a/ymir/hw.nix +++ b/ymir/hw.nix | |||
| @@ -15,25 +15,41 @@ | |||
| 15 | 15 | ||
| 16 | fileSystems."/" = | 16 | fileSystems."/" = |
| 17 | { | 17 | { |
| 18 | device = "/dev/disk/by-label/ymir-root"; | 18 | label = "ymir-root"; |
| 19 | fsType = "ext4"; | 19 | fsType = "ext4"; |
| 20 | }; | 20 | }; |
| 21 | 21 | ||
| 22 | fileSystems."/boot" = | 22 | fileSystems."/boot" = |
| 23 | { | 23 | { |
| 24 | device = "/dev/disk/by-label/ymir-boot"; | 24 | label = "ymir-boot"; |
| 25 | fsType = "ext2"; | 25 | fsType = "ext2"; |
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | fileSystems."/home" = | 28 | fileSystems."/home" = |
| 29 | { | 29 | { |
| 30 | device = "/dev/disk/by-label/ymir-home"; | 30 | label = "ymir-home"; |
| 31 | fsType = "ext4"; | ||
| 32 | }; | ||
| 33 | |||
| 34 | fileSystems."/nix" = | ||
| 35 | { | ||
| 36 | label = "ymir-nix"; | ||
| 31 | fsType = "ext4"; | 37 | fsType = "ext4"; |
| 32 | }; | 38 | }; |
| 33 | 39 | ||
| 34 | swapDevices = | 40 | fileSystems."/root" = |
| 35 | [ { device = "/dev/disk/by-label/ymir-swap"; } | 41 | { |
| 36 | ]; | 42 | label = "ymir-home--root"; |
| 43 | fsType = "ext4"; | ||
| 44 | }; | ||
| 45 | |||
| 46 | fileSystems."/srv" = | ||
| 47 | { | ||
| 48 | label = "ymir-srv"; | ||
| 49 | fsType = "ext4"; | ||
| 50 | }; | ||
| 51 | |||
| 52 | swapDevices = []; | ||
| 37 | 53 | ||
| 38 | nix.maxJobs = 2; | 54 | nix.maxJobs = 2; |
| 39 | } | 55 | } |