From f6f228f990bdbd1c913409f8b50c3b44e859dc6d Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Sat, 1 Jun 2024 18:02:50 +0530
Subject: [PATCH] conf: fix globalArgs

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 conf/default.nix       | 12 +++++-------
 home/default.nix       |  9 +++++++--
 home/natto/wayland.nix |  2 ++
 hosts/default.nix      |  4 +++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/conf/default.nix b/conf/default.nix
index 83af081..cb59dcc 100644
--- a/conf/default.nix
+++ b/conf/default.nix
@@ -1,13 +1,11 @@
 { inputs, self, ... }:
 {
   config._module.args.globalArgs = {
-    _module.args = {
-      inherit inputs self;
-      flake = self;
-      conf = {
-        colors = import ./colors.nix;
-        network = import ./network.nix;
-      };
+    inherit inputs self;
+    flake = self;
+    conf = {
+      colors = import ./colors.nix;
+      network = import ./network.nix;
     };
   };
 }
diff --git a/home/default.nix b/home/default.nix
index 0a80b5d..9cec977 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,7 +3,6 @@ let
   common = [
     ./common/zsh.nix
     ./common/programs.nix
-    globalArgs
   ];
 
   mkPkgs = system: import inputs.nixpkgs {
@@ -15,6 +14,8 @@ let
     };
     overlays = [ self.overlays.default ];
   };
+
+  extraSpecialArgs = globalArgs;
 in
 {
   flake.homeConfigurations =
@@ -24,11 +25,11 @@ in
         ./natto
         ./common/laptop.nix
         inputs.agenix.homeManagerModules.default
-        inputs.hyprland.homeManagerModules.default
       ] ++ common;
     in
     {
       natto-laptop = inputs.home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs;
         modules = nattoModules ++ [
           { isLaptop = true; }
         ];
@@ -36,6 +37,7 @@ in
       };
 
       natto = inputs.home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs;
         modules = nattoModules;
         pkgs = mkPkgs "x86_64-linux";
       };
@@ -44,6 +46,7 @@ in
 
     // {
       spark = inputs.home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs;
         modules = [{
           home = {
             homeDirectory = "/home/spark";
@@ -55,6 +58,7 @@ in
       };
 
       bat = inputs.home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs;
         modules = [{
           home = {
             homeDirectory = "/home/bat";
@@ -66,6 +70,7 @@ in
       };
 
       spin = inputs.home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs;
         modules = [{
           home = {
             homeDirectory = "/home/spin";
diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix
index 0c35310..0008d86 100644
--- a/home/natto/wayland.nix
+++ b/home/natto/wayland.nix
@@ -1,6 +1,8 @@
 { pkgs, config, conf, inputs, ... }:
 {
   imports = [
+    inputs.hyprland.homeManagerModules.default
+
     ./ags
     # ./eww
   ];
diff --git a/hosts/default.nix b/hosts/default.nix
index 06ed349..2035cff 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -4,7 +4,9 @@ let
 
   commonModules = [
     ./nvim.nix
-    globalArgs
+    {
+      _module.args = globalArgs;
+    }
   ];
   desktopModules = [
     ./xorg.nix