From 35e4fe5582be5a6beea55ec4e9e21be13d5d691d Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 21 Apr 2022 19:44:46 +0200
Subject: [PATCH] Modules unification

---
 flake.nix             | 50 ++++++++++++++++++++++++++++++++-----------
 modules/pro_audio.nix |  2 +-
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index e7c85ac..5baf5d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,7 @@
       };
       pkgs = import nixpkgs nixpkgsSettings;
       unstablePkgs = import nixpkgs nixpkgsSettings;
+
       odinBaseModules = [
         { nixpkgs = nixpkgsSettings; }
         ./odin/hardware-configuration.nix
@@ -81,24 +82,40 @@
           home-manager.useUserPackages = true;
           # home-manager.nixpkgs.overlays = overlays;
           home-manager.users.bertof = import ./odin.nix;
-          #   home-manager.users.bertof.home.packages = [ unstable.hello ];
         }
       ];
+
+      odinStableBaseModules = odinBaseModules ++ [
+        home-manager.nixosModules.home-manager
+      ];
+
+      odinUnstableBaseModules = odinBaseModules ++ [
+        home-manager-unstable.nixosModules.home-manager
+      ];
+
+
       thorBaseModules = [
         { nixpkgs = nixpkgsSettings; }
         ./thor/hardware-configuration.nix
         nixos-hardware.nixosModules.common-cpu-amd
         nixos-hardware.nixosModules.common-pc-ssd
-        ./thor/configuration.nix
-        home-manager-unstable.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           # home-manager.nixpkgs.overlays = overlays;
           home-manager.users.bertof = import ./thor.nix;
-          #   home-manager.users.bertof.home.packages = [ unstable.hello ];
         }
+        ./thor/configuration.nix
       ];
+
+      thorStableBaseModules = thorBaseModules ++ [
+        home-manager.nixosModules.home-manager
+      ];
+
+      thorUnstableBaseModules = thorBaseModules ++ [
+        home-manager-unstable.nixosModules.home-manager
+      ];
+
     in
     {
       exports = {
@@ -107,41 +124,48 @@
 
       nixosConfigurations = rec {
 
-        thor = unstable.lib.nixosSystem {
+        thor = thor-unstable;
+
+        thor-stable = nixpkgs.lib.nixosSystem {
           inherit system;
-          modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ];
+          modules = thorStableBaseModules ++ [ ./nixos_modules/pro_audio.nix ];
+        };
+
+        thor-unstable = unstable.lib.nixosSystem {
+          inherit system;
+          modules = thorUnstableBaseModules ++ [ ./nixos_modules/pro_audio.nix ];
         };
 
         thor-big-data = unstable.lib.nixosSystem {
           inherit system;
-          modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
+          modules = thorUnstableBaseModules ++ [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
         };
 
         odin = odin-nvidia-big-data-unstable;
 
         odin-intel = nixpkgs.lib.nixosSystem {
           inherit system;
-          modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
+          modules = odinStableBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
         };
 
         odin-nvidia = nixpkgs.lib.nixosSystem {
           inherit system;
-          modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
+          modules = odinStableBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
         };
 
         odin-intel-unstable = unstable.lib.nixosSystem {
           inherit system;
-          modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
+          modules = odinUnstableBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
         };
 
         odin-nvidia-unstable = unstable.lib.nixosSystem {
           inherit system;
-          modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
+          modules = odinUnstableBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
         };
 
         odin-intel-big-data-unstable = unstable.lib.nixosSystem {
           inherit system;
-          modules = odinBaseModules ++ [
+          modules = odinUnstableBaseModules ++ [
             ./odin/odin-intel.nix
             ./nixos_modules/pro_audio.nix
             ./nixos_modules/big_data.nix
@@ -150,7 +174,7 @@
 
         odin-nvidia-big-data-unstable = unstable.lib.nixosSystem {
           inherit system;
-          modules = odinBaseModules ++ [
+          modules = odinUnstableBaseModules ++ [
             ./odin/odin-nvidia.nix
             ./nixos_modules/pro_audio.nix
             ./nixos_modules/big_data.nix
diff --git a/modules/pro_audio.nix b/modules/pro_audio.nix
index 675bfa6..92b9044 100644
--- a/modules/pro_audio.nix
+++ b/modules/pro_audio.nix
@@ -21,7 +21,7 @@ in
     # artyFX
     autotalent
     boops
-    cardinal
+    # cardinal
     geonkick
     helm
     (lsp-plugins.overrideAttrs (old: { version = "1.2.0"; }))