From ac0ca93f9479611df548a1ba76ee4a5a99390077 Mon Sep 17 00:00:00 2001
From: Filippo Berto <filippo.berto@cern.ch>
Date: Sun, 7 Dec 2025 15:07:31 +0100
Subject: [PATCH] update(flake): flat configuration

---
 flake.nix | 73 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index d490d55..dbcb741 100644
--- a/flake.nix
+++ b/flake.nix
@@ -183,17 +183,6 @@
             };
           };
 
-          # Home manager configuration
-          homeManagerUModules = {
-            imports = [ inputs.home-manager-u.nixosModules.default ];
-
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              extraSpecialArgs = { stable = inputs.nixpkgs-s; unstable = inputs.nixpkgs-u; };
-            };
-          };
-
           commonModules = {
             imports = [
               # Nix configuration
@@ -213,15 +202,22 @@
 
               # Some basic defaults
               ./nixos/basics
-
-              # Home manager
-              self.nixosModules.homeManagerUModules
             ];
           };
 
+          homeManagerModules = {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              extraSpecialArgs = {
+                stable = inputs.nixpkgs-s;
+                unstable = inputs.nixpkgs-u;
+              };
+            };
+          };
+
           mainModules = {
             imports = [
-              self.nixosModules.commonModules
               inputs.nix-index-database.nixosModules.nix-index
               ./nixos/pro_audio.nix
               ./nixos/kdeconnect.nix
@@ -235,15 +231,16 @@
             services.earlyoom.enable = true;
           };
 
-          server = {
+          installerModules = {
             imports = [
               self.nixosModules.commonModules
-              ./nixos/server
+              # Home manager
+              inputs.home-manager-u.nixosModules.default
+              self.nixosModules.homeManagerModules
+              ./nixos/installer.nix
             ];
           };
 
-          installerModules = { imports = [ self.nixosModules.commonModules ./nixos/installer.nix ]; };
-
           bertof = { imports = [ ./nixos/users/bertof.nix ]; };
 
           bertof-rclone = {
@@ -267,7 +264,13 @@
             modules = [
               inputs.nixos-hardware.nixosModules.common-cpu-amd
               inputs.nixos-hardware.nixosModules.common-pc-ssd
+
+              inputs.home-manager-u.nixosModules.default
+              self.nixosModules.homeManagerModules
+
+              self.nixosModules.commonModules
               self.nixosModules.mainModules
+
               ./instances/thor/hardware-configuration.nix
               ./instances/thor/configuration.nix
 
@@ -276,7 +279,6 @@
               ./nixos/ollama-ui.nix
               ./nixos/garage.nix
 
-              self.nixosModules.bertof-rclone
               {
                 home-manager.users.bertof.imports = [
                   inputs.nix-index-database.homeModules.nix-index
@@ -292,7 +294,13 @@
               inputs.nixos-hardware.nixosModules.common-cpu-intel-cpu-only
               inputs.nixos-hardware.nixosModules.common-gpu-intel-comet-lake
               inputs.nixos-hardware.nixosModules.common-pc-ssd
+
+              inputs.home-manager-u.nixosModules.default
+              self.nixosModules.homeManagerModules
+
+              self.nixosModules.commonModules
               self.nixosModules.mainModules
+
               ./instances/sif/hardware-configuration.nix
               ./instances/sif/configuration.nix
 
@@ -316,7 +324,13 @@
               inputs.nixos-hardware.nixosModules.common-cpu-intel
               inputs.nixos-hardware.nixosModules.common-pc-laptop
               inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
-              self.nixosModules.server
+
+              inputs.home-manager-u.nixosModules.default
+              self.nixosModules.homeManagerModules
+
+              self.nixosModules.commonModules
+              ./nixos/server
+
               ./instances/odin/hardware-configuration.nix
               ./instances/odin/configuration.nix
 
@@ -339,7 +353,12 @@
               inputs.nixos-hardware.nixosModules.common-cpu-amd
               inputs.nixos-hardware.nixosModules.common-gpu-amd
               inputs.nixos-hardware.nixosModules.common-pc-ssd
-              self.nixosModules.server
+
+              inputs.home-manager-u.nixosModules.default
+              self.nixosModules.homeManagerModules
+
+              self.nixosModules.commonModules
+              ./nixos/server
 
               ./instances/heimdall/hardware-configuration.nix
               ./instances/heimdall/configuration.nix
@@ -388,7 +407,13 @@
             modules = [
               inputs.nixos-hardware.nixosModules.common-cpu-intel
               inputs.nixos-hardware.nixosModules.common-pc-ssd
-              self.nixosModules.server
+
+              inputs.home-manager-u.nixosModules.default
+              self.nixosModules.homeManagerModules
+
+              self.nixosModules.commonModules
+              ./nixos/server
+
               ./instances/baldur/hardware-configuration.nix
               ./instances/baldur/configuration.nix
 
@@ -397,6 +422,7 @@
               ./nixos/vaultwarden.nix
               ./nixos/uptime-kuma.nix
 
+              self.nixosModules.bertof
               self.nixosModules.tiziano
               {
                 home-manager.users.bertof = import ./instances/baldur/hm.nix;
@@ -410,6 +436,7 @@
           #   modules = [
           #     inputs.nixos-hardware.nixosModules.common-cpu-intel
           #     inputs.nixos-hardware.nixosModules.common-pc-ssd
+          # self.nixosModules.commonModules
           #     self.nixosModules.server
           #     ./instances/loki/hardware-configuration.nix
           #     ./instances/loki/configuration.nix