Simplify imports

dbeley · Jan 1, 2024 · 97230f7 · 97230f7
1 parent 66c0c5a
commit 97230f7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/flake.nix b/flake.nix
@@ -39,8 +39,6 @@
     self,
     nixpkgs,
     home-manager,
-    hyprland,
-    nixvim,
     ...
   }: let
     system = "x86_64-linux";
@@ -53,7 +51,7 @@
   in {
     nixosConfigurations = (
       import ./hosts {
-        inherit lib inputs pkgs user system home-manager hyprland nixvim;
+        inherit lib inputs pkgs user system home-manager;
       }
     );
   };

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -4,8 +4,6 @@
   system,
   home-manager,
   user,
-  hyprland,
-  nixvim,
   ...
 }: {
   t470s = lib.nixosSystem {
@@ -27,7 +25,7 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-          extraSpecialArgs = {inherit user inputs system hyprland nixvim;};
+          extraSpecialArgs = {inherit user inputs system;};
           users.${user} = {
             imports = [(import ./t470s/home.nix)];
           };
@@ -56,7 +54,7 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-          extraSpecialArgs = {inherit user inputs system hyprland nixvim;};
+          extraSpecialArgs = {inherit user inputs system;};
           users.${user} = {
             imports = [(import ./x13/home.nix)];
           };
@@ -82,7 +80,7 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-          extraSpecialArgs = {inherit user inputs system nixvim;};
+          extraSpecialArgs = {inherit user inputs system;};
           users.${user} = {
             imports = [(import ./sg13/home.nix)];
           };
@@ -109,7 +107,7 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-          extraSpecialArgs = {inherit user inputs system hyprland nixvim;};
+          extraSpecialArgs = {inherit user inputs system;};
           users.${user} = {
             imports = [(import ./x61s/home.nix)];
           };

diff --git a/hosts/sg13/home.nix b/hosts/sg13/home.nix
@@ -1,11 +1,11 @@
 {
   pkgs,
   user,
-  nixvim,
+  inputs,
   ...
 }: {
   imports = [
-    nixvim.homeManagerModules.nixvim
+    inputs.nixvim.homeManagerModules.nixvim
 
     ../../apps/git/git.nix
     ../../apps/fish/fish.nix

diff --git a/hosts/t470s/home.nix b/hosts/t470s/home.nix
@@ -1,13 +1,12 @@
 {
   pkgs,
   user,
-  hyprland,
-  nixvim,
+  inputs,
   ...
 }: {
   imports = [
-    hyprland.homeManagerModules.default
-    nixvim.homeManagerModules.nixvim
+    inputs.hyprland.homeManagerModules.default
+    inputs.nixvim.homeManagerModules.nixvim
     ../../apps/hyprland/hyprland.nix
     ../../apps/waybar/waybar.nix
     ../../apps/tofi/tofi.nix

diff --git a/hosts/x13/home.nix b/hosts/x13/home.nix
@@ -1,13 +1,12 @@
 {
   pkgs,
   user,
-  hyprland,
-  nixvim,
+  inputs,
   ...
 }: {
   imports = [
-    hyprland.homeManagerModules.default
-    nixvim.homeManagerModules.nixvim
+    inputs.hyprland.homeManagerModules.default
+    inputs.nixvim.homeManagerModules.nixvim
     ../../apps/hyprland/hyprland.nix
     ../../apps/waybar/waybar.nix
     ../../apps/tofi/tofi.nix

diff --git a/hosts/x61s/home.nix b/hosts/x61s/home.nix
@@ -1,9 +1,11 @@
 {
   pkgs,
   user,
+  inputs,
   ...
 }: {
   imports = [
+    inputs.nixvim.homeManagerModules.nixvim
     ../../apps/sway/sway.nix
     ../../apps/waybar/waybar.nix
     ../../apps/tofi/tofi.nix