diff --git a/hosts/server7/hardware-configuration.nix b/hosts/server7/hardware-configuration.nix index e198467f..0f87d7fa 100644 --- a/hosts/server7/hardware-configuration.nix +++ b/hosts/server7/hardware-configuration.nix @@ -1,70 +1,59 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, modulesPath, ... }: { - # imports = [ ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - boot.supportedFilesystems = [ "zfs" ]; fileSystems."/" = { device = "/dev/disk/by-uuid/f14628ce-0f13-4544-9197-0ddda291f48f"; fsType = "ext4"; }; + fileSystems."/var/lib/ceph/osd/ceph-7" = { + device = "tmpfs"; + fsType = "tmpfs"; + }; + fileSystems."/boot" = { device = "/dev/disk/by-uuid/9812-00B2"; fsType = "vfat"; }; - fileSystems."/zones/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3/cores" = { - device = "nvme0n1/cores/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3"; - fsType = "zfs"; - }; - fileSystems."/nvme0n1" = { device = "nvme0n1"; fsType = "zfs"; }; - fileSystems."/zones/9f467f1e-000b-e771-e117-b32261e48220/cores" = { - device = "nvme0n1/cores/9f467f1e-000b-e771-e117-b32261e48220"; - fsType = "zfs"; - }; - - fileSystems."/zones/archive" = { - device = "nvme0n1/archive"; - fsType = "zfs"; - }; - - fileSystems."/zones/9a9880d3-82db-c500-fcaa-d4e5a5cc617d/cores" = { - device = "nvme0n1/cores/9a9880d3-82db-c500-fcaa-d4e5a5cc617d"; - fsType = "zfs"; - }; - - fileSystems."/zones/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5/cores" = { - device = "nvme0n1/cores/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5"; - fsType = "zfs"; - }; - - fileSystems."/zones/global/cores" = { - device = "nvme0n1/cores/global"; - fsType = "zfs"; - }; - fileSystems."/zones/b090f14b-0a60-4451-e82a-c5291e5951de/cores" = { device = "nvme0n1/cores/b090f14b-0a60-4451-e82a-c5291e5951de"; fsType = "zfs"; }; - fileSystems."/zones/3516ab22-69b0-e327-95ec-f9be8852ee44/cores" = { - device = "nvme0n1/cores/3516ab22-69b0-e327-95ec-f9be8852ee44"; + fileSystems."/zones/9a9880d3-82db-c500-fcaa-d4e5a5cc617d/cores" = { + device = "nvme0n1/cores/9a9880d3-82db-c500-fcaa-d4e5a5cc617d"; + fsType = "zfs"; + }; + + fileSystems."/zones/archive" = { + device = "nvme0n1/archive"; + fsType = "zfs"; + }; + + fileSystems."/zones/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5/cores" = { + device = "nvme0n1/cores/eec98403-5f4f-cadf-f4ff-aa9a99b4cdb5"; + fsType = "zfs"; + }; + + fileSystems."/zones/9f467f1e-000b-e771-e117-b32261e48220/cores" = { + device = "nvme0n1/cores/9f467f1e-000b-e771-e117-b32261e48220"; fsType = "zfs"; }; @@ -73,11 +62,36 @@ fsType = "zfs"; }; + fileSystems."/zones/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3/cores" = { + device = "nvme0n1/cores/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3"; + fsType = "zfs"; + }; + + fileSystems."/zones/3516ab22-69b0-e327-95ec-f9be8852ee44/cores" = { + device = "nvme0n1/cores/3516ab22-69b0-e327-95ec-f9be8852ee44"; + fsType = "zfs"; + }; + + fileSystems."/zones/global/cores" = { + device = "nvme0n1/cores/global"; + fsType = "zfs"; + }; + fileSystems."/nvme0n1/c3d2.de" = { device = "nvme0n1/c3d2.de"; fsType = "zfs"; }; + fileSystems."/nvme0n1/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3" = { + device = "nvme0n1/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3"; + fsType = "zfs"; + }; + + fileSystems."/nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317" = { + device = "nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317"; + fsType = "zfs"; + }; + fileSystems."/nvme0n1/b090f14b-0a60-4451-e82a-c5291e5951de" = { device = "nvme0n1/b090f14b-0a60-4451-e82a-c5291e5951de"; fsType = "zfs"; @@ -88,43 +102,13 @@ fsType = "zfs"; }; - fileSystems."/nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d" = { - device = "nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d"; - fsType = "zfs"; - }; - - fileSystems."/nvme0n1/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3" = { - device = "nvme0n1/9c31e6c7-97ee-e757-b5e8-d4f07a25bdc3"; - fsType = "zfs"; - }; - - fileSystems."/nvme0n1/c3d2.de/admin" = { - device = "nvme0n1/c3d2.de/admin"; - fsType = "zfs"; - }; - - fileSystems."/nvme0n1/c3d2.de/templates" = { - device = "nvme0n1/c3d2.de/templates"; - fsType = "zfs"; - }; - - fileSystems."/nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89" = { - device = "nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89"; - fsType = "zfs"; - }; - fileSystems."/nvme0n1/a9786e8b-fce2-7567-6467-2a95086a51d4" = { device = "nvme0n1/a9786e8b-fce2-7567-6467-2a95086a51d4"; fsType = "zfs"; }; - fileSystems."/nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75" = { - device = "nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75"; - fsType = "zfs"; - }; - - fileSystems."/nvme0n1/9f467f1e-000b-e771-e117-b32261e48220" = { - device = "nvme0n1/9f467f1e-000b-e771-e117-b32261e48220"; + fileSystems."/nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d" = { + device = "nvme0n1/9a9880d3-82db-c500-fcaa-d4e5a5cc617d"; fsType = "zfs"; }; @@ -133,8 +117,8 @@ fsType = "zfs"; }; - fileSystems."/nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317" = { - device = "nvme0n1/b28b36ed-1824-3a6c-cdbb-258c7dd63317"; + fileSystems."/nvme0n1/9f467f1e-000b-e771-e117-b32261e48220" = { + device = "nvme0n1/9f467f1e-000b-e771-e117-b32261e48220"; fsType = "zfs"; }; @@ -143,8 +127,8 @@ fsType = "zfs"; }; - fileSystems."/nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9" = { - device = "nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9"; + fileSystems."/nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89" = { + device = "nvme0n1/d5a8bfc2-6d01-6d5e-ad3f-edf032eedd89"; fsType = "zfs"; }; @@ -153,11 +137,31 @@ fsType = "zfs"; }; + fileSystems."/nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9" = { + device = "nvme0n1/0cc567e5-5e4c-1868-eca3-4426508cbfb9"; + fsType = "zfs"; + }; + fileSystems."/nvme0n1/63d6e664-3f1f-11e8-aef6-a3120cf8dd9d" = { device = "nvme0n1/63d6e664-3f1f-11e8-aef6-a3120cf8dd9d"; fsType = "zfs"; }; + fileSystems."/nvme0n1/c3d2.de/admin" = { + device = "nvme0n1/c3d2.de/admin"; + fsType = "zfs"; + }; + + fileSystems."/nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75" = { + device = "nvme0n1/3e65fa50-2f41-8792-df46-8c826bddab75"; + fsType = "zfs"; + }; + + fileSystems."/nvme0n1/c3d2.de/templates" = { + device = "nvme0n1/c3d2.de/templates"; + fsType = "zfs"; + }; + fileSystems."/nvme0n1/e71d4460-8eef-6623-a875-dd5ec20b650f" = { device = "nvme0n1/e71d4460-8eef-6623-a875-dd5ec20b650f"; fsType = "zfs"; @@ -170,7 +174,6 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 10; - nix.buildCores = lib.mkDefault 40; - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; + nix.maxJobs = lib.mkDefault 40; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; }