whole bunch of stuff

flake.nix

@@ -5,8 +5,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
 
-    nur.url = "github:/nix-community/NUR";
-
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -23,7 +21,8 @@
 
     nix-rice.url = "github:bertof/nix-rice";
 
-    nixd.url = "github:nix-community/nixd";
+    # nixd.url = "github:nix-community/nixd";
+    nil.url = "github:oxalica/nil";
 
     madness.url = "github:antithesishq/madness";
 
@@ -45,16 +44,22 @@
       inputs.lix.follows = "lix";
       inputs.lix-module.follows = "lix-module";
       inputs.nh.follows = "nh";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    culr.url = "git+https://git.atagen.co/atagen/culr";
+    culr = {
+      url = "git+https://git.atagen.co/atagen/culr";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    comfyui.url = "path:./flakes/ComfyUI";
-    comfyui-plugins.url = "path:./flakes/ComfyUI-Plugins";
+    comfyui = {
+      url = "path:./flakes/comfyui";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    podman = {
-      flake = false;
-      url = "github:containers/podman";
+    comfyui-plugins = {
+      url = "path:./flakes/comfyui-plugins";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     murex = {
@@ -62,36 +67,47 @@
       flake = false;
     };
 
-    murex-jump.url = "path:./flakes/murex-module-jump";
-    murex-starship.url = "path:./flakes/murex-module-starship";
+    murex-jump = {
+      url = "path:./flakes/murex-module-jump";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    niri.url = "github:sodiboo/niri-flake";
+    murex-starship = {
+      url = "path:./flakes/murex-module-starship";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    niri = {
+      url = "github:sodiboo/niri-flake";
+    };
 
     ironbar.url = "github:JakeStanger/ironbar";
 
     sirula = {
-      url = "github:jlo62/sirula";
+      url = "github:DorianRudolph/sirula";
       flake = false;
     };
 
-    nixago = {
-      url = "github:jmgilman/nixago";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # hjem = {
+    #   url = "github:feel-co/hjem";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
-    wrapper-manager = {
-      url = "github:viperML/wrapper-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    
+    # nixago = {
+    #   url = "github:jmgilman/nixago";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
+
+    # wrapper-manager = {
+    #   url = "github:viperML/wrapper-manager";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
   };
 
   outputs = {
     self,
     nixpkgs,
     home-manager,
-    nur,
-    flatpaks,
     nix-index-database,
     madness,
     meat,
@@ -100,54 +116,25 @@
     ...
   } @ inputs: let
     inherit (self) outputs;
-    inherit (nixpkgs) lib;
-    inherit (lib) mapAttrs;
-    sharedModules = [
-      meat.nixosModules.meat
-      culr.nixosModules.culr
-      madness.nixosModules.madness
-      nur.nixosModules.nur
-      nix-index-database.nixosModules.nix-index
-      niri.nixosModules.niri
-      ./system/cachix.nix
-    ];
-    system = "x86_64-linux";
-    createSystems = definitions:
-      mapAttrs (name: info:
-        nixpkgs.lib.nixosSystem {
-          inherit system;
-          specialArgs = {
-            inherit inputs outputs;
-            mainUser = info.user;
-          };
-          modules =
-            [
-              ./system/${name}.nix
-              home-manager.nixosModules.home-manager
-              {
-                home-manager = {
-                  useGlobalPkgs = true;
-                  extraSpecialArgs = {
-                    inherit inputs outputs;
-                    mainUser = info.user;
-                  };
-                  users.${info.user}.imports =
-                    [
-                      flatpaks.homeManagerModules.nix-flatpak
-                      ./home/${info.user}.nix
-                    ]
-                    ++ info.hmImports or [];
-                };
-              }
-            ]
-            ++ info.imports or []
-            ++ sharedModules;
-        })
-      definitions;
+    create = import ./util/create.nix {
+      inherit nixpkgs home-manager inputs outputs;
+      system = "x86_64-linux";
+      sharedModules = [
+        culr.nixosModules.culr
+        meat.nixosModules.meat
+        madness.nixosModules.madness
+        niri.nixosModules.niri
+        nix-index-database.nixosModules.nix-index
+        ./system/cachix.nix
+      ];
+    };
   in {
-    overlays = import ./util/overlay.nix {inherit inputs;};
+    overlays = import ./util/overlay.nix {
+      inherit inputs;
+      inherit (nixpkgs) lib;
+    };
 
-    nixosConfigurations = createSystems {
+    nixosConfigurations = create.systems {
       quiver.user = "bolt";
       adrift.user = "plank";
     };