From 8f247b2e6b86cbf5df344519551d714405c0af16 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@ifi.uio.no>
Date: Tue, 30 Sep 2025 14:15:24 +0200
Subject: [PATCH] Pass all inputs

---
 flake.nix                                 |  9 +++------
 machines/macbook/default.nix              |  4 ++--
 modules/desktop/default.nix               |  4 ++--
 modules/desktop/hypr/bindings/default.nix |  7 +++++--
 modules/nixos/default.nix                 | 10 ++--------
 modules/tools/editor/default.nix          |  4 ++--
 6 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5416dd1..539a9fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,17 +31,14 @@
       nixpkgs,
       home-manager,
       nix-rosetta-builder,
-      nanostatus,
-      emacs-larstvei,
-      zen-browser,
       ...
-    }:
+    }@inputs:
     {
       darwinConfigurations = {
         larstvei-macbookpro = darwin.lib.darwinSystem {
           system = "aarch64-darwin";
 
-          specialArgs = { inherit emacs-larstvei; };
+          specialArgs = { inherit inputs; };
 
           modules = [
             home-manager.darwinModules.default
@@ -54,7 +51,7 @@
 
       nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = { inherit emacs-larstvei nanostatus zen-browser; };
+        specialArgs = { inherit inputs; };
         modules = [
           home-manager.nixosModules.default
           ./machines/thinkpad
diff --git a/machines/macbook/default.nix b/machines/macbook/default.nix
index a4f1ff4..6183cb2 100644
--- a/machines/macbook/default.nix
+++ b/machines/macbook/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, emacs-larstvei, ... }:
+{ pkgs, inputs, ... }:
 {
   imports = [
     ../../modules/base
@@ -17,7 +17,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = { inherit emacs-larstvei; };
+    extraSpecialArgs = { inherit inputs; };
     users.larstvei.imports = [ ../../modules/home/full ];
   };
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 347c9c6..7641560 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, zen-browser, ... }:
+{ pkgs, inputs, ... }:
 {
 
   home.packages = [
@@ -11,7 +11,7 @@
   ];
 
   imports = [
-    zen-browser.homeModules.beta
+    inputs.zen-browser.homeModules.beta
     ./hypr
     ./theme
   ];
diff --git a/modules/desktop/hypr/bindings/default.nix b/modules/desktop/hypr/bindings/default.nix
index 8fd244c..5c72b59 100644
--- a/modules/desktop/hypr/bindings/default.nix
+++ b/modules/desktop/hypr/bindings/default.nix
@@ -1,4 +1,7 @@
-{ pkgs, nanostatus, ... }:
+{ pkgs, inputs, ... }:
+let
+  nanostatus = inputs.nanostatus.packages.${pkgs.system}.default;
+in
 {
   wayland.windowManager.hyprland.settings = {
     input = {
@@ -51,7 +54,7 @@
       "$mod, -, resizeactive, -10"
 
       "$mod, D, exec, darkman toggle"
-      "$mod, space, exec, ${nanostatus.packages.${pkgs.system}.default}/bin/nanostatus-toggle"
+      "$mod, space, exec, ${nanostatus}/bin/nanostatus-toggle"
       "$mod, backspace, exec, hyprlock"
 
       # Text input (macOS-like way of producing Norwegian characters)
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index d4619b8..0a34696 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,10 +1,4 @@
-{
-  pkgs,
-  nanostatus,
-  emacs-larstvei,
-  zen-browser,
-  ...
-}:
+{ pkgs, inputs, ... }:
 {
 
   imports = [
@@ -14,7 +8,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; };
+    extraSpecialArgs = { inherit inputs; };
   };
 
   users.users.larstvei = {
diff --git a/modules/tools/editor/default.nix b/modules/tools/editor/default.nix
index 0443d69..41f2d5c 100644
--- a/modules/tools/editor/default.nix
+++ b/modules/tools/editor/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, emacs-larstvei, ... }:
+{ pkgs, inputs, ... }:
 {
   home.packages = [
-    emacs-larstvei.defaultPackage.${pkgs.system}
+    inputs.emacs-larstvei.defaultPackage.${pkgs.system}
   ];
 }