8 Commits

Author SHA1 Message Date
  Emery Hemingway 9b04ebedde server7: update yggdrasil peers 1 month ago
  Emery Hemingway c66946030e server7: generate new hardware-configuration.nix 2 months ago
  Emery Hemingway 449a8175f3 server7: aarch64 emulation 2 months ago
  Emery Hemingway 5238abc7a7 server7: disable ceph mount 2 months ago
  Emery Hemingway 59a85a3f3d Update flake inputs 3 months ago
  Emery Hemingway 91078207fb server7: uncomment systemd.services.docker-ceph-osd-7.serviceConfig 2 months ago
  Emery Hemingway f55081d081 Update glotzbert ssh key 2 months ago
  Emery Hemingway 7e01c98da2 server7: docker-containers.ceph-osd-7? 3 months ago
5 changed files with 139 additions and 123 deletions
  1. 20
    45
      flake.lock
  2. 9
    15
      flake.nix
  3. 1
    1
      host-registry.nix
  4. 51
    7
      hosts/server7/default.nix
  5. 58
    55
      hosts/server7/hardware-configuration.nix

+ 20
- 45
flake.lock View File

@@ -1,39 +1,33 @@
1 1
 {
2 2
   "nodes": {
3 3
     "hydra": {
4
-      "info": {
5
-        "lastModified": 1587883324,
6
-        "narHash": "sha256-WQxv9rrG2HX8j2UfXjifeBkMjgea3uIAEB3Swv+IIus="
7
-      },
8 4
       "inputs": {
9 5
         "nix": "nix",
10 6
         "nixpkgs": "nixpkgs_2"
11 7
       },
12 8
       "locked": {
13
-        "owner": "ehmry",
9
+        "lastModified": 1593509723,
10
+        "narHash": "sha256-ESv86LNnQQy5cYqeC1S4otpvkA8ABgs/zbge8xp35aE=",
11
+        "owner": "NixOS",
14 12
         "repo": "hydra",
15
-        "rev": "e93c36aab1bf96cf392ab0e40157b0620638b599",
13
+        "rev": "d0deebc4fc95dbeb0249f7b774b03d366596fbed",
16 14
         "type": "github"
17 15
       },
18 16
       "original": {
19
-        "owner": "ehmry",
20
-        "ref": "sotest",
21
-        "repo": "hydra",
22
-        "type": "github"
17
+        "id": "hydra",
18
+        "type": "indirect"
23 19
       }
24 20
     },
25 21
     "nix": {
26
-      "info": {
27
-        "lastModified": 1586440843,
28
-        "narHash": "sha256-7YxrpRPmAOoCSl6KtepKCXcae5MUm1Pl+lwDunBFGoo="
29
-      },
30 22
       "inputs": {
31 23
         "nixpkgs": "nixpkgs"
32 24
       },
33 25
       "locked": {
26
+        "lastModified": 1592818267,
27
+        "narHash": "sha256-t66Ny6NDA9sQa0U79iqo4w7tEBitUGgio9U/H6z3QpE=",
34 28
         "owner": "NixOS",
35 29
         "repo": "nix",
36
-        "rev": "3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef",
30
+        "rev": "334e26bfc2ce82912602e8a0f9f9c7e0fb5c3221",
37 31
         "type": "github"
38 32
       },
39 33
       "original": {
@@ -42,14 +36,12 @@
42 36
       }
43 37
     },
44 38
     "nixpkgs": {
45
-      "info": {
46
-        "lastModified": 1585405475,
47
-        "narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE="
48
-      },
49 39
       "locked": {
40
+        "lastModified": 1591633336,
41
+        "narHash": "sha256-oVXv4xAnDJB03LvZGbC72vSVlIbbJr8tpjEW5o/Fdek=",
50 42
         "owner": "NixOS",
51 43
         "repo": "nixpkgs",
52
-        "rev": "b88ff468e9850410070d4e0ccd68c7011f15b2be",
44
+        "rev": "70717a337f7ae4e486ba71a500367cad697e5f09",
53 45
         "type": "github"
54 46
       },
55 47
       "original": {
@@ -59,14 +51,12 @@
59 51
       }
60 52
     },
61 53
     "nixpkgs_2": {
62
-      "info": {
63
-        "lastModified": 1586219474,
64
-        "narHash": "sha256-fvfrMnEA2lDnXvH/eInGV5i0sO/EGLVHa4pOek8VG78="
65
-      },
66 54
       "locked": {
55
+        "lastModified": 1592263354,
56
+        "narHash": "sha256-1wHPn5qKfzfG06dZhpXDEg5Zt6HwvfyPPgW1tkYFejg=",
67 57
         "owner": "NixOS",
68 58
         "repo": "nixpkgs",
69
-        "rev": "29eddfc36d720dcc4822581175217543b387b1e8",
59
+        "rev": "a84b797b28eb104db758b5cb2b61ba8face6744b",
70 60
         "type": "github"
71 61
       },
72 62
       "original": {
@@ -75,31 +65,16 @@
75 65
         "type": "indirect"
76 66
       }
77 67
     },
78
-    "nixpkgs_3": {
79
-      "info": {
80
-        "lastModified": 1586724123,
81
-        "narHash": "sha256-VQ7zZy2xpz6dULpjar4jxNaQ0N/2q68l+EYO2nXaXDo="
82
-      },
83
-      "locked": {
84
-        "owner": "nixos",
85
-        "repo": "nixpkgs-channels",
86
-        "rev": "708cb6b307b04ad862cc50de792e57e7a4a8bb5a",
87
-        "type": "github"
88
-      },
89
-      "original": {
90
-        "owner": "nixos",
91
-        "ref": "nixos-20.03",
92
-        "repo": "nixpkgs-channels",
93
-        "type": "github"
94
-      }
95
-    },
96 68
     "root": {
97 69
       "inputs": {
98 70
         "hydra": "hydra",
99
-        "nixpkgs": "nixpkgs_3"
71
+        "nixpkgs": [
72
+          "hydra",
73
+          "nixpkgs"
74
+        ]
100 75
       }
101 76
     }
102 77
   },
103 78
   "root": "root",
104
-  "version": 5
79
+  "version": 7
105 80
 }

