i finally fixed the inputs issue: when passing inputs as inputs instead of input-name, you must call inputs.input-name

6 files changed, 24 insertions, 22 deletions

diff --git a/flake.nix b/flake.nix
index 71b9468..666a981 100644
--- a/flake.nix
+++ b/flake.nix
@@ -197,14 +197,14 @@
   #   };
     
     nixosConfigurations = {
-      live = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
-          ./modules/users/defin.nix
-          ./modules/nixos/system-packages.nix
-        ];
-      };
+      # live = nixpkgs.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   modules = [
+      #     (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+      #     ./modules/users/defin.nix
+      #     ./modules/nixos/system-packages.nix
+      #   ];
+      # };
 
       zenbook = nixpkgs.lib.nixosSystem {
         # inherit system;
@@ -221,7 +221,7 @@
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/home.nix;
 
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
 
           # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
@@ -260,7 +260,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/default.nix;
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
         ];
       };
@@ -279,7 +279,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/default.nix;
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
 
           ./modules/nixos/headscale.nix
@@ -296,7 +296,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/home.nix;
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
           ./modules/nixos/hyprland.nix
 
diff --git a/modules/home-manager/bat.nix b/modules/home-manager/bat.nix
index 5a9802e..3a06076 100644
--- a/modules/home-manager/bat.nix
+++ b/modules/home-manager/bat.nix
@@ -1,4 +1,4 @@
-{ catppuccin-bat, ...}: {
+{ inputs, ...}: {
   # a cat(1) clone with syntax highlighting and Git integration.
   programs.bat = {
     enable = true;
@@ -7,7 +7,7 @@
       theme = "catppuccin-mocha";
     };
     themes = {
-      catppuccin-mocha = builtins.readFile "${catppuccin-bat}/Catppuccin-mocha.tmTheme";
+      catppuccin-mocha = builtins.readFile "${inputs.catppuccin-bat}/Catppuccin-mocha.tmTheme";
     };
   };
 }
diff --git a/modules/home-manager/btop.nix b/modules/home-manager/btop.nix
index 7243a6e..894ff2e 100644
--- a/modules/home-manager/btop.nix
+++ b/modules/home-manager/btop.nix
@@ -1,5 +1,5 @@
-{ catppuccin-btop, ... }: {
-  home.file.".config/btop/themes".source = "${catppuccin-btop}/themes";
+{ inputs, ... }: {
+  home.file.".config/btop/themes".source = "${inputs.catppuccin-btop}/themes";
 
   #replace htop/nmon
   programs.btop = {
diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix
index 6eb8895..1eaebfb 100644
--- a/modules/home-manager/helix.nix
+++ b/modules/home-manager/helix.nix
@@ -1,6 +1,6 @@
-{ pkgs, catppuccin-helix, ... }: {
+{ pkgs, inputs, ... }: {
   # https://github.com/catppuccin/helix
-  xdg.configFile."helix/themes".source = "${catppuccin-helix}/themes/default";
+  xdg.configFile."helix/themes".source = "${inputs.catppuccin-helix}/themes/default";
 
   programs.helix = {
     enable = true;
diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix
index 612c92a..685cda1 100644
--- a/modules/home-manager/shell.nix
+++ b/modules/home-manager/shell.nix
@@ -1,4 +1,6 @@
-{nushell-scripts, ... }: {
+{inputs, ... }: let
+  nushell-scripts = inputs.nushell-scripts;
+in {
   programs.nushell = {
     enable = true;
     shellAliases = {
diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix
index 12d6f6b..eafc03c 100644
--- a/modules/home-manager/starship.nix
+++ b/modules/home-manager/starship.nix
@@ -1,4 +1,4 @@
-{ catppuccin-starship, ... }: {
+{ inputs, ... }: {
   programs.starship = {
     enable = true;
    
@@ -6,6 +6,6 @@
       command_timeout = 1000;
 
       palette = "catppuccin_mocha";
-    } // builtins.fromTOML (builtins.readFile "${catppuccin-starship}/palettes/mocha.toml");
+    } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml");
   };
-}
\ No newline at end of file
+}