move more modules

flake.nix

@@ -116,6 +116,10 @@
           modules = [
             {
               networking.hostName = device;
+              nixpkgs = {
+                inherit system;
+                hostPlatform = lib.mkDefault system;
+              };
               system = {
                 stateVersion = "22.11";
                 autoUpgrade.flake = "git+https://git.berlin.ccc.de/vinzenz/nixos-configuration.git";
@@ -176,6 +180,8 @@
             self.nixosModules.gnome
             self.nixosModules.modern-desktop
             self.nixosModules.nix-ld
+            self.nixosModules.quiet-boot
+            self.nixosModules.systemd-boot
 
             home-manager.nixosModules.home-manager
             servicepoint-simulator.nixosModules.default

modules/desktop-hardware.nix

@@ -1,48 +1,20 @@
+{ lib, ... }:
 {
-  lib,
+  networking.networkmanager.enable = true;
-  pkgs,
+  # 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`.
-  config = {
+  networking.useDHCP = lib.mkDefault true;
-    boot = {
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-      kernelPackages = pkgs.linuxPackages_zen;
+  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
-      kernelParams = [
-        "quiet"
-        "udev.log_level=3"
-      ];
-      supportedFilesystems = [ "btrfs" ];
-      initrd.supportedFilesystems = [ "btrfs" ];
-      consoleLogLevel = 0;
-      initrd.verbose = false;
-      plymouth.enable = true;
-      loader = {
-        timeout = 3;
-        efi.canTouchEfiVariables = true;
-        systemd-boot = {
-          enable = true;
-          editor = false; # do not allow changing kernel parameters
-          consoleMode = "max";
-        };
-      };
-    };
 
-    networking.networkmanager.enable = true;
+  hardware = {
-    # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+    enableRedistributableFirmware = true;
-    # (the default) this is the recommended approach. When using systemd-networkd it's
+    bluetooth.enable = true;
-    # 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.eno1.useDHCP = lib.mkDefault true;
-    # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
-
-    hardware = {
-      enableRedistributableFirmware = true;
-      bluetooth.enable = true;
-    };
-
-    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-    services.fwupd.enable = true;
   };
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  services.fwupd.enable = true;
 }

nixosConfigurations/forgejo-runner-1/hardware.nix

@@ -3,11 +3,6 @@
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   config = {
-    nixpkgs = {
-      hostPlatform = "aarch64-linux";
-      system = "aarch64-linux";
-    };
-
     boot = {
       tmp.cleanOnBoot = true;
       kernelParams = [ "console=tty" ];

nixosConfigurations/hetzner-vpn2/hardware.nix

@@ -3,11 +3,6 @@
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   config = {
-    nixpkgs = {
-      hostPlatform = "aarch64-linux";
-      system = "aarch64-linux";
-    };
-
     boot = {
       tmp.cleanOnBoot = true;
       kernelParams = [ "console=tty" ];

nixosConfigurations/ronja-pc/hardware.nix

@@ -1,6 +1,7 @@
-{ lib, ... }:
 {
   boot = {
+    supportedFilesystems = [ "btrfs" ];
+    initrd.supportedFilesystems = [ "btrfs" ];
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
     initrd = {
@@ -37,6 +38,5 @@
     { device = "/dev/disk/by-uuid/bf9d19fb-499b-4bfb-b67d-131fa5bf8259"; }
   ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = true;
 }

nixosConfigurations/vinzenz-lpt2/hardware.nix

@@ -1,4 +1,9 @@
-{ lib, vinzenzNixosModules, ... }:
+{
+  lib,
+  vinzenzNixosModules,
+  pkgs,
+  ...
+}:
 {
   imports = [ vinzenzNixosModules.intel-graphics ];
   config = {
@@ -9,11 +14,6 @@
     ];
     hardware.cpu.intel.updateMicrocode = true;
 
-    boot.loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-
     # 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
@@ -22,17 +22,20 @@
 
     hardware.enableRedistributableFirmware = true;
 
-    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    boot = {
-
+      kernelPackages = pkgs.linuxPackages_zen;
-    boot.initrd = {
+      supportedFilesystems = [ "btrfs" ];
-      availableKernelModules = [
+      initrd = {
-        "xhci_pci"
+        supportedFilesystems = [ "btrfs" ];
-        "thunderbolt"
+        availableKernelModules = [
-        "nvme"
+          "xhci_pci"
-      ];
+          "thunderbolt"
-      luks.devices = {
+          "nvme"
-        "luks-2c654ff2-3c42-48d3-a1e3-9545679afaa3" = {
+        ];
-          device = "/dev/disk/by-uuid/2c654ff2-3c42-48d3-a1e3-9545679afaa3";
+        luks.devices = {
+          "luks-2c654ff2-3c42-48d3-a1e3-9545679afaa3" = {
+            device = "/dev/disk/by-uuid/2c654ff2-3c42-48d3-a1e3-9545679afaa3";
+          };
         };
       };
     };

nixosConfigurations/vinzenz-pc2/hardware.nix

@@ -1,4 +1,4 @@
-{ vinzenzNixosModules, ... }:
+{ vinzenzNixosModules, pkgs, ... }:
 {
   imports = [ vinzenzNixosModules.amd-graphics ];
   config = {
@@ -14,6 +14,9 @@
         "usbhid"
         "sd_mod"
       ]; # "usb_storage"
+      kernelPackages = pkgs.linuxPackages_zen;
+      supportedFilesystems = [ "btrfs" ];
+      initrd.supportedFilesystems = [ "btrfs" ];
       loader.efi.efiSysMountPoint = "/boot";
     };
 

nixosModules/quiet-boot.nix

@@ -0,0 +1,11 @@
+{
+  boot = {
+    kernelParams = [
+      "quiet"
+      "udev.log_level=3"
+    ];
+    consoleLogLevel = 0;
+    initrd.verbose = false;
+    plymouth.enable = true;
+  };
+}

nixosModules/systemd-boot.nix

@@ -0,0 +1,11 @@
+{
+  boot.loader = {
+    timeout = 3;
+    efi.canTouchEfiVariables = true;
+    systemd-boot = {
+      enable = true;
+      editor = false; # do not allow changing kernel parameters
+      consoleMode = "max";
+    };
+  };
+}