From 21cd3e96daaa7129130def67b8c7686f0c4d2ac5 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sun, 8 Sep 2024 23:54:29 -0400
Subject: [PATCH] meta(home-manager): Remove dependency on extraSpecialArgs

Makes copy/pasting easier and removes non-standard arguments in
home-manager modules.
---
 home/eww.nix       | 4 +++-
 home/gtk.nix       | 4 +++-
 home/hyprland.nix  | 4 +++-
 home/ironbar.nix   | 4 +++-
 home/librewolf.nix | 3 ++-
 modules/system.nix | 4 ----
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/home/eww.nix b/home/eww.nix
index d895323f..d6cf44b8 100644
--- a/home/eww.nix
+++ b/home/eww.nix
@@ -1,11 +1,13 @@
 {
-  nix-config,
+  nixosConfig,
   pkgs,
   config,
   ...
 }:
 
 let
+  inherit (nixosConfig._module.specialArgs) nix-config;
+
   inherit (config.home) homeDirectory;
   inherit (config.lib.stylix.colors.withHashtag) base00 base05;
   inherit (nix-config.packages.${pkgs.system}) fluent-icons;
diff --git a/home/gtk.nix b/home/gtk.nix
index 14212733..350ed478 100644
--- a/home/gtk.nix
+++ b/home/gtk.nix
@@ -1,11 +1,13 @@
 {
-  nix-config,
+  nixosConfig,
   config,
   pkgs,
   ...
 }:
 
 let
+  inherit (nixosConfig._module.specialArgs) nix-config;
+
   phosh-backgrounds = nix-config.packages.${pkgs.system}.phosh-backgrounds.override {
     color = config.lib.stylix.colors.base00;
   };
diff --git a/home/hyprland.nix b/home/hyprland.nix
index 8d7eb1df..d527fb5b 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -1,11 +1,13 @@
 {
-  nix-config,
+  nixosConfig,
   pkgs,
   lib,
   ...
 }:
 
 let
+  inherit (nixosConfig._module.specialArgs) nix-config;
+
   inherit (lib) mkForce;
   inherit (nix-config.packages.${pkgs.system}) osu-backgrounds;
 
diff --git a/home/ironbar.nix b/home/ironbar.nix
index 096a6a03..195670a3 100644
--- a/home/ironbar.nix
+++ b/home/ironbar.nix
@@ -1,5 +1,5 @@
 {
-  nix-config,
+  nixosConfig,
   config,
   lib,
   pkgs,
@@ -7,6 +7,8 @@
 }:
 
 let
+  inherit (nixosConfig._module.specialArgs) nix-config;
+
   inherit (lib) singleton;
   inherit (builtins) toJSON;
   inherit (nix-config.packages.${pkgs.system}) dunst-scripts;
diff --git a/home/librewolf.nix b/home/librewolf.nix
index 53541bd2..ee0c933e 100644
--- a/home/librewolf.nix
+++ b/home/librewolf.nix
@@ -1,12 +1,13 @@
 {
   pkgs,
   lib,
-  nix-config,
   nixosConfig,
   ...
 }:
 
 let
+  inherit (nixosConfig._module.specialArgs) nix-config;
+
   inherit (lib) mkIf singleton;
   inherit (nix-config.packages.${pkgs.system}) friendlyfox;
 
diff --git a/modules/system.nix b/modules/system.nix
index 89ffd2c6..67371bf3 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -187,10 +187,6 @@ in
 
         homeDirectory = "/home/${username}";
       };
-
-      extraSpecialArgs = {
-        inherit nix-config;
-      };
     };
 
     virtualisation.vmVariant = {