added modern branch

flake.nix

@@ -1,113 +1,92 @@
 {
-  description = "A rewrite of the original Sakamoto NixOS config.";
+  description = "A personal Nix flake for system and home configurations";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-
-    nur = {
-      url = "github:nix-community/NUR";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    jovian = {
-      url = "github:Jovian-Experiments/Jovian-NixOS";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    hyprland.url = "github:hyprwm/Hyprland";
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
 
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    darwin = {
-      url = "github:lnl7/nix-darwin";
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixovim = {
-      url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    matugen = {
-      url = "github:/InioX/Matugen";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    quickshell = {
-      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    caelestia-shell = {
-      url = "git+https://git.sakamoto.dev/kenji/caelestia-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
     home-manager,
-    darwin,
+    nix-darwin,
+    flake-utils,
     ...
-  } @ inputs: let
-    config = import ./config.nix;
-
-    mkArgs = system:
-      {
-        inherit inputs system;
-      }
-      // config;
-
-    systems = ["x86_64-linux" "aarch64-linux"];
-  in
-    flake-utils.lib.eachSystem systems (system: let
+  }:
+    flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {
         inherit system;
         config.allowUnfree = true;
       };
-      args = mkArgs system;
+
+      homeManagerModule = {
+        # home.stateVersion = "24.05";
+      };
     in {
-    })
-    // {
       nixosConfigurations = {
-        hakase = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = mkArgs "x86_64-linux";
+        "my-nixos-desktop" = nixpkgs.lib.nixosSystem {
+          inherit system;
           modules = [
-            ./hosts/hakase/configuration.nix
+            ./hosts/nixos/my-nixos-desktop/configuration.nix
+
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.youruser = homeManagerModule;
+              # home-manager.users.youruser = import ./home/youruser/home.nix;
+            }
           ];
+
+          specialArgs = {
+            inherit self pkgs;
+          };
         };
       };
 
       homeConfigurations = {
-        hakase = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-            extraSpecialArgs = mkArgs "x86_64-linux";
-          };
+        "youruser-standalone" = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
           modules = [
-            ./home/hakase.nix
+            homeManagerModule
+            # ./home/youruser/home.nix
           ];
+
+          # specialArgs = { inherit self; };
         };
       };
 
       darwinConfigurations = {
-        macos = darwin.lib.darwinSystem {
-          system = "aarch64-darwin";
-          specialArgs = mkArgs "aarch64-darwin";
+        "my-macbook-pro" = nix-darwin.lib.darwinSystem {
+          inherit system;
           modules = [
-            ./hosts/macos/darwin.nix
+            ./hosts/darwin/my-macbook-pro/configuration.nix
+
+            home-manager.darwinModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.youruser = homeManagerModule;
+              # home-manager.users.youruser = import ./home/youruser/home.nix;
+            }
           ];
+
+          specialArgs = {
+            inherit self pkgs;
+          };
         };
       };
-    };
+    });
 }