Use inputs everywhere instead of specialArgs

nikitawootten · Mar 20, 2024 · e5eeac2 · e5eeac2
1 parent b618229
commit e5eeac2
Show file tree

Hide file tree

Showing 9 changed files with 494 additions and 130 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -53,30 +53,22 @@
     self,
     nixpkgs,
     home-manager,
-    nixos-hardware,
-    lanzaboote,
-    devenv,
-    nix-index-database,
-    agenix,
-    arion,
-    flatpaks,
-    nixos-generators,
     deploy-rs,
     flake-schemas,
     ...
-  }: let
+  } @ inputs: let
     secrets = import ./secrets;
     keys = import ./keys.nix;
 
     # Args passed to home-manager and nixos modules
     specialArgs = {
-      inherit devenv nixos-hardware lanzaboote nix-index-database agenix arion nixos-generators secrets keys flatpaks self;
+      inherit self inputs secrets keys;
     };
 
     homes = self.lib.mkHomes {
       inherit specialArgs;
       configBasePath = ./homes;
-      defaultModules = [self.homeModules.personal nix-index-database.hmModules.nix-index];
+      defaultModules = [self.homeModules.personal inputs.nix-index-database.hmModules.nix-index];
       homes = {
         nikita.system = "x86_64-linux";
         "nikita@voyager".system = "x86_64-linux";

diff --git a/homeModules/personal/direnv.nix b/homeModules/personal/direnv.nix
@@ -1,4 +1,4 @@
-{ lib, config, devenv ? null, pkgs, ... }:
+{ lib, config, inputs, pkgs, ... }:
 let
   cfg = config.personal.direnv;
 in
@@ -19,8 +19,8 @@ in
     programs.git.ignores = [
       ".direnv"
     ];
-    home.packages = lib.lists.optionals (!(builtins.isNull devenv)) [
-      devenv.packages.${pkgs.system}.devenv
+    home.packages = [
+      inputs.devenv.packages.${pkgs.system}.devenv
     ];
   };
 }
diff --git a/hostModules/raspi4sd/default.nix b/hostModules/raspi4sd/default.nix
@@ -1,7 +1,7 @@
-{ nixos-hardware, modulesPath, pkgs, lib, ... }:
+{ inputs, modulesPath, pkgs, lib, ... }:
 {
   imports = [
-    nixos-hardware.nixosModules.raspberry-pi-4
+    inputs.nixos-hardware.nixosModules.raspberry-pi-4
     "${modulesPath}/installer/sd-card/sd-image.nix"
   ];
 

diff --git a/hosts/dionysus/default.nix b/hosts/dionysus/default.nix
@@ -1,10 +1,10 @@
-{ self, pkgs, nixos-hardware, ... }:
+{ self, pkgs, inputs, ... }:
 {
   imports = [
     ./hardware-configuration.nix
     self.nixosModules.personal
     self.nixosModules.dslr-webcam
-    nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
+    inputs.nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
   ];
 
   personal.gnome.enable = true;

diff --git a/hosts/hades/lab/default.nix b/hosts/hades/lab/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, arion, agenix, ... }:
+{ inputs, lib, config, ... }:
 let
   cfg = config.personal.lab;
 in
@@ -59,8 +59,8 @@ in
   };
 
   imports = [
-    arion.nixosModules.arion
-    agenix.nixosModules.default
+    inputs.arion.nixosModules.arion
+    inputs.agenix.nixosModules.default
     ./auth
     ./infra
     ./media

diff --git a/hosts/iris/default.nix b/hosts/iris/default.nix
@@ -1,7 +1,7 @@
-{ self, config, lib, secrets, agenix, ... }:
+{ self, inputs, config, lib, secrets, ... }:
 {
   imports = [
-    agenix.nixosModules.default
+    inputs.agenix.nixosModules.default
 
     self.nixosModules.raspi4sd
     self.nixosModules.personal
@@ -12,9 +12,21 @@
 
   homelab.lan-domain = "arpa.nikita.computer";
 
-  homelab.observability.grafana.enable = true;
-  homelab.observability.prometheus.enable = true;
-  homelab.observability.loki.enable = true;
+  homelab.observability.enable = true;
+  homelab.homepage.enable = true;
+  services.homepage-dashboard.services = [
+    {
+      observability = [
+        {
+          Grafna = {
+            icon = "grafana.png";
+            href = config.homelab.observability.grafana.url;
+            description = "system monitoring";
+          };
+        }
+      ];
+    }
+  ];
 
   age.secrets.cloudflare-dns.file = secrets.traefik;
 

diff --git a/hosts/raspberrypi4/default.nix b/hosts/raspberrypi4/default.nix
@@ -1,10 +1,10 @@
-{ self, username, nixos-generators, ... }:
+{ self, inputs, username, ... }:
 {
   imports = [
     self.nixosModules.raspi4sd
     # By default, configure locale and ssh server, and some basic packages
     self.nixosModules.personal
-    nixos-generators.nixosModules.all-formats
+    inputs.nixos-generators.nixosModules.all-formats
   ];
 
   personal.tailscale.enable = false;

diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
@@ -1,8 +1,8 @@
-{ self, nixos-hardware, ... }:
+{ self, inputs, ... }:
 {
   imports = [
     ./hardware-configuration.nix
-    nixos-hardware.nixosModules.framework-11th-gen-intel
+    inputs.nixos-hardware.nixosModules.framework-11th-gen-intel
     self.nixosModules.personal
   ];