glotzbert: upgrade machine

hosts/glotzbert/default.nix

@@ -19,18 +19,16 @@
     defaultSopsFile = ./secrets.yaml;
   };
 
-  boot = {
+  boot.loader = {
-    loader = {
+    efi.canTouchEfiVariables = true;
-      efi.canTouchEfiVariables = true;
+    systemd-boot.enable = true;
-      systemd-boot.enable = true;
-    };
-    kernelPackages = pkgs.linuxPackages_latest;
   };
 
   networking = {
     domain = "hq.c3d2.de";
+    hostId = "42424242";
     hostName = "glotzbert";
-    interfaces.eno1.useDHCP = true;
+    interfaces.enp0s25.useDHCP = true;
   };
 
   console = {
@@ -134,5 +132,5 @@
     extraGroups = [ "networkmanager" ];
   };
 
-  system.stateVersion = "18.09"; # Did you read the comment?
+  system.stateVersion = "22.11"; # Did you read the comment?
 }

hosts/glotzbert/hardware-configuration.nix

@@ -1,28 +1,92 @@
 # 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.
-{ lib, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
-    [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" "nct6775" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/3a8ddd25-0c5d-4fec-b957-bdcea1c52db4";
+    { device = "glotzbert/data";
-    fsType = "ext4";
+      fsType = "zfs";
-    options = [ "relatime" "discard" ];
+      options = [ "zfsutil" ];
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/etc" =
-    device = "/dev/disk/by-uuid/6490-45A0";
+    { device = "glotzbert/data/etc";
-    fsType = "vfat";
+      fsType = "zfs";
-  };
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/home" =
+    { device = "glotzbert/data/home";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/var" =
+    { device = "glotzbert/data/var";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/var/backup" =
+    { device = "glotzbert/data/var/backup";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/var/lib" =
+    { device = "glotzbert/data/var/lib";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "glotzbert/data/var/log";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "glotzbert/nixos/nix";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/nix/store" =
+    { device = "glotzbert/nixos/nix/store";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/nix/var" =
+    { device = "glotzbert/nixos/nix/var";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/9A1D-A4FF";
+      fsType = "vfat";
+    };
 
   swapDevices = [ ];
 
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }