Made some adjustments to allow for multiple configurations to exist under the flake

5 files changed, 119 insertions, 18 deletions

diff --git a/flake.nix b/flake.nix
index abcef04..cde03f8 100755..100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,24 +7,49 @@
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/latest.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs: {
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    lix-module,
+    ...
+  } @ inputs:
+  # ← let goes here
+  let
+    hmModule = {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.users.mun = import ./mun.nix;
+    };
+  in {
     nixosConfigurations = {
       kronos = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
+        specialArgs = {inherit inputs;};
         modules = [
+          lix-module.nixosModules.default
           ./configuration.nix
           home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            
-            home-manager.users.mun = import ./mun.nix;
-          }
+          hmModule # ← use shared module
+        ];
+      };
+
+      herra = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = {inherit inputs;};
+        modules = [
+          lix-module.nixosModules.default
+          ./hosts/herra/configuration.nix
+          home-manager.nixosModules.home-manager
+          hmModule
         ];
       };
-    };   
+    };
   };
 }
diff --git a/flake.nix.bak b/flake.nix.bak
new file mode 100755
index 0000000..ade56b2
--- /dev/null
+++ b/flake.nix.bak
@@ -0,0 +1,46 @@
+{
+  description = "A very basic flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-25.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs = { self, nixpkgs, home-manager, ... }@inputs: {
+    let
+      hmModule = {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.users.mun = import ./mun.nix;
+      };
+    in {
+    nixosConfigurations = {
+      kronos = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ./configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            
+            home-manager.users.mun = import ./mun.nix;
+          }
+        ];
+      };
+      herra = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ./hosts/herra/configuration.nix
+          home-manager.nixosModules.home-manager
+          hmModule
+        ];
+      };
+    };   
+  };
+}
diff --git a/hosts/herra/configuration.nix b/hosts/herra/configuration.nix
new file mode 100644
index 0000000..35542a8
--- /dev/null
+++ b/hosts/herra/configuration.nix
@@ -0,0 +1,30 @@
+# hosts/desktop/configuration.nix
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./hardware-configuration.nix
+    ../../modules/nixos/base/default.nix
+
+    # === Environment Choice ===
+    ../../modules/nixos/des/i3wm.nix
+    #../../modules/nixos/des/gnome.nix
+  ];
+
+  # Override boot for GRUB dual boot with Windows
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    grub = {
+      enable = true;
+      device = "nodev";
+      efiSupport = true;
+      useOSProber = true; # auto-detects Windows 11
+    };
+  };
+
+  # Desktop-specific hostname
+  networking.hostName = "herra"; # or whatever you want
+}
diff --git a/configuration.nix b/hosts/kronos/configuration.nix
index 3b4ea62..79b637b 100755
--- a/configuration.nix
+++ b/hosts/kronos/configuration.nix
@@ -1,16 +1,16 @@
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
-    ./modules/nixos/base/default.nix
-    
+    ../../modules/nixos/base/default.nix
+
     # === Environment Choice ===
     # Uncomment one of the following to select your environment:
-    ./modules/nixos/des/i3wm.nix
-    #./modules/nixos/des/gnome.nix
+    ../../modules/nixos/des/i3wm.nix
+    #../../modules/nixos/des/gnome.nix
   ];
 }
-
-
diff --git a/hardware-configuration.nix b/hosts/kronos/hardware-configuration.nix
index 0dc8341..0dc8341 100755
--- a/hardware-configuration.nix
+++ b/hosts/kronos/hardware-configuration.nix