Fix homemanager flake

4 files changed, 131 insertions, 77 deletions

diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index b7f6f69..31995bf 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -18,6 +18,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -39,50 +57,70 @@
         "type": "github"
       }
     },
+    "iamb": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1747443763,
+        "narHash": "sha256-hDUgt5tV3XXHUoF11eIvRKSm/iBScDaBWHbzTistcCM=",
+        "owner": "ulyssa",
+        "repo": "iamb",
+        "rev": "af96bfbb41a8d165776f7e463c8fdc9d3804d4fc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ulyssa",
+        "repo": "iamb",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747335874,
-        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
-        "owner": "NixOS",
+        "lastModified": 1736883708,
+        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
+        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1747335874,
-        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
+        "lastModified": 1736320768,
+        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
+        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1747327360,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "lastModified": 1747335874,
+        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -91,9 +129,26 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "iamb": "iamb",
+        "nixpkgs": "nixpkgs_3"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1736994333,
+        "narHash": "sha256-v4Jrok5yXsZ6dwj2+2uo5cSyUi9fBTurHqHvNHLT1XA=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "848db855cb9e88785996e961951659570fc58814",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "systems": {
@@ -110,6 +165,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/home-manager/flake.nix b/home-manager/flake.nix
index 490aa79..59f677d 100644
--- a/home-manager/flake.nix
+++ b/home-manager/flake.nix
@@ -1,59 +1,43 @@
 {
-   description = "Home-manager configuration"; 
+  description = "Home-manager configuration";
 
-   nixConfig = {
-     experimental-feature = ["nix-command" "flakes"]; 
-   }; 
-   inputs = {
-      nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
-      nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
-      nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-      flake-utils.url = "github:numtide/flake-utils";
-      home-manager = { 
-	url = "github:nix-community/home-manager/release-24.11";
-        inputs.nixpkgs.follows = "nixpkgs";
-      }; 
-      iamb.url = "github:ulyssa/iamb";
-   }; 
+  nixConfig = {
+    experimental-feature = [
+      "nix-command"
+      "flakes"
+    ];
+  };
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    # nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-24.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    iamb.url = "github:ulyssa/iamb";
+  };
 
-
-   
-   outputs = {self, nixpkgs, nixpkgs-stable, nixpkgs-unstable, flake-utils, home-manager, iamb ,... }@inputs: 
-      let 
-          inherit (self) outputs; 
-
-	  pkgsForSystem = system: nixpkgsSource: import nixpkgsSource {
-		inherit system; 
-	  };
-	   HomeConfiguration = args: 
-		let
-		   nixpkgs = args.nixpkgs or nixpkgs-stable;  
-		in    
-		   home-manager.lib.homeManagerConfiguration {
-		   modules = [ 
-			(import ./home )
-			(import ./modules )
-		   ];
-		   extraSpecialArgs = {
-			inherit (args) nixpkgs;	
-		   } // args.extraSpecialArgs; 
-		   pkgs = pkgsForSystem (args.system or "x86_64-linux") nixpkgs;
-		};
-
-
-      in flake-utils.lib.eachSystem [ 
-        "x86_64-linux" 
-      ] (system: {
-         legacyPackages = pkgsForSystem system nixpkgs;
-      }) // {
-         # overlays = import ./overlays {inherit inputs;};
-	 homeConfigurations = {
-            "wilkuu" = HomeConfiguration  {
-              extraSpecialArgs = {
-              };
-            }; 
-         };
-         inherit home-manager; 
-         inherit (home-manager) packages;
+  outputs =
+    {
+      self,
+      nixpkgs,
+      home-manager,
+      ...
+    }@inputs:
+    let
+      inherit (self) outputs;
+    in {
+    homeConfigurations = {
+      "wilkuu" = home-manager.lib.homeManagerConfiguration {
+        modules = [
+          (import ./home)
+          (import ./modules)
+        ];
+        # TODO: Figure out how to ship on other platforms in case you want to use a NixOS Pi, or a 32bit machine
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = {inherit inputs outputs;};
       };
+    };
+  };
 }
diff --git a/home-manager/modules/apps/default.nix b/home-manager/modules/apps/default.nix
index cb5bde5..228fc29 100644
--- a/home-manager/modules/apps/default.nix
+++ b/home-manager/modules/apps/default.nix
@@ -1,11 +1,10 @@
-{lib, pkgs,inputs, ...}:
+{lib, pkgs, inputs, ...}:
 with lib;
 {
    imports = [
      ./nvim
      ./desktop 
      ./zsh.nix
-      inputs.iamb.packages."${system}".default
    ];
 
    # Stuff that is to be sorted to its appropriate files
@@ -25,12 +24,12 @@ with lib;
   gnumake
 	clang
 	rustup
-  iamb 
   lm_sensors 
   sshfs
   pkg-config
   ranger
   file
+  inputs.iamb.packages."${pkgs.system}".default
 
 	# Do i need this? 
 	php83 
diff --git a/home-manager/modules/apps/nvim/default.nix b/home-manager/modules/apps/nvim/default.nix
index e38aa69..2ce7fd8 100644
--- a/home-manager/modules/apps/nvim/default.nix
+++ b/home-manager/modules/apps/nvim/default.nix
@@ -39,7 +39,8 @@
     typescript
     nodejs_22 
     rustup
-    nixd 
+    nil
+    statix
     nixfmt-rfc-style 
     pyright
     nodePackages.intelephense