i've gone mad with power

/ attempted config from misterio77 to fix inputs errors
// this created the default.nix files and commented out block in flake.nix
// didn't work, misterio is insane
/ but misterio's nix-colors github tells you to pass it as a special arg into home-manager
// was confused for a bit but got it as an extraSpecialArg cause of module bullshit
/// good thing i had that old note or i'd have been stuck
/ now the inputs pass into home-manager
// hoping to find a more elegant passthrough format
/ oh also moved home-manager's modules to modules folder because misterio does
// probably because they're crazy but also because they've gone so deep it's somehow necessary for anything to work
/// idk how or why, should have something to do with replacing/following default nix format?
//// thus the default.nix files to add/override defaults?
this is my longest commit message ever

18 files changed, 179 insertions, 60 deletions

diff --git a/flake.lock b/flake.lock
index e59e5c3..8e7f882 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "base16-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1689473676,
+        "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=",
+        "owner": "tinted-theming",
+        "repo": "base16-schemes",
+        "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-schemes",
+        "type": "github"
+      }
+    },
     "catppuccin-alacritty": {
       "flake": false,
       "locked": {
@@ -120,17 +136,19 @@
     "hyprland": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
         "systems": "systems",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1696036148,
-        "narHash": "sha256-7KCxZLMEQhjQXZVqVPZCxUR3lE+Z5heU7MmQjEtFFqU=",
+        "lastModified": 1696261738,
+        "narHash": "sha256-ujhtnd7vCZHJosOxTi4lgIyHA6iblYwXhx+ZS678fxw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "86e8ed038f5b195cdf2548bc469f8f8bbc0caca8",
+        "rev": "b784931e678f907b1f1e41d04485fefd8a1faaf8",
         "type": "github"
       },
       "original": {
@@ -164,50 +182,68 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nix-colors": {
+      "inputs": {
+        "base16-schemes": "base16-schemes",
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
       "locked": {
-        "lastModified": 1694767346,
-        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
+        "lastModified": 1695388192,
+        "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=",
+        "owner": "misterio77",
+        "repo": "nix-colors",
+        "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "misterio77",
+        "repo": "nix-colors",
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs": {
       "locked": {
-        "lastModified": 1695830400,
-        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
+        "lastModified": 1696039360,
+        "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
+        "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "lastModified": 1694911725,
+        "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "819180647f428a3826bfc917a54449da1e532ce0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1696019113,
+        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -215,11 +251,11 @@
     "nushell-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1695747169,
-        "narHash": "sha256-Z2WZxgUB5zMMkz+C5iidB1LH4H5XLmd0nhx88TsxvNU=",
+        "lastModified": 1696266728,
+        "narHash": "sha256-1YPrrapNBvXEkEHvT57JTKMDH0Af71/5OgYEWJ973U0=",
         "owner": "nushell",
         "repo": "nu_scripts",
-        "rev": "694701430662f08071cc1b88cb3fa438539c39ea",
+        "rev": "dae6115d4de2f5f8de976adebbf3b725ed531f07",
         "type": "github"
       },
       "original": {
@@ -238,7 +274,8 @@
         "catppuccin-starship": "catppuccin-starship",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_2",
+        "nix-colors": "nix-colors",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nushell-scripts": "nushell-scripts",
         "wallpapers": "wallpapers"
@@ -279,18 +316,18 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1695919988,
-        "narHash": "sha256-4RBgIZHaVqH0m1POnfzYRzwCWxifIKH4xQ0kCn2LGkA=",
+        "lastModified": 1696255886,
+        "narHash": "sha256-0KZfiqqREousitBgG1mkzKmmNX4tjOIWdbBm6MvRCjQ=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e",
+        "rev": "5ef42e8e8adece098848fac53c721b6eb3818fc2",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e",
+        "rev": "5ef42e8e8adece098848fac53c721b6eb3818fc2",
         "type": "gitlab"
       }
     },
diff --git a/flake.nix b/flake.nix
index b492f96..e24d71d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,13 @@
     };
 
     # modern window compositor
-    hyprland.url = "github:hyprwm/Hyprland";
+    # hyprland.url = "github:hyprwm/Hyprland";
+    hyprland = {
+      url = "github:hyprwm/Hyprland";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
+    nix-colors.url = "github:misterio77/nix-colors";
 
     #community wayland nixpkgs
     # nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
@@ -126,10 +132,63 @@
     
   };
 
-  # outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: {
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, wallpapers, catppuccin-btop, catppuccin-bat, catppuccin-alacritty, catppuccin-starship, catppuccin-hyprland, ... }: {
-  # outputs = inputs@{ self, ...}: with inputs; {
-
+  # outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, ... }: {
+  # outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, wallpapers, nix-colors, catppuccin-btop, catppuccin-bat, catppuccin-alacritty, catppuccin-starship, catppuccin-hyprland, ... }: {
+  outputs = inputs@{ self, ...}: with inputs; {
+  # outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: 
+  #   let
+  #     inherit (self) outputs;
+  #     lib = nixpkgs.lib //home-manager.lib;
+  #     systems = [ "x86_64-linux" ];
+  #     forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
+  #     pkgsFor = lib.genAttrs systems (system: import nixpkgs {
+  #       inherit system;
+  #       config.allowUnfreee = true;
+  #     });
+  #   in {
+  #     inherit lib;
+  #     nixosModules = import ./modules/nixos;
+  #     homeManagerModules = import ./modules/home-manager;
+  #     # templates = import ./templates;
+
+  #     # overlays = import ./overlays { inherit inputs outputs; };
+  #     # hydraJobs = import ./hydra.nix { inherit inputs outputs; };
+
+  #     packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
+  #     # devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
+  #     # formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
+
+  #     # wallpapers = inherit wallpapers; #NOTE broken
+
+  #     nixosConfigurations = {
+  #       # Main desktop
+  #       khad = lib.nixosSystem {
+  #         modules = [ ./machines/khad ];
+  #         specialArgs = { inherit inputs outputs; };
+  #       };
+  #       # Personal laptop
+  #       nixos-zenbook = lib.nixosSystem {
+  #         modules = [ ./machines/khad ];
+  #         specialArgs = { inherit inputs outputs; };
+  #       };
+  #     };
+
+  #     homeConfigurations = {
+  #       # Desktop
+  #       "defin@khad" = lib.homeManagerConfiguration {
+  #         modules = [ ./home-manager/home.nix ];
+  #         pkgs = pkgsFor.x86_64-linux;
+  #         extraSpecialArgs = { inherit inputs outputs; };
+  #       };
+  #       # Laptop
+  #       "defin@nixos-zenbook" = lib.homeManagerConfiguration {
+  #         modules = [ ./home-manager/home.nix ];
+  #         pkgs = pkgsFor.x86_64-linux;
+  #         extraSpecialArgs = { inherit inputs outputs; };
+  #       };
+  #     };
+  #   };
+                
     nixosConfigurations = {
 
       nixos-zenbook = nixpkgs.lib.nixosSystem {
@@ -149,21 +208,24 @@
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/home.nix;
 
+            home-manager.extraSpecialArgs = { inherit nix-colors catppuccin-btop catppuccin-helix catppuccin-starship; };
+            # home-manager.extraSpecialArgs = { inherit (self) outputs; };
+
             # Optionally, use home-manager.extraSpecialArgs to pass
             # arguments to home.nix
           }
 
           # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
-          ./modules/hyprland.nix
+          ./modules/nixos/hyprland.nix
 
-          ./modules/bluetooth.nix
-          ./modules/environment.nix
-          ./modules/kde-connect.nix
-          ./modules/nix-common.nix
-          ./modules/services.nix
-          ./modules/steam.nix
-          ./modules/sway.nix
-          ./modules/system-packages.nix
+          ./modules/nixos/bluetooth.nix
+          ./modules/nixos/environment.nix
+          ./modules/nixos/kde-connect.nix
+          ./modules/nixos/nix-common.nix
+          ./modules/nixos/services.nix
+          ./modules/nixos/steam.nix
+          ./modules/nixos/sway.nix
+          ./modules/nixos/system-packages.nix
 
           # ./home-manager/home.nix
 
@@ -171,6 +233,7 @@
           # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           # nix.registry.nixpkgs.flake = nixpkgs;
         ];
+        # specialArgs = { inherit inputs; };
       };
 
       khad = nixpkgs.lib.nixosSystem {
@@ -185,17 +248,19 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/home.nix;
+            home-manager.extraSpecialArgs = { inherit nix-colors catppuccin-btop catppuccin-helix catppuccin-starship; };
+            # home-manager.extraSpecialArgs = { inherit (self) outputs; };
           }
-          ./modules/hyprland.nix
-
-          ./modules/bluetooth.nix
-          ./modules/environment.nix
-          ./modules/kde-connect.nix
-          ./modules/nix-common.nix
-          ./modules/services.nix
-          ./modules/steam.nix
-          ./modules/sway.nix
-          ./modules/system-packages.nix
+          ./modules/nixos/hyprland.nix
+
+          ./modules/nixos/bluetooth.nix
+          ./modules/nixos/environment.nix
+          ./modules/nixos/kde-connect.nix
+          ./modules/nixos/nix-common.nix
+          ./modules/nixos/services.nix
+          ./modules/nixos/steam.nix
+          ./modules/nixos/sway.nix
+          ./modules/nixos/system-packages.nix
         ];
       };
     };
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 898a7e5..fcc29fd 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -5,10 +5,10 @@
 # in
 {
   imports = [
-    ./starship.nix
-    ./btop.nix
-    ./helix.nix
-    ./shell.nix
+    ../modules/home-manager/starship.nix
+    ../modules/home-manager/btop.nix
+    ../modules/home-manager/helix.nix
+    ../modules/home-manager/shell.nix
   ];
 
   nixpkgs = {
diff --git a/home-manager/btop.nix b/modules/home-manager/btop.nix
index 2c4e6cc..2c4e6cc 100644
--- a/home-manager/btop.nix
+++ b/modules/home-manager/btop.nix
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
new file mode 100644
index 0000000..132d201
--- /dev/null
+++ b/modules/home-manager/default.nix
@@ -0,0 +1,6 @@
+{
+  btop = import ./btop.nix;
+  helix = import ./helix.nix;
+  shell = import ./shell.nix;
+  starship = import ./starship.nix;
+}
diff --git a/home-manager/helix.nix b/modules/home-manager/helix.nix
index a8891a5..a8891a5 100644
--- a/home-manager/helix.nix
+++ b/modules/home-manager/helix.nix
diff --git a/home-manager/shell.nix b/modules/home-manager/shell.nix
index c86190e..c86190e 100644
--- a/home-manager/shell.nix
+++ b/modules/home-manager/shell.nix
diff --git a/home-manager/starship.nix b/modules/home-manager/starship.nix
index 3a1f085..7869b4c 100644
--- a/home-manager/starship.nix
+++ b/modules/home-manager/starship.nix
@@ -6,6 +6,6 @@
       command_timeout = 1000;
 
       palette = "catppuccin_mocha";
-    } ;#// builtins.fromTOML (builtins.readFile "${catppuccin-starship}/palettes/mocha.toml");
+    } ; #// builtins.fromTOML (builtins.readFile "${catppuccin-starship}/palettes/mocha.toml");
   };
 }
