Browse Source

server7: generate new hardware-configuration.nix

master
Emery Hemingway 2 months ago
parent
commit
c66946030e
1 changed files with 58 additions and 55 deletions
  1. 58
    55
      hosts/server7/hardware-configuration.nix

+ 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