From 4a3b1b9083c6e70428f13f9b39668c01338bdde3 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Tue, 19 Apr 2022 13:14:46 +0200
Subject: [PATCH] Compact configs

---
 flake.nix | 87 +++++++++++++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 51 deletions(-)

diff --git a/flake.nix b/flake.nix
index 379ecb1..ac74fc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,11 +68,29 @@
       };
       pkgs = import nixpkgs nixpkgsSettings;
       unstablePkgs = import nixpkgs nixpkgsSettings;
+      odinBaseModules = [
+        { nixpkgs = nixpkgsSettings; }
+        ./odin/hardware-configuration.nix
+        nixos-hardware.nixosModules.common-cpu-intel
+        nixos-hardware.nixosModules.common-pc-laptop
+        nixos-hardware.nixosModules.common-pc-laptop-ssd
+        ./odin/base.nix
+        ./odin/pro_audio.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 ./odin.nix;
+          #   home-manager.users.bertof.home.packages = [ unstable.hello ];
+        }
+      ];
     in
     {
       packages.x86_64-linux = pkgs;
 
       nixosConfigurations = rec {
+
         thor = pkgs.lib.nixosSystem {
           inherit system;
 
@@ -84,13 +102,14 @@
             ./thor/configuration.nix
           ];
         };
-        odin = odin-intel;
+
+        odin = odin-nvidia-big-data-unstable;
+
         odin-intel = pkgs.lib.nixosSystem {
           inherit system;
 
           modules = [
             { nixpkgs = nixpkgsSettings; }
-
             ./odin/hardware-configuration.nix
             nixos-hardware.nixosModules.common-cpu-intel
             nixos-hardware.nixosModules.common-pc-laptop
@@ -100,66 +119,32 @@
             ./odin/pro_audio.nix
           ];
         };
+
         odin-intel-unstable = unstable.lib.nixosSystem {
           inherit system;
-
-          modules = [
-            { nixpkgs = nixpkgsSettings; }
-            ./odin/hardware-configuration.nix
-            nixos-hardware.nixosModules.common-cpu-intel
-            nixos-hardware.nixosModules.common-pc-laptop
-            nixos-hardware.nixosModules.common-pc-laptop-ssd
-            ./odin/base.nix
-            ./odin/odin-intel.nix
-            ./odin/pro_audio.nix
-          ];
+          modules = odinBaseModules ++ [ ./odin/odin-intel.nix ];
         };
         odin-nvidia-unstable = unstable.lib.nixosSystem {
           inherit system;
-
-          modules = [
-            { nixpkgs = nixpkgsSettings; }
-            ./odin/hardware-configuration.nix
-            nixos-hardware.nixosModules.common-cpu-intel
-            nixos-hardware.nixosModules.common-pc-laptop
-            nixos-hardware.nixosModules.common-pc-laptop-ssd
-            ./odin/base.nix
-            ./odin/odin-nvidia.nix
-            ./odin/pro_audio.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 ./odin.nix;
-              #   home-manager.users.bertof.home.packages = [ unstable.hello ];
-            }
-          ];
+          modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ];
         };
 
-        big-data-unstable = unstable.lib.nixosSystem {
+        odin-intel-big-data-unstable = unstable.lib.nixosSystem {
           inherit system;
-
-          modules = [
-            { nixpkgs = nixpkgsSettings; }
-            ./odin/hardware-configuration.nix
-            nixos-hardware.nixosModules.common-cpu-intel
-            nixos-hardware.nixosModules.common-pc-laptop
-            nixos-hardware.nixosModules.common-pc-laptop-ssd
-            ./odin/base.nix
-            ./odin/odin-nvidia.nix
-            ./odin/pro_audio.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 ./odin.nix;
-              #   home-manager.users.bertof.home.packages = [ unstable.hello ];
-            }
+          modules = odinBaseModules ++ [
+            ./odin/odin-intel.nix
             ./nixos_modules/big_data.nix
           ];
         };
+
+        odin-nvidia-big-data-unstable = unstable.lib.nixosSystem {
+          inherit system;
+          modules = odinBaseModules ++ [
+            ./odin/odin-nvidia.nix
+            ./nixos_modules/big_data.nix
+          ];
+        };
+
       };
     };
 }