Probably tons of breakage

home-manager/common/desktops/hyprland/gruvbox/wlogout-conf.nix

@@ -70,22 +70,22 @@
             }
 
             #lock { 
-                background-image: url("/etc/nixos/git/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/wlogout/lock.png");
+                background-image: url("/etc/nixos/git/home-manager/desktops/hyprland/_default/wlogout/lock.png");
             }
             #logout { 
-                background-image: url("/etc/nixos/git/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/wlogout/logout.png");
+                background-image: url("/etc/nixos/git/home-manager/desktops/hyprland/_default/wlogout/logout.png");
             }
             #suspend { 
-                background-image: url("/etc/nixos/git/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/wlogout/suspend.png");
+                background-image: url("/etc/nixos/git/home-manager/desktops/hyprland/_default/wlogout/suspend.png");
             }
             #hibernate { 
-                background-image: url("/etc/nixos/git/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/wlogout/hibernate.png");
+                background-image: url("/etc/nixos/git/home-manager/desktops/hyprland/_default/wlogout/hibernate.png");
             }
             #shutdown { 
-                background-image: url("/etc/nixos/git/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/wlogout/shutdown.png");
+                background-image: url("/etc/nixos/git/home-manager/desktops/hyprland/_default/wlogout/shutdown.png");
             }
             #reboot { 
-                background-image: url("/etc/nixos/git/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/wlogout/reboot.png");
+                background-image: url("/etc/nixos/git/home-manager/desktops/hyprland/_default/wlogout/reboot.png");
             }
         '';
     };

home-manager/common/software/cli/default.nix

@@ -0,0 +1,13 @@
+{ theme, hostname, ... }: {
+    imports = [
+    ./bash.nix
+    ./doom-emacs.nix
+    ./git.nix
+    ./kitty.nix
+    ./neofetch.nix
+    ./neovim.nix
+    ./ranger.nix
+    
+    ./${theme}/btop.nix
+    ];
+}

home-manager/common/software/cli/doom-emacs.nix

@@ -1,7 +1,7 @@
-{ pkgs, ... }: {
+{ theme, pkgs, ... }: {
     programs.doom-emacs = {
         enable = true;
-        doomPrivateDir = ./doom-emacs.d;
+        doomPrivateDir = ./${theme}/doom-emacs.d;
     };
     programs.ripgrep.enable = true;
 

home-manager/common/software/cli/kitty.nix

@@ -1,9 +1,9 @@
-{ config, pkgs, ... }: {
+{ theme, ... }: {
   # Kitty Conf
   # https://sw.kovidgoyal.net/kitty/conf/
 
   # Theme
-  imports = [ ./gruvbox/kitty-theme.nix ];
+  imports = [ ./${theme}/kitty-theme.nix ];
 
   home.file.".config/kitty/kitty.conf".text = ''
   sync_to_monitor yes

home-manager/common/software/gui/firefox.nix

@@ -42,6 +42,12 @@
           updateInterval = 24 * 60 * 60 * 1000; # every day
           definedAliases = [ "@nw" ];
         };
+
+        "Home Manager Options" = {
+          urls = [{ template = "https://mipmip.github.io/home-manager-option-search/?query={searchTerms}" }];
+          icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+          definedAliases = [ "@hm" ];
+        };
       };
     };
   };

home-manager/default.nix

@@ -14,15 +14,8 @@
   };
 
   imports = [ 
-    # Common app configs - Will apply to all users managed by home-manager
+    # Common configs
-    ./common/software/cli/bash.nix
+    ./common/software/cli
-    ./common/software/cli/btop.nix
-    ./common/software/cli/git.nix
-    ./common/software/cli/kitty.nix
-    ./common/software/cli/neofetch.nix
-    ./common/software/cli/neovim.nix
-    ./common/software/cli/doom-emacs.nix
-    ./common/software/cli/ranger.nix
 
     # User configs
     ./users/${username}

home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/hyprland-conf.nix

@@ -1,4 +1,4 @@
-{ hostname, ... }: {
+{ theme, ... }: {
   home.file = {
     ".config/hypr/hyprland.conf" = {
       enable = true;
@@ -254,8 +254,8 @@
 
           # Set the wallpaper
           swww init &
-          WALLPAPER_DIR=/etc/nixos/git/wallpapers/gruvbox
+          WALLPAPER_DIR=/etc/nixos/git/wallpapers/${theme}
-          swww img $WALLPAPER_DIR/wallpaper9.jpg &
+          swww img $WALLPAPER_DIR/`ls $WALLPAPER_DIR | shuf -n 1` &
 
           # Waybar
           waybar &

home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar-conf.nix

@@ -1,4 +1,4 @@
-{ hostname, ...}: {
+{ ...}: {
   imports = [ ./scripts/waybar-scripts.nix ];
 
   home.file = {
@@ -142,9 +142,9 @@
                 "format-icons": ["", "", "", "", ""]
             },
         }
-
       '';
     };
+
     # Waybar theming
     ".config/waybar/style.css" = {
       enable = true;