+ 9
- 15
flake.nix View File

@@ -1,27 +1,21 @@
1 1
 {
2 2
   description = "C3D2 NixOS configurations";
3 3
 
4
-  edition = 201909;
5
-
6
-  inputs.nixpkgs.url = "github:nixos/nixpkgs-channels/nixos-20.03";
7
-  inputs.hydra.url = "github:ehmry/hydra/sotest";
4
+  inputs = {
5
+    nixpkgs.follows = "hydra/nixpkgs";
6
+    # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
7
+    # secrets.url = "git+file:///etc/nixos/secrets";
8
+  };
8 9
 
9 10
   outputs = { self, nixpkgs, hydra }: {
10 11
 
11 12
     nixosConfigurations = {
12 13
 
13 14
       server7 = nixpkgs.lib.nixosSystem {
14
-        modules = [ ./hosts/server7 hydra.nixosModules.hydra ];
15
-        system = "x86_64-linux";
16
-      };
17
-
18
-      hydra = nixpkgs.lib.nixosSystem {
19
-        modules = [ ./hosts/hydra/configuration.nix ];
20
-        system = "x86_64-linux";
21
-      };
22
-
23
-      pulsebert = nixpkgs.lib.nixosSystem {
24
-        modules = [ ./hosts/pulsebert/configuration.nix ];
15
+        modules = [
16
+          ./hosts/server7
17
+          hydra.nixosModules.hydra
18
+        ];
25 19
         system = "x86_64-linux";
26 20
       };
27 21
 

+ 1
- 1
host-registry.nix View File

@@ -9,7 +9,7 @@ rec {
9 9
     ledstripes = {};
10 10
 
11 11
     glotzbert.publicKey =
12
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHPrkD07abpTU/66fEjmiMYsUfJCSF62MVFe8BED7wu4";
12
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAnEWn/8CKIiCtehh6Ha3XUQqjODj0ygyo3aGAsFWgfG";
13 13
 
14 14
     hydra.publicKey =
15 15
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhurL/sxsXRglKdLfiWIcK+iqpyhGrGt/MoBODsgvig";

+ 51
- 7
hosts/server7/default.nix View File

@@ -13,8 +13,10 @@ in {
13 13
     ./nix-serve.nix
14 14
   ];
15 15
 
16
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
17
+
16 18
   security.acme = {
17
-    email = " mail@c3d2.de";
19
+    email = "mail@c3d2.de";
18 20
     acceptTerms = true;
19 21
   };
20 22
 
@@ -32,7 +34,8 @@ in {
32 34
   };
33 35
 
34 36
   fileSystems."/srv/ceph" = {
35
-    device = "172.22.99.13:6789:/";
37
+    #device = "172.22.99.13:6789:/";
38
+    device = "172.20.72.53:6789:/";
36 39
     fsType = "ceph";
37 40
     options = [
38 41
       "name=storage2"
@@ -45,20 +48,39 @@ in {
45 48
     ];
46 49
   };
47 50
 
51
+  fileSystems."/var/lib/ceph/osd/ceph-7" = { fsType = "tmpfs"; };
52
+
48 53
   # Route IPv6
49 54
   boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
50 55
   # Obtain global IPv6 despite being a router myself
51
-  boot.kernel.sysctl."net.ipv6.conf.eth0.accept_ra" = 2;
56
+  boot.kernel.sysctl."net.ipv6.conf.br0.accept_ra" = 2;
52 57
 
53 58
   services.yggdrasil = {
54 59
     enable = true;
55 60
     configFile = "/var/lib/yggdrasil/keys";
56 61
     config = {
57 62
       Peers = [
58
-        "tcp://[2a03:3b40:fe:ab::1]:46370" # Praha
59
-        "tcp://ygg.thingylabs.io:443" # Nürnberg
60
-        "tcp://176.223.130.120:22632" # Wrocław
61
-        "tcp://[2a05:9403::8b]:7743" # Praha
63
+
64
+        # Deutschland
65
+        "tcp://45.11.19.26:5001"
66
+        "tcp://82.165.69.111:61216"
67
+        "tcp://[2001:8d8:1800:8224::1]:61216"
68
+
69
+        # Czechia
70
+        "tcp://195.123.245.146:7743"
71
+        "tcp://37.205.14.171:46370"
72
+        "tcp://[2a03:3b40:fe:ab::1]:46370"
73
+        "tcp://[2a05:9403::8b]:7743"
74
+
75
+        # Poland
76
+        "tcp://176.223.130.120:22632"
77
+        "tcp://51.75.44.73:50001"
78
+        "tcp://54.37.137.221:37145"
79
+        "tcp://[2001:41d0:601:1100::cf2]:37145"
80
+        "tcp://n2o.ddns.net:22632"
81
+        "tls://54.37.137.221:14987"
82
+        "tls://[2001:41d0:601:1100::cf2]:14987"
83
+
62 84
       ];
63 85
       NodeInfo = {
64 86
         location = "Dresden";
@@ -100,6 +122,22 @@ in {
100 122
 
101 123
   virtualisation.docker.enable = true;
102 124
 
125
+  docker-containers.ceph-osd-7 = {
126
+    cmd = [ "ceph-osd" "-i" "7" "--setuser" "ceph" "--setgroup" "ceph" "-d" ];
127
+    environment = { OSD_DEVICE = "/dev/sdb"; };
128
+    image = "ceph/ceph:v14.2.9";
129
+    log-driver = "journald";
130
+    extraDockerOptions =
131
+      [ "--rm" "--net=host" "--ipc=host" "--privileged=true" ];
132
+    volumes =
133
+      [ "/dev:/dev" "/etc/ceph:/etc/ceph" "/var/lib/ceph/:/var/lib/ceph" ];
134
+  };
135
+  systemd.services.docker-ceph-osd-7.serviceConfig = {
136
+    ExecStartPre = [
137
+      "-${pkgs.docker}/bin/docker run --rm --net=host --ipc=host --privileged=true -v /dev:/dev -v /etc/ceph:/etc/ceph -v /var/lib/ceph/:/var/lib/ceph -e OSD_DEVICE=/dev/sdb -it ceph/ceph:v14.2.9 ceph-volume lvm activate --all"
138
+    ];
139
+  };
140
+
103 141
   networking = {
104 142
     firewall.enable = false;
105 143
     firewall.trustedInterfaces = [ "br0" ];
@@ -167,4 +205,10 @@ in {
167 205
     # allow the old hydra to build here
168 206
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7HuDlyTlPC4rCjwhklY8kiYIxdgPhiu6wxs29ksnpKZmJa2R7qoD02N3ACm9cTb1GVkIWukAXI3KvU9h08+WLQJqUH0cHVBj3V1sDYmkN2QecE59gz3e1gfN3zPtwmQEUe6xvHWK3X3qdH45pGPUtxk1eDTZl45037C0NClWF7RXI4m6UXng4bL9wnPvoVqCI+ySsNWaTkHDLE/D9s/VrqGxJ1w2KiJb1F73g9/x/zjL8Ixb16wkPmLE0e50MQAQa7EMFTyPZoEskFnEviLYXM9pDexABAjJfbfZ39lLyMgVYGwnzEDbjDlm68dE6wQWUY1OV6wbt8uYreB2IRrlb root@hydra"
169 207
   ];
208
+
209
+  services.dhcpd4 = {
210
+    enable = false;
211
+    interfaces = [ "br0" ];
212
+    extraConfig = "not authoritative;";
213
+  };
170 214
 }

+ 58
- 55
hosts/server7/hardware-configuration.nix View File

@@ -1,45 +1,39 @@
1 1
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
2 2
 # and may be overwritten by future invocations.  Please make changes
3 3
 # to /etc/nixos/configuration.nix instead.
4
-{ config, lib, pkgs, ... }:
4
+{ config, lib, pkgs, modulesPath, ... }:
5 5
 
6 6
 {
7
-  # imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
7
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
8 8
 
9 9
   boot.initrd.availableKernelModules =
10 10
     [ "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
11
-  boot.initrd.kernelModules = [ ];
11
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
12 12
   boot.kernelModules = [ "kvm-intel" ];
13 13
   boot.extraModulePackages = [ ];
14
-  boot.supportedFilesystems = [ "zfs" ];
15 14
 
16 15
   fileSystems."/" = {
17 16
     device = "/dev/disk/by-uuid/f14628ce-0f13-4544-9197-0ddda291f48f";
18 17
     fsType = "ext4";
19 18
   };
20 19
 
20
+  fileSystems."/var/lib/ceph/osd/ceph-7" = {
21
+    device = "tmpfs";
22
+    fsType = "tmpfs";
23
+  };
24
+
21 25
   fileSystems."/boot" = {
22 26
     device = "/dev/disk/by-uuid/9812-00B2";
23 27
     fsType = "vfat";
24 28
   };
25 29
 
26
-  fileSystems."/zones/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3/cores" = {
27
-    device = "nvme0n1/cores/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3";
28
-    fsType = "zfs";
29
-  };
30
-
31 30
   fileSystems."/nvme0n1" = {
32 31
     device = "nvme0n1";
33 32
     fsType = "zfs";
34 33
   };
35 34
 
36
-  fileSystems."/zones/9f467f1e-000b-e771-e117-b32261e48220/cores" = {
37
-    device = "nvme0n1/cores/9f467f1e-000b-e771-e117-b32261e48220";
38
-    fsType = "zfs";
39
-  };
40
-
41
-  fileSystems."/zones/archive" = {
42
-    device = "nvme0n1/archive";
35
+  fileSystems."/zones/b090f14b-0a60-4451-e82a-c5291e5951de/cores" = {
36
+    device = "nvme0n1/cores/b090f14b-0a60-4451-e82a-c5291e5951de";
43 37
     fsType = "zfs";
44 38
   };
45 39
 
@@ -48,23 +42,18 @@
48 42
     fsType = "zfs";
49 43
   };
50 44
 
51
-  fileSystems."/zones/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5/cores" = {
52
-    device = "nvme0n1/cores/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5";
53
-    fsType = "zfs";
54
-  };
55
-
56
-  fileSystems."/zones/global/cores" = {
57
-    device = "nvme0n1/cores/global";
45
+  fileSystems."/zones/archive" = {
46
+    device = "nvme0n1/archive";
58 47
     fsType = "zfs";
59 48
   };
60 49
 
61
-  fileSystems."/zones/b090f14b-0a60-4451-e82a-c5291e5951de/cores" = {
62
-    device = "nvme0n1/cores/b090f14b-0a60-4451-e82a-c5291e5951de";
50
+  fileSystems."/zones/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5/cores" = {
51
+    device = "nvme0n1/cores/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5";
63 52
     fsType = "zfs";
64 53
   };
65 54
 
66
-  fileSystems."/zones/3516ab22-69b0-e327-95ec-f9be8852ee44/cores" = {
67
-    device = "nvme0n1/cores/3516ab22-69b0-e327-95ec-f9be8852ee44";
55
+  fileSystems."/zones/9f467f1e-000b-e771-e117-b32261e48220/cores" = {
56
+    device = "nvme0n1/cores/9f467f1e-000b-e771-e117-b32261e48220";
68 57
     fsType = "zfs";
69 58
   };
70 59
 
@@ -73,23 +62,23 @@
73 62
     fsType = "zfs";
74 63
   };
75 64
 
76
-  fileSystems."/nvme0n1/c3d2.de" = {
77
-    device = "nvme0n1/c3d2.de";
65
+  fileSystems."/zones/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3/cores" = {
66
+    device = "nvme0n1/cores/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3";
78 67
     fsType = "zfs";
79 68
   };
80 69
 
81
-  fileSystems."/nvme0n1/b090f14b-0a60-4451-e82a-c5291e5951de" = {
82
-    device = "nvme0n1/b090f14b-0a60-4451-e82a-c5291e5951de";
70
+  fileSystems."/zones/3516ab22-69b0-e327-95ec-f9be8852ee44/cores" = {
71
+    device = "nvme0n1/cores/3516ab22-69b0-e327-95ec-f9be8852ee44";
83 72
     fsType = "zfs";
84 73
   };
85 74
 
86
-  fileSystems."/nvme0n1/55bcd862-bb70-11e9-9991-7b9a40d4e95f" = {
87
-    device = "nvme0n1/55bcd862-bb70-11e9-9991-7b9a40d4e95f";
75
+  fileSystems."/zones/global/cores" = {
76
+    device = "nvme0n1/cores/global";
88 77
     fsType = "zfs";
89 78
   };
90 79
 
91
-  fileSystems."/nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d" = {
92
-    device = "nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d";
80
+  fileSystems."/nvme0n1/c3d2.de" = {
81
+    device = "nvme0n1/c3d2.de";
93 82
     fsType = "zfs";
94 83
   };
95 84
 
@@ -98,18 +87,18 @@
98 87
     fsType = "zfs";
99 88
   };
100 89
 
101
-  fileSystems."/nvme0n1/c3d2.de/admin" = {
102
-    device = "nvme0n1/c3d2.de/admin";
90
+  fileSystems."/nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317" = {
91
+    device = "nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317";
103 92
     fsType = "zfs";
104 93
   };
105 94
 
106
-  fileSystems."/nvme0n1/c3d2.de/templates" = {
107
-    device = "nvme0n1/c3d2.de/templates";
95
+  fileSystems."/nvme0n1/b090f14b-0a60-4451-e82a-c5291e5951de" = {
96
+    device = "nvme0n1/b090f14b-0a60-4451-e82a-c5291e5951de";
108 97
     fsType = "zfs";
109 98
   };
110 99
 
111
-  fileSystems."/nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89" = {
112
-    device = "nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89";
100
+  fileSystems."/nvme0n1/55bcd862-bb70-11e9-9991-7b9a40d4e95f" = {
101
+    device = "nvme0n1/55bcd862-bb70-11e9-9991-7b9a40d4e95f";
113 102
     fsType = "zfs";
114 103
   };
115 104
 
@@ -118,13 +107,8 @@
118 107
     fsType = "zfs";
119 108
   };
120 109
 
121
-  fileSystems."/nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75" = {
122
-    device = "nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75";
123
-    fsType = "zfs";
124
-  };
125
-
126
-  fileSystems."/nvme0n1/9f467f1e-000b-e771-e117-b32261e48220" = {
127
-    device = "nvme0n1/9f467f1e-000b-e771-e117-b32261e48220";
110
+  fileSystems."/nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d" = {
111
+    device = "nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d";
128 112
     fsType = "zfs";
129 113
   };
130 114
 
@@ -133,8 +117,8 @@
133 117
     fsType = "zfs";
134 118
   };
135 119
 
136
-  fileSystems."/nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317" = {
137
-    device = "nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317";
120
+  fileSystems."/nvme0n1/9f467f1e-000b-e771-e117-b32261e48220" = {
121
+    device = "nvme0n1/9f467f1e-000b-e771-e117-b32261e48220";
138 122
     fsType = "zfs";
139 123
   };
140 124
 
@@ -143,8 +127,8 @@
143 127
     fsType = "zfs";
144 128
   };
145 129
 
146
-  fileSystems."/nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9" = {
147
-    device = "nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9";
130
+  fileSystems."/nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89" = {
131
+    device = "nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89";
148 132
     fsType = "zfs";
149 133
   };
150 134
 
@@ -153,11 +137,31 @@
153 137
     fsType = "zfs";
154 138
   };
155 139
 
140
+  fileSystems."/nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9" = {
141
+    device = "nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9";
142
+    fsType = "zfs";
143
+  };
144
+
156 145
   fileSystems."/nvme0n1/63d6e664-3f1f-11e8-aef6-a3120cf8dd9d" = {
157 146
     device = "nvme0n1/63d6e664-3f1f-11e8-aef6-a3120cf8dd9d";
158 147
     fsType = "zfs";
159 148
   };
160 149
 
150
+  fileSystems."/nvme0n1/c3d2.de/admin" = {
151
+    device = "nvme0n1/c3d2.de/admin";
152
+    fsType = "zfs";
153
+  };
154
+
155
+  fileSystems."/nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75" = {
156
+    device = "nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75";
157
+    fsType = "zfs";
158
+  };
159
+
160
+  fileSystems."/nvme0n1/c3d2.de/templates" = {
161
+    device = "nvme0n1/c3d2.de/templates";
162
+    fsType = "zfs";
163
+  };
164
+
161 165
   fileSystems."/nvme0n1/e71d4460-8eef-6623-a875-dd5ec20b650f" = {
162 166
     device = "nvme0n1/e71d4460-8eef-6623-a875-dd5ec20b650f";
163 167
     fsType = "zfs";
@@ -170,7 +174,6 @@
170 174
 
171 175
   swapDevices = [ ];
172 176
 
173
-  nix.maxJobs = lib.mkDefault 10;
174
-  nix.buildCores = lib.mkDefault 40;
175
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
177
+  nix.maxJobs = lib.mkDefault 40;
178
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
176 179
 }

Loading…
Cancel
Save