188 current 2025-06-06 18:54:16 25.11.20250605.d3d2d80 6.15.1 *

flake.nix

@@ -10,7 +10,7 @@
     };
     catppuccin.url = "github:catppuccin/nix";
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "github:hyprwm/Hyprland";
@@ -19,67 +19,95 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
+
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
+    home-manager-stable = {
+      url = "github:nix-community/home-manager/release-25.05";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
+    };
   };
 
   outputs = {
     self,
-    nixpkgs,
     catppuccin,
     nur,
-    home-manager,
     plasma-manager,
     ...
-  } @ inputs: {
-    # Please replace my-nixos with your hostname
-    nixosConfigurations = {
-      anzu = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+  } @ inputs: let
+    hosts = import ./hosts/hosts.nix;
+
+    # Make config for non-NixOS hosts
+    mkHomeConfiguration = {
+      host,
+      nixpkgs,
+      home-manager,
+      modules ? [],
+    }:
+      home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs {
+          system = host.arch;
+          config = {
+            allowUnfree = true;
+          };
+          overlays = [
+            nur.overlay
+          ];
+        };
+        modules =
+          [
+            ./hosts/${host.dir}/home.nix
+            catppuccin.homeModules.catppuccin
+          ]
+          ++ modules;
+      };
+
+    # Make config for NixOS hosts
+    mkNixOSConfigurations = {
+      host,
+      nixpkgs,
+      home-manager,
+      modules ? [],
+    }:
+      nixpkgs.lib.nixosSystem {
+        system = host.arch;
         specialArgs = {inherit inputs;};
-        modules = [
-          # Import the previous configuration.nix we used,
-          # so the old configuration file still takes effect
-          ./configuration.nix
-          ./hosts/anzu/hardware-configuration.nix
-          # Add NUR overlay
-          nur.modules.nixos.default
-          # Add catppuccin
-          catppuccin.nixosModules.catppuccin
-          # Add home-manager
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
-            home-manager.users.chase = {
-              imports = [
-                ./home/home.nix
+        modules =
+          [
+            ./hosts/${host.dir}/configuration.nix
+            nur.modules.nixos.default
+            catppuccin.nixosModules.catppuccin
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.backupFileExtension = "backup";
+              home-manager.useGlobalPkgs = true;
+              home-manager.users."${host.user}".imports = [
+                ./hosts/${host.dir}/home.nix
                 catppuccin.homeModules.catppuccin
               ];
-            };
+            }
+          ]
+          ++ modules;
+      };
+  in {
+    # Please replace my-nixos with your hostname
+    nixosConfigurations = {
+      "anzu" = mkNixOSConfigurations {
+        host = hosts.anzu;
+        nixpkgs = inputs.nixpkgs;
+        home-manager = inputs.home-manager;
+        modules = [
+          {
+            home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
           }
         ];
       };
-      ichigo = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs;};
+      "ichigo" = mkNixOSConfigurations {
+        host = hosts.ichigo;
+        nixpkgs = inputs.nixpkgs;
+        home-manager = inputs.home-manager;
         modules = [
-          ./configuration.nix
-          ./hosts/ichigo/hardware-configuration.nix
-          nur.modules.nixos.default
-          catppuccin.nixosModules.catppuccin
-          home-manager.nixosModules.home-manager
           {
-            home-manager.backupFileExtension = "backup";
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
             home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
-            home-manager.users.chase = {
-              imports = [
-                ./home/home.nix
-                catppuccin.homeModules.catppuccin
-              ];
-            };
           }
         ];
       };