From b40e0115f53b952cd393afd892c0a3447ad7a8ed Mon Sep 17 00:00:00 2001
From: Username404-59 <w.iron.zombie@gmail.com>
Date: Fri, 3 Jul 2026 20:26:17 +0200
Subject: [PATCH] Import home modules in their respective .nix files

---
 home/doggo/catppuccin-config.nix | 2 ++
 home/doggo/doggo.nix             | 6 ------
 home/doggo/spicetify-config.nix  | 7 ++++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/home/doggo/catppuccin-config.nix b/home/doggo/catppuccin-config.nix
index 3a87216..c3736d0 100644
--- a/home/doggo/catppuccin-config.nix
+++ b/home/doggo/catppuccin-config.nix
@@ -4,6 +4,8 @@ let
   shared_theme = "Catppuccin-GTK-Red-Dark";
 in
 {
+  imports = [ "${nixtamal.catppuccin}/modules/home-manager" ];
+
   catppuccin = {
     autoEnable = true;
     enable = true;
diff --git a/home/doggo/doggo.nix b/home/doggo/doggo.nix
index c2ebb6e..1e64e8e 100644
--- a/home/doggo/doggo.nix
+++ b/home/doggo/doggo.nix
@@ -1,8 +1,5 @@
 { config, pkgs, nixtamal, functions, localPackagesOverlay, ... }:
 
-let
-  spicetify-nix = import nixtamal.nix-spicetify { pkgs = import nixtamal.nixpkgs { }; };
-in
 {
   home.username = "doggo";
   home.homeDirectory = "/home/doggo";
@@ -83,7 +80,6 @@ in
   ];
 
   imports = [
-    "${nixtamal.catppuccin}/modules/home-manager"
     ./catppuccin-config.nix
     ./hyprland-config.nix
     ./ironbar-config.nix
@@ -92,10 +88,8 @@ in
     ./discord-config.nix
     ./firefox-config.nix
     ./mpv-config.nix
-    spicetify-nix.homeManagerModules.spicetify
     ./spicetify-config.nix
   ];
-  _module.args = { inherit spicetify-nix; };
 
   qt = {
     enable = true;
diff --git a/home/doggo/spicetify-config.nix b/home/doggo/spicetify-config.nix
index 70910d4..083f5f1 100644
--- a/home/doggo/spicetify-config.nix
+++ b/home/doggo/spicetify-config.nix
@@ -1,6 +1,11 @@
-{ spicetify-nix, nixtamal, ... }:
+{ nixtamal, ... }:
 
+let
+  spicetify-nix = import nixtamal.nix-spicetify { pkgs = import nixtamal.nixpkgs { }; };
+in
 {
+  imports = [ spicetify-nix.homeManagerModules.spicetify ];
+
   programs.spicetify = {
     enable = true;