From b886717d6fc1b63349a8a7f9d6ab70a1f728366a Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Tue, 23 Sep 2025 15:11:50 +0200
Subject: [PATCH] WIP: switch to open modules

---
 flake.nix | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1105874..4cc340b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,15 +45,6 @@
 
       # cute-api = builtins.getFlake "gitlab:bertof/cute-api/0.2.1-3";
 
-      mainModules = [
-        ./nixos/pro_audio.nix
-        ./nixos/kdeconnect.nix
-        ./nixos/steam.nix
-        ./nixos/opentabletdriver.nix
-
-        ./nixos/hyprland.nix
-        { home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; }
-      ];
 
       installerModules = [ self.nixosModules.commonModules ./nixos/installer.nix ];
     in
@@ -234,12 +225,26 @@
               ./nixos/basics
             ];
           };
+
+          mainModules = {
+            imports = [
+              ./nixos/pro_audio.nix
+              ./nixos/kdeconnect.nix
+              ./nixos/steam.nix
+              ./nixos/opentabletdriver.nix
+
+              ./nixos/hyprland.nix
+            ];
+            home-manager.users.bertof.imports = [ ./hm/hyprland.nix ];
+          };
         };
 
         nixosConfigurations = {
           thor = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [ self.nixosModules.commonModules ] ++ mainModules ++ [
+            modules = [
+              self.nixosModules.commonModules
+              self.nixosModules.mainModules
               ./instances/thor/hardware-configuration.nix
               inputs.nixos-hardware.nixosModules.common-cpu-amd
               inputs.nixos-hardware.nixosModules.common-pc-ssd
@@ -270,7 +275,9 @@
 
           sif = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [ self.nixosModules.commonModules ] ++ mainModules ++ [
+            modules = [
+              self.nixosModules.commonModules
+              self.nixosModules.mainModules
               ./instances/sif/hardware-configuration.nix
               inputs.nixos-hardware.nixosModules.common-cpu-intel
               inputs.nixos-hardware.nixosModules.common-cpu-intel
@@ -299,7 +306,8 @@
 
           odin = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [ self.nixosModules.commonModules ] ++ [
+            modules = [
+              self.nixosModules.commonModules
               inputs.nixos-hardware.nixosModules.common-cpu-intel
               inputs.nixos-hardware.nixosModules.common-pc-laptop
               inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
@@ -327,7 +335,8 @@
 
           heimdall = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [ self.nixosModules.commonModules ] ++ [
+            modules = [
+              self.nixosModules.commonModules
               inputs.nixos-hardware.nixosModules.common-cpu-amd
               inputs.nixos-hardware.nixosModules.common-gpu-amd
               inputs.nixos-hardware.nixosModules.common-pc-ssd
@@ -366,7 +375,8 @@
 
           freya = inputs.nixpkgs.lib.nixosSystem {
             system = "aarch64-linux";
-            modules = [ self.nixosModules.commonModules ] ++ [
+            modules = [
+              self.nixosModules.commonModules
               inputs.nixos-hardware.nixosModules.raspberry-pi-4
               ({ lib, ... }: {
                 boot.supportedFilesystems = lib.mkForce [
@@ -410,7 +420,8 @@
 
           baldur = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [ self.nixosModules.commonModules ] ++ [
+            modules = [
+              self.nixosModules.commonModules
               ./nixos/server
               ./instances/baldur/hardware-configuration.nix
               ./instances/baldur/configuration.nix
@@ -437,7 +448,8 @@
 
           loki = inputs.nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [ self.nixosModules.commonModules ] ++ [
+            modules = [
+              self.nixosModules.commonModules
               ./nixos/server
 
               inputs.nixos-hardware.nixosModules.common-cpu-intel