Removed darwin config; Added unstable systems to config

config/headful.nix

@@ -27,7 +27,6 @@
     # Setup i3 window manager
     windowManager.i3 = {
       enable = true;
-      package = pkgs.i3-gaps;
       extraPackages = with pkgs; [
         rofi
         alacritty

flake.lock

@@ -1,17 +1,17 @@
 {
   "nodes": {
-    "home-manager": {
+    "home": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1753592768,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "lastModified": 1758463745,
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
         "type": "github"
       },
       "original": {
@@ -21,21 +21,24 @@
         "type": "github"
       }
     },
-    "nix-darwin": {
+    "home-unstable": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nix-unstable"
+        ]
       },
       "locked": {
-        "lastModified": 1763136804,
-        "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=",
-        "owner": "nix-darwin",
-        "repo": "nix-darwin",
-        "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f",
+        "lastModified": 1763228015,
+        "narHash": "sha256-1rYieMVUyZ3kK/cBIr8mOusxrOEJ1/+2MsOg0oJ7b3A=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "96156a9e86281c4bfc451236bc2ddfe4317e6f39",
         "type": "github"
       },
       "original": {
-        "id": "nix-darwin",
-        "type": "indirect"
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
       }
     },
     "nix-index-database": {
@@ -58,23 +61,23 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nix-unstable": {
       "locked": {
-        "lastModified": 1763191728,
-        "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=",
-        "owner": "NixOS",
+        "lastModified": 1762977756,
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs": {
       "locked": {
         "lastModified": 1755736199,
         "narHash": "sha256-EP24GtYxPHLcTZNQjyXllR/zJ8unzgt4Vt8I+h8mhWo=",
@@ -92,10 +95,11 @@
     },
     "root": {
       "inputs": {
-        "home-manager": "home-manager",
-        "nix-darwin": "nix-darwin",
+        "home": "home",
+        "home-unstable": "home-unstable",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs_2"
+        "nix-unstable": "nix-unstable",
+        "nixpkgs": "nixpkgs"
       }
     }
   },

flake.nix

@@ -3,18 +3,24 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/release-25.05";
-    home-manager = {
+    home = {
       url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nix-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    home-unstable = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nix-unstable";
+    };
+
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, nix-darwin, home-manager, nix-index-database, ... } @ inputs:
+  outputs = { self, nixpkgs, home, nix-unstable, home-unstable, nix-index-database, ... } @ inputs:
     let
       mkNixosConfig = hostname: modules: nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -22,7 +28,7 @@
         inherit modules;
       };
 
-      mkHomeConfig = username: modules: home-manager.lib.homeManagerConfiguration {
+      mkHomeConfig = username: modules: home.lib.homeManagerConfiguration {
         pkgs = import nixpkgs {
           system = "x86_64-linux";
         };
@@ -34,20 +40,39 @@
 
         inherit modules;
       };
+
+      mkNixosUnstableConfig = hostname: modules: nix-unstable.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        inherit modules;
+      };
+
+      mkHomeUnstableConfig = username: modules: home-unstable.lib.homeManagerConfiguration {
+        pkgs = import nix-unstable {
+          system = "x86_64-linux";
+        };
+
+        extraSpecialArgs = {
+          inherit inputs;
+          user = username;
+        };
+
+        inherit modules;
+      };
     in {
 
       # Nixos Configurations
       nixosConfigurations = {
-        randomctf = mkNixosConfig "randomctf" [ ./config/shared.nix ./config/omen.nix ];
+        randomctf = mkNixosUnstableConfig "randomctf" [ ./config/shared.nix ./config/omen.nix ];
         r330-media = mkNixosConfig "r330-media" [ ./config/media.nix ];
         sampledb-dev = mkNixosConfig "sampledb-dev" [ ./config/sampledb.nix ];
         r330-logging = mkNixosConfig "r330-logging" [ ./config/logging.nix ];
-        mindforge = mkNixosConfig "mindforge" [ ./config/ai.nix ];
+        mindforge = mkNixosUnstableConfig "mindforge" [ ./config/ai.nix ];
       };
 
       # Home-Manager Configurations
       homeConfigurations = {
-        random = mkHomeConfig "random" [
+        random = mkHomeUnstableConfig "random" [
           ./home/headful-nixos.nix
           ./home/modules/development.nix
           ./home/modules/gui-apps.nix
@@ -61,7 +86,7 @@
 
         media = mkHomeConfig "media" [ ./home/headless-nixos.nix ];
         logging = mkHomeConfig "logging" [ ./home/headless-nixos.nix ];
-        mindforge = mkHomeConfig "mindforge" [ ./home/headless-nixos.nix ];
+        mindforge = mkHomeUnstableConfig "mindforge" [ ./home/headless-nixos.nix ];
       };
     };
 }

home/darwin.nix

@@ -1,30 +0,0 @@
-{ pkgs, ... }: {
-  home = {
-    username = "jadenmaxwell";
-    homeDirectory = "/Users/jadenmaxwell";
-  };
-
-  home.packages = with pkgs; [
-    gnupg
-    vesktop
-  ];
-
-  imports = [
-    ./shared.nix
-    ./modules/utils.nix
-    ./modules/development.nix
-    ./modules/sketchybar.nix
-    ./modules/aerospace.nix
-    ./modules/emacs.nix
-    ./modules/zsh.nix
-  ];
-
-  programs.ssh.extraConfig = ''
-  Host 192.168.100.*
-    SetEnv TERM=xterm-256color
-  '';
-
-  home.file = {
-    ".config/ghostty/config".source = ../dotfiles/.config/ghostty/config;
-  };
-}

home/headful-nixos.nix

@@ -8,7 +8,6 @@
   imports = [
     ./shared.nix
     ./modules/utils.nix
-    ./modules/linux-only-utils.nix
     ./modules/networking.nix
     ./modules/neovim.nix
     ./modules/emacs.nix

home/headless-nixos.nix

@@ -1,4 +1,4 @@
-{ pkgs, user, ... }: {
+{ user, ... }: {
 
   home = {
     username = "${user}";
@@ -8,7 +8,6 @@
   imports = [
     ./shared.nix
     ./modules/utils.nix
-    ./modules/linux-only-utils.nix
     ./modules/networking.nix
     ./modules/neovim.nix
     ./modules/tmux.nix

home/modules/linux-only-utils.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    ncdu
-    cava
-    nvtopPackages.full
-  ];
-}

home/modules/utils.nix

@@ -10,6 +10,8 @@
     jq
     bc
     duf
+    cava
+    ncdu
     file
     dysk
     wget
@@ -28,6 +30,7 @@
     xclicker
     pciutils
     fastfetch
+    nvtopPackages.full
 
     # Encryption Tools
     #age

home/shared.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: {
+{ ... }: {
 
   nixpkgs.config.allowUnfree = true;
   fonts.fontconfig.enable = true;
@@ -7,8 +7,10 @@
     home-manager.enable = true;
     git = {
       enable = true;
-      userName = "Random936";
-      userEmail = "randomdude936@gmail.com";
+      settings.user = {
+        name = "Random936";
+        email = "randomdude936@gmail.com";
+      };
     };
   };