Merge pull request #26 from michaelvanstraten/modularies-nixos-config…

…urations

Refactor nixosConfigurations and introduce nixosModules

flake.nix

@@ -48,7 +48,8 @@
     {
       darwinConfigurations = import ./darwinConfigurations { inherit inputs nix-darwin home-manager; };
 
-      nixosConfigurations = import ./nixosConfigurations { inherit inputs nixpkgs; };
+      nixosConfigurations = import ./nixosConfigurations { inherit self inputs nixpkgs; };
+      nixosModules = import ./nixosModules { inherit nixpkgs; };
     }
     // flake-utils.lib.eachDefaultSystem (
       system:

nixosConfigurations/default.nix

@@ -1,11 +1,18 @@
-{ inputs, nixpkgs, ... }:
+{
+  inputs,
+  self,
+  nixpkgs,
+  nixosModules ? self.nixosModules,
+  disko ? inputs.disko,
+  ...
+}:
 let
   inherit (nixpkgs.lib) nixosSystem;
 
   defaultArgs = {
     specialArgs = {
       make-disk-image = import "${nixpkgs}/nixos/lib/make-disk-image.nix";
-      inherit inputs;
+      inherit disko nixosModules;
     };
   };
 

nixosConfigurations/hosts/h2946065/configuration.nix

@@ -1,13 +1,17 @@
-{ pkgs, ... }:
+{ nixosModules, pkgs, ... }:
 {
-  imports = [
-    ../../modules
-    ../../modules/hardware/libvirtd.nix
+  imports = with nixosModules; [
+    hardware.libvirtd
+    nix
+    ssh
+    users
     ./virtual-disk-MBR.nix
   ];
 
   networking.hostName = "h2946065";
 
+  console.keyMap = "de";
+
   nixpkgs.hostPlatform = "x86_64-linux";
 
   services.openssh = {

nixosConfigurations/hosts/h2946065/virtual-disk-MBR.nix

@@ -1,6 +1,6 @@
-{ inputs, ... }:
+{ disko, ... }:
 {
-  imports = [ inputs.disko.nixosModules.disko ];
+  imports = [ disko.nixosModules.disko ];
 
   disko.devices = {
     disk = {

nixosConfigurations/hosts/rack-01/k8s-master-nuc-01.nix

@@ -1,12 +1,16 @@
-{ ... }:
+{ nixosModules, ... }:
 {
-  imports = [
-    ../../modules
-    ../../modules/hardware/intel-nuc.nix
-    ../../modules/roles/k8s-master.nix
-    ../../modules/format/raw-efi.nix
+  imports = with nixosModules; [
+    format.raw-efi
+    hardware.intel-nuc
+    nix
+    roles.k8s-master
+    ssh
+    users
   ];
 
+  console.keyMap = "de";
+
   networking.hostName = "rack-01-k8s-master-nuc-01";
 
   _module.args.nixinate = {
@@ -16,4 +20,6 @@
     substituteOnTarget = true;
     hermetic = false;
   };
+
+  system.stateVersion = "25.11";
 }

nixosModules/default.nix

@@ -0,0 +1,10 @@
+{ nixpkgs, ... }:
+let
+  modules = nixpkgs.lib.filesystem.packagesFromDirectoryRecursive {
+    callPackage = modulePath: _: import modulePath;
+    directory = ./.;
+  };
+
+  cleanedModules = nixpkgs.lib.filterAttrs (moduleName: _: moduleName != "default") modules;
+in
+cleanedModules