\ No newline at end of file
diff --git a/modules/bluetooth.nix b/modules/nixos/bluetooth.nix
index 36e8f8f..36e8f8f 100644
--- a/modules/bluetooth.nix
+++ b/modules/nixos/bluetooth.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
new file mode 100644
index 0000000..a6d62e3
--- /dev/null
+++ b/modules/nixos/default.nix
@@ -0,0 +1,11 @@
+{
+  bluetooth = import ./bluetooth.nix;
+  environment  = import ./environment.nix;
+  hyprland = import ./hyprland.nix;
+  kde-connect = import ./kde-connect.nix;
+  nix-common = import ./nix-common.nix;
+  services = import ./services.nix;
+  steam = import ./steam.nix;
+  sway = import ./sway.nix;
+  system-packages = import ./system-packages.nix;
+}
diff --git a/modules/environment.nix b/modules/nixos/environment.nix
index 225ddda..225ddda 100644
--- a/modules/environment.nix
+++ b/modules/nixos/environment.nix
diff --git a/modules/hyprland.nix b/modules/nixos/hyprland.nix
index c754eae..c754eae 100644
--- a/modules/hyprland.nix
+++ b/modules/nixos/hyprland.nix
diff --git a/modules/kde-connect.nix b/modules/nixos/kde-connect.nix
index 3705c44..3705c44 100644
--- a/modules/kde-connect.nix
+++ b/modules/nixos/kde-connect.nix
diff --git a/modules/nix-common.nix b/modules/nixos/nix-common.nix
index 6e4d373..6e4d373 100644
--- a/modules/nix-common.nix
+++ b/modules/nixos/nix-common.nix
diff --git a/modules/services.nix b/modules/nixos/services.nix
index 336d132..336d132 100644
--- a/modules/services.nix
+++ b/modules/nixos/services.nix
diff --git a/modules/steam.nix b/modules/nixos/steam.nix
index 91c5b67..91c5b67 100644
--- a/modules/steam.nix
+++ b/modules/nixos/steam.nix
diff --git a/modules/sway.nix b/modules/nixos/sway.nix
index 8d4d664..8d4d664 100644
--- a/modules/sway.nix
+++ b/modules/nixos/sway.nix
diff --git a/modules/system-packages.nix b/modules/nixos/system-packages.nix
index 1ffa540..1ffa540 100644
--- a/modules/system-packages.nix
+++ b/modules/nixos/system-packages.nix