diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-01-12 21:46:24 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-01-12 21:46:43 +0100 |
| commit | d75d0895fa329a265a296e37390e4fba8a312d7d (patch) | |
| tree | d5225195c1973a224ac7715c6a5bdb5c8855e9bc /hosts | |
| parent | 42b25e8ef134f39433ba1693b62bc29f0c572ad1 (diff) | |
| download | nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar.gz nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar.bz2 nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar.xz nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.zip | |
...
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/surtr/default.nix | 10 | ||||
| -rw-r--r-- | hosts/surtr/tls.nix | 2 | ||||
| -rw-r--r-- | hosts/vidhar/default.nix | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix index da8b82f7..8554d112 100644 --- a/hosts/surtr/default.nix +++ b/hosts/surtr/default.nix | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | { flake, pkgs, lib, ... }: | 1 | { flake, pkgs, lib, ... }: |
| 2 | { | 2 | { |
| 3 | imports = with flake.nixosModules.systemProfiles; [ | 3 | imports = with flake.nixosModules.systemProfiles; [ |
| 4 | qemu-guest openssh rebuild-machines ./zfs.nix ./dns ./tls.nix | 4 | qemu-guest openssh rebuild-machines zfs |
| 5 | ./zfs.nix ./dns ./tls.nix | ||
| 5 | ]; | 6 | ]; |
| 6 | 7 | ||
| 7 | config = { | 8 | config = { |
| @@ -19,15 +20,10 @@ | |||
| 19 | device = "/dev/vda"; | 20 | device = "/dev/vda"; |
| 20 | }; | 21 | }; |
| 21 | 22 | ||
| 22 | kernelPackages = pkgs.linuxPackages_latest; | ||
| 23 | 23 | ||
| 24 | tmpOnTmpfs = true; | 24 | tmpOnTmpfs = true; |
| 25 | 25 | ||
| 26 | supportedFilesystems = [ "zfs" ]; | 26 | zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id |
| 27 | zfs = { | ||
| 28 | enableUnstable = true; | ||
| 29 | devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id | ||
| 30 | }; | ||
| 31 | 27 | ||
| 32 | kernelModules = ["ptp_kvm"]; | 28 | kernelModules = ["ptp_kvm"]; |
| 33 | }; | 29 | }; |
diff --git a/hosts/surtr/tls.nix b/hosts/surtr/tls.nix index e05cbdd9..6a1d6f84 100644 --- a/hosts/surtr/tls.nix +++ b/hosts/surtr/tls.nix | |||
| @@ -56,7 +56,7 @@ in { | |||
| 56 | security.acme = { | 56 | security.acme = { |
| 57 | acceptTerms = true; | 57 | acceptTerms = true; |
| 58 | preliminarySelfsigned = true; # DNS challenge is slow | 58 | preliminarySelfsigned = true; # DNS challenge is slow |
| 59 | email = "phikeebaogobaegh@141.li"; | 59 | defaults.email = "phikeebaogobaegh@141.li"; |
| 60 | certs = | 60 | certs = |
| 61 | let | 61 | let |
| 62 | domainAttrset = domain: { | 62 | domainAttrset = domain: { |
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix index 47afc9fe..395476bf 100644 --- a/hosts/vidhar/default.nix +++ b/hosts/vidhar/default.nix | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | device = "/dev/disk/by-id/ata-SuperMicro_SSD_SMC0515D95019BDF4083"; | 22 | device = "/dev/disk/by-id/ata-SuperMicro_SSD_SMC0515D95019BDF4083"; |
| 23 | }; | 23 | }; |
| 24 | 24 | ||
| 25 | kernelPackages = pkgs.linuxPackages_latest; | ||
| 26 | kernelModules = [ "kvm-intel" ]; | 25 | kernelModules = [ "kvm-intel" ]; |
| 27 | 26 | ||
| 28 | kernelParams = [ | 27 | kernelParams = [ |
| @@ -50,11 +49,6 @@ | |||
| 50 | 49 | ||
| 51 | network.flushBeforeStage2 = false; | 50 | network.flushBeforeStage2 = false; |
| 52 | }; | 51 | }; |
| 53 | |||
| 54 | supportedFilesystems = [ "zfs" ]; | ||
| 55 | zfs = { | ||
| 56 | enableUnstable = true; | ||
| 57 | }; | ||
| 58 | }; | 52 | }; |
| 59 | 53 | ||
| 60 | fileSystems = { | 54 | fileSystems = { |