From 77168ba9c76f62bfba9008b95d370f93cd3590f5 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Wed, 1 Jan 2025 11:30:16 -0500
Subject: [PATCH] Shift home config to enable by desktop, work out more details
 later

---
 modules/home/files/default.nix                |  4 +--
 modules/home/programs/gui/foot/default.nix    |  2 +-
 modules/home/programs/gui/imv/default.nix     |  4 +--
 .../home/programs/gui/librewolf/default.nix   |  6 ++--
 .../home/programs/gui/mangohud/default.nix    |  8 ++---
 modules/home/programs/gui/mpv/default.nix     |  4 +--
 modules/home/programs/gui/obs/default.nix     |  4 +--
 modules/home/programs/gui/pcmanfm/default.nix |  4 +--
 modules/home/programs/gui/rofi/default.nix    |  2 +-
 .../programs/gui/rofi/scripts/default.nix     |  4 +--
 modules/home/programs/gui/thunar/default.nix  | 10 ------
 .../home/programs/gui/thunderbird/default.nix |  4 +--
 .../home/programs/misc/avtools/default.nix    |  4 +--
 .../misc/gaming/emulators/default.nix         |  4 +--
 .../misc/gaming/launchers/default.nix         |  4 +--
 .../home/programs/misc/general/default.nix    |  4 +--
 .../home/programs/misc/production/default.nix | 17 +++++-----
 .../programs/misc/remote-desktop/default.nix  |  4 +--
 modules/home/programs/misc/school/default.nix |  4 +--
 .../programs/terminal/ncmpcpp/default.nix     | 32 +++++++++---------
 .../home/programs/terminal/spotdl/default.nix |  4 +--
 .../home/programs/terminal/yt-dlp/default.nix | 23 ++++++-------
 modules/home/services/easyeffects/default.nix | 17 +++++-----
 .../home/services/gnome-keyring/default.nix   |  4 +--
 modules/home/services/mpd/default.nix         |  2 +-
 modules/home/services/udiskie/default.nix     |  4 +--
 modules/home/settings/cursor/default.nix      |  4 +--
 modules/home/settings/fonts/default.nix       | 33 ++++++++++---------
 modules/home/settings/gtk/css/default.nix     |  1 -
 modules/home/settings/xdg/folders/default.nix |  2 +-
 modules/home/wms/programs/default.nix         |  4 +--
 .../home/wms/programs/grimsnap/default.nix    |  4 +--
 modules/home/wms/programs/mako/default.nix    |  2 +-
 .../wms/programs/mako/makotoggle/default.nix  |  4 +--
 .../home/wms/programs/wlpicker/default.nix    |  4 +--
 modules/home/wms/programs/wpaperd/default.nix |  2 +-
 .../wms/sway/programs/prop-sway/default.nix   |  4 +--
 37 files changed, 120 insertions(+), 127 deletions(-)
 delete mode 100644 modules/home/programs/gui/thunar/default.nix

diff --git a/modules/home/files/default.nix b/modules/home/files/default.nix
index 2a26b3c..458f7e5 100644
--- a/modules/home/files/default.nix
+++ b/modules/home/files/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
-  home.file = {
+{ config, lib, ... }: {
+  home.file = lib.mkIf config.home.desktop.enable {
     ".face".source = ./assets/pfp.png;
     ".assets/wallpapers".source = ./assets/wallpapers;
     ".assets/lockscreen".source = ./assets/lockscreen;
diff --git a/modules/home/programs/gui/foot/default.nix b/modules/home/programs/gui/foot/default.nix
index 3e44a79..acd2601 100644
--- a/modules/home/programs/gui/foot/default.nix
+++ b/modules/home/programs/gui/foot/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   programs.foot = {
-    enable = true;
+    enable = config.home.desktop.enable;
     server.enable = false;
     settings = {
       main = {
diff --git a/modules/home/programs/gui/imv/default.nix b/modules/home/programs/gui/imv/default.nix
index ef8d0cb..b4f97b8 100644
--- a/modules/home/programs/gui/imv/default.nix
+++ b/modules/home/programs/gui/imv/default.nix
@@ -1,7 +1,7 @@
-{ ... }:
+{ config, ... }:
 {
   programs.imv = {
-    enable = true;
+    enable = config.home.desktop.enable;
     settings.binds = {
       h = "prev";
       j = "zoom -5";
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index 09b2153..648ffcf 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -80,7 +80,7 @@ in {
             }
           ];
           icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-          definedAliases = [ "@pkgs" ];
+          definedAliases = [ "@p" ];
         };
         "MyNixOS" = {
           urls = [
@@ -137,8 +137,6 @@ in {
     commonSettings = {
       "general.autoScroll" = true;
 
-      "places.history.enabled" = false;
-
       "font.name.serif.x-western" = config.look.fonts.main;
       "font.name.sans-serif.x-western" = config.look.fonts.main;
       "font.name.monospace.x-western" = config.look.fonts.nerd;
@@ -244,7 +242,7 @@ in {
       "webgl.disabled" = false;
     };
   in {
-    enable = true;
+    enable = config.home.desktop.enable;
     package = pkgs.librewolf;
     profiles = {
       Main = {
diff --git a/modules/home/programs/gui/mangohud/default.nix b/modules/home/programs/gui/mangohud/default.nix
index 647ae17..7ae9f2e 100644
--- a/modules/home/programs/gui/mangohud/default.nix
+++ b/modules/home/programs/gui/mangohud/default.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
-  home = {
-    packages = with pkgs; [ mangohud ];
-    file = {
+  config = lib.mkIf config.home.desktop.enable {
+    programs.mangohud.enable = true;
+    home.file = {
       # These options exist in Nixlang, but the order is not respected.
       ".config/MangoHud/MangoHud.conf".text = ''
         table_columns=2
diff --git a/modules/home/programs/gui/mpv/default.nix b/modules/home/programs/gui/mpv/default.nix
index c914a42..183709e 100644
--- a/modules/home/programs/gui/mpv/default.nix
+++ b/modules/home/programs/gui/mpv/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   programs.mpv = {
-    enable = true;
+    enable = config.home.desktop.enable;
     scripts = with pkgs.mpvScripts; [
       mpris
       sponsorblock
diff --git a/modules/home/programs/gui/obs/default.nix b/modules/home/programs/gui/obs/default.nix
index e3f0923..8b2c3ba 100644
--- a/modules/home/programs/gui/obs/default.nix
+++ b/modules/home/programs/gui/obs/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   programs.obs-studio = {
-    enable = true;
+    enable = config.home.desktop.enable;
     plugins = with pkgs.obs-studio-plugins; [
       obs-pipewire-audio-capture
       obs-webkitgtk
diff --git a/modules/home/programs/gui/pcmanfm/default.nix b/modules/home/programs/gui/pcmanfm/default.nix
index 842e6ac..3aa8dfc 100644
--- a/modules/home/programs/gui/pcmanfm/default.nix
+++ b/modules/home/programs/gui/pcmanfm/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, ... }:
+{ pkgs, config, lib, ... }:
 {
-  home = {
+  home = lib.mkIf config.home.desktop.enable {
     packages = with pkgs; [
       pcmanfm
       file-roller
diff --git a/modules/home/programs/gui/rofi/default.nix b/modules/home/programs/gui/rofi/default.nix
index 803f992..ce35f0a 100644
--- a/modules/home/programs/gui/rofi/default.nix
+++ b/modules/home/programs/gui/rofi/default.nix
@@ -3,7 +3,7 @@
   imports = [ ./scripts ];
 
   programs.rofi = {
-    enable = true;
+    enable = config.home.desktop.enable;
     package = pkgs.rofi-wayland;
     terminal = "foot";
     font = "${config.look.fonts.main} 14";
diff --git a/modules/home/programs/gui/rofi/scripts/default.nix b/modules/home/programs/gui/rofi/scripts/default.nix
index 87f47fa..60f3a03 100644
--- a/modules/home/programs/gui/rofi/scripts/default.nix
+++ b/modules/home/programs/gui/rofi/scripts/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.programs.rofi.enable [
     (pkgs.writeScriptBin "rofiscratch" ''
       SCRATCHPADS=$(echo -e "Btop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
       case $SCRATCHPADS in
diff --git a/modules/home/programs/gui/thunar/default.nix b/modules/home/programs/gui/thunar/default.nix
deleted file mode 100644
index 01d73e8..0000000
--- a/modules/home/programs/gui/thunar/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.thunar = {
-    enable = true;
-    plugins = with pkgs.xfce; [
-      thunar-archive-plugin
-      thunar-volman
-    ];
-  };
-}
diff --git a/modules/home/programs/gui/thunderbird/default.nix b/modules/home/programs/gui/thunderbird/default.nix
index dcb728b..2dcc5de 100644
--- a/modules/home/programs/gui/thunderbird/default.nix
+++ b/modules/home/programs/gui/thunderbird/default.nix
@@ -1,7 +1,7 @@
-{ ... }:
+{ config, ... }:
 {
   programs.thunderbird = {
-    enable = true;
+    enable = config.home.desktop.enable;
     profiles = {
       Main = {
         isDefault = true;
diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix
index b1e27f8..489405e 100644
--- a/modules/home/programs/misc/avtools/default.nix
+++ b/modules/home/programs/misc/avtools/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     ffmpeg
     ffmpegthumbnailer
     puddletag
diff --git a/modules/home/programs/misc/gaming/emulators/default.nix b/modules/home/programs/misc/gaming/emulators/default.nix
index c41094a..7590623 100644
--- a/modules/home/programs/misc/gaming/emulators/default.nix
+++ b/modules/home/programs/misc/gaming/emulators/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     dolphin-emu
     cemu
     ryujinx
diff --git a/modules/home/programs/misc/gaming/launchers/default.nix b/modules/home/programs/misc/gaming/launchers/default.nix
index 3ec754d..ec5ef89 100644
--- a/modules/home/programs/misc/gaming/launchers/default.nix
+++ b/modules/home/programs/misc/gaming/launchers/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     heroic
     prismlauncher
     steam
diff --git a/modules/home/programs/misc/general/default.nix b/modules/home/programs/misc/general/default.nix
index dec1197..86d607c 100644
--- a/modules/home/programs/misc/general/default.nix
+++ b/modules/home/programs/misc/general/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     bc
     fractal
     libreoffice
diff --git a/modules/home/programs/misc/production/default.nix b/modules/home/programs/misc/production/default.nix
index 4fd434a..5456afe 100644
--- a/modules/home/programs/misc/production/default.nix
+++ b/modules/home/programs/misc/production/default.nix
@@ -1,10 +1,11 @@
-{ pkgs, blender, ... }:
+{ config, lib, pkgs, blender, ... }:
 {
-  nixpkgs.overlays = [ blender.overlays.default ];
-
-  home.packages = with pkgs; [
-    audacity
-    blender_4_3
-    krita
-  ];
+  config = lib.mkIf config.home.desktop.enable {
+    nixpkgs.overlays = [ blender.overlays.default ];
+    home.packages = with pkgs; [
+      audacity
+      blender_4_3
+      krita
+    ];
+  };
 }
diff --git a/modules/home/programs/misc/remote-desktop/default.nix b/modules/home/programs/misc/remote-desktop/default.nix
index 10a01f2..e2988f4 100644
--- a/modules/home/programs/misc/remote-desktop/default.nix
+++ b/modules/home/programs/misc/remote-desktop/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     moonlight-qt
     rustdesk-flutter
   ];
diff --git a/modules/home/programs/misc/school/default.nix b/modules/home/programs/misc/school/default.nix
index ccd530d..9699432 100644
--- a/modules/home/programs/misc/school/default.nix
+++ b/modules/home/programs/misc/school/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     freerdp
     gpauth
     remmina
diff --git a/modules/home/programs/terminal/ncmpcpp/default.nix b/modules/home/programs/terminal/ncmpcpp/default.nix
index cf133a9..0e3d11e 100644
--- a/modules/home/programs/terminal/ncmpcpp/default.nix
+++ b/modules/home/programs/terminal/ncmpcpp/default.nix
@@ -1,20 +1,22 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [ mpc-cli ];
+  config = lib.mkIf config.home.desktop.enable {
+    home.packages = with pkgs; [ mpc-cli ];
 
-  programs.ncmpcpp = {
-    enable = true;
-    settings = {
-      browser_sort_mode = "name";
-      user_interface = "alternative";
+    programs.ncmpcpp = {
+      enable = true;
+      settings = {
+        browser_sort_mode = "name";
+        user_interface = "alternative";
+      };
+      bindings = [
+        { key = "h"; command = "volume_down"; }
+        { key = "j"; command = "scroll_down"; }
+        { key = "k"; command = "scroll_up"; }
+        { key = "l"; command = "volume_up"; }
+      ];
     };
-    bindings = [
-      { key = "h"; command = "volume_down"; }
-      { key = "j"; command = "scroll_down"; }
-      { key = "k"; command = "scroll_up"; }
-      { key = "l"; command = "volume_up"; }
-    ];
-  };
 
-  services.mpd-discord-rpc.enable = true;
+    services.mpd-discord-rpc.enable = true;
+  };
 }
diff --git a/modules/home/programs/terminal/spotdl/default.nix b/modules/home/programs/terminal/spotdl/default.nix
index f280f9b..98a1511 100644
--- a/modules/home/programs/terminal/spotdl/default.nix
+++ b/modules/home/programs/terminal/spotdl/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home = {
+  home = lib.mkIf config.home.desktop.enable {
     packages = with pkgs; [ spotdl ];
     shellAliases.spotdl = "spotdl --m3u --format opus";
   };
diff --git a/modules/home/programs/terminal/yt-dlp/default.nix b/modules/home/programs/terminal/yt-dlp/default.nix
index 0aa78a7..9401d46 100644
--- a/modules/home/programs/terminal/yt-dlp/default.nix
+++ b/modules/home/programs/terminal/yt-dlp/default.nix
@@ -1,15 +1,16 @@
-{ ... }:
+{ config, lib, ... }:
 {
-  programs.yt-dlp = {
-    enable = true;
-    settings = {
-      add-metadata = true;
-      embed-thumbnail = true;
-      convert-thumbnails = "jpg";
-      audio-format = "opus";
-      output = ''"%(artist)s - %(title)s.%(ext)s"'';
+  config = lib.mkIf config.home.desktop.enable {
+    programs.yt-dlp = {
+      enable = true;
+      settings = {
+        add-metadata = true;
+        embed-thumbnail = true;
+        convert-thumbnails = "jpg";
+        audio-format = "opus";
+        output = ''"%(artist)s - %(title)s.%(ext)s"'';
+      };
     };
+    home.shellAliases.opusdl = ''yt-dlp -f ba -x --audio-quality 0'';
   };
-
-  home.shellAliases.opusdl = ''yt-dlp -f ba -x --audio-quality 0'';
 }
diff --git a/modules/home/services/easyeffects/default.nix b/modules/home/services/easyeffects/default.nix
index 00e42ff..777ac25 100644
--- a/modules/home/services/easyeffects/default.nix
+++ b/modules/home/services/easyeffects/default.nix
@@ -1,11 +1,12 @@
-{ pkgs, ... }:
+{ config, lib, ... }:
 {
-  services.easyeffects = {
-    enable = true;
-    preset = "headphones";
-  };
-
-  home.file = {
-    ".config/easyeffects/output/headphones.json".source = ./headphones.json;
+  config = lib.mkIf config.home.desktop.enable {
+    services.easyeffects = {
+      enable = true;
+      preset = "headphones";
+    };
+    home.file = {
+      ".config/easyeffects/output/headphones.json".source = ./headphones.json;
+    };
   };
 }
diff --git a/modules/home/services/gnome-keyring/default.nix b/modules/home/services/gnome-keyring/default.nix
index 2e1ad40..a1d5e65 100644
--- a/modules/home/services/gnome-keyring/default.nix
+++ b/modules/home/services/gnome-keyring/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 {
-  services.gnome-keyring.enable = true;
+  services.gnome-keyring.enable = config.home.desktop.enable;
 }
diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix
index e389fff..c04dfac 100644
--- a/modules/home/services/mpd/default.nix
+++ b/modules/home/services/mpd/default.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 {
   services.mpd = {
-    enable = true;
+    enable = config.home.desktop.enable;
     network.startWhenNeeded = true;
     musicDirectory = "/home/jimbo/JimboNFS/Music/JimBops";
     playlistDirectory = "/home/jimbo/JimboNFS/Music/JimBops/Playlists";
diff --git a/modules/home/services/udiskie/default.nix b/modules/home/services/udiskie/default.nix
index fedeb78..abe882c 100644
--- a/modules/home/services/udiskie/default.nix
+++ b/modules/home/services/udiskie/default.nix
@@ -1,7 +1,7 @@
-{ ... }:
+{ config, ... }:
 {
   services.udiskie = {
-    enable = true;
+    enable = config.home.desktop.enable;
     automount = false;
   };
 }
diff --git a/modules/home/settings/cursor/default.nix b/modules/home/settings/cursor/default.nix
index e730036..b6ff65e 100644
--- a/modules/home/settings/cursor/default.nix
+++ b/modules/home/settings/cursor/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.pointerCursor = {
+  home.pointerCursor = lib.mkIf config.home.desktop.enable {
     gtk.enable = true;
     x11.enable = true;
     name = "Simp1e-Dark";
diff --git a/modules/home/settings/fonts/default.nix b/modules/home/settings/fonts/default.nix
index 81f05e0..89ae32e 100644
--- a/modules/home/settings/fonts/default.nix
+++ b/modules/home/settings/fonts/default.nix
@@ -1,20 +1,21 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; [
-    liberation_ttf
-    twitter-color-emoji
-    noto-fonts
-    sarasa-gothic
-    ubuntu_font_family
-    (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
-  ];
-
-  fonts.fontconfig = {
-    enable = true;
-    defaultFonts = {
-      sansSerif = [ "Ubuntu" ];
-      monospace = [ "UbuntuMono Nerd Font Mono" ];
-      emoji = [ "Twitter Color Emoji" ];
+  config = lib.mkIf config.home.desktop.enable {
+    home.packages = with pkgs; [
+      liberation_ttf
+      twitter-color-emoji
+      noto-fonts
+      sarasa-gothic
+      ubuntu_font_family
+      (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
+    ];
+    fonts.fontconfig = {
+      enable = true;
+      defaultFonts = {
+        sansSerif = [ "Ubuntu" ];
+        monospace = [ "UbuntuMono Nerd Font Mono" ];
+        emoji = [ "Twitter Color Emoji" ];
+      };
     };
   };
 }
diff --git a/modules/home/settings/gtk/css/default.nix b/modules/home/settings/gtk/css/default.nix
index 717f916..6a3113e 100644
--- a/modules/home/settings/gtk/css/default.nix
+++ b/modules/home/settings/gtk/css/default.nix
@@ -1,7 +1,6 @@
 { ... }:
 {
   gtk = {
-    # Disable shadows
     gtk3.extraCss = ''
       * { outline-width: 0px; }
       decoration { box-shadow: none; }
diff --git a/modules/home/settings/xdg/folders/default.nix b/modules/home/settings/xdg/folders/default.nix
index 0146c25..6a08592 100644
--- a/modules/home/settings/xdg/folders/default.nix
+++ b/modules/home/settings/xdg/folders/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 {
   xdg.userDirs = {
     enable = true;
diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix
index cb16a23..dde8584 100644
--- a/modules/home/wms/programs/default.nix
+++ b/modules/home/wms/programs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   imports = [
     ./grimsnap
@@ -9,7 +9,7 @@
     ./wpaperd
   ];
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     brightnessctl
     clipman
     grim
diff --git a/modules/home/wms/programs/grimsnap/default.nix b/modules/home/wms/programs/grimsnap/default.nix
index e00d32c..538c30e 100644
--- a/modules/home/wms/programs/grimsnap/default.nix
+++ b/modules/home/wms/programs/grimsnap/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, ... }: 
+{ config, lib, pkgs, ... }: 
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     (pkgs.writeScriptBin "grimsnap" ''
       # Freeze the screen using hyprpicker
       hyprpicker -r -z &
diff --git a/modules/home/wms/programs/mako/default.nix b/modules/home/wms/programs/mako/default.nix
index 1d95c51..0bee731 100644
--- a/modules/home/wms/programs/mako/default.nix
+++ b/modules/home/wms/programs/mako/default.nix
@@ -5,7 +5,7 @@
   ];
 
   services.mako = {
-    enable = true;
+    enable = config.home.desktop.enable;
     borderColor = "#${config.look.colors.accent}";
     backgroundColor = "#${config.look.colors.dark}D9";
     output = "${config.displays.d1}";
diff --git a/modules/home/wms/programs/mako/makotoggle/default.nix b/modules/home/wms/programs/mako/makotoggle/default.nix
index 53a69a1..b1bc6a7 100644
--- a/modules/home/wms/programs/mako/makotoggle/default.nix
+++ b/modules/home/wms/programs/mako/makotoggle/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
-  home.packages = with pkgs; [ 
+  home.packages = with pkgs; lib.mkIf config.services.mako.enable [ 
     (pkgs.writeScriptBin "makotoggle" ''
       mode_output=$(makoctl mode)
 
diff --git a/modules/home/wms/programs/wlpicker/default.nix b/modules/home/wms/programs/wlpicker/default.nix
index ecc23c0..6c098e2 100644
--- a/modules/home/wms/programs/wlpicker/default.nix
+++ b/modules/home/wms/programs/wlpicker/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, ... }: 
+{ config, lib, pkgs, ... }: 
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     (pkgs.writeScriptBin "wlpicker" ''
       # Get color position
       position=$(slurp -b 00000000 -p)
diff --git a/modules/home/wms/programs/wpaperd/default.nix b/modules/home/wms/programs/wpaperd/default.nix
index f88e2dc..34377a7 100644
--- a/modules/home/wms/programs/wpaperd/default.nix
+++ b/modules/home/wms/programs/wpaperd/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   programs.wpaperd = {
-    enable = true;
+    enable = config.home.desktop.enable;
     settings = {
       default.mode = "center";
       any.path = "~/.assets/wallpapers/1.png";
diff --git a/modules/home/wms/sway/programs/prop-sway/default.nix b/modules/home/wms/sway/programs/prop-sway/default.nix
index fff38eb..8ba8916 100644
--- a/modules/home/wms/sway/programs/prop-sway/default.nix
+++ b/modules/home/wms/sway/programs/prop-sway/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, ... }: 
+{ config, lib, pkgs, ... }: 
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.wayland.windowManager.sway.enable [
     (pkgs.writeScriptBin "prop-sway" ''
       selected_window=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | "\(.rect.x),\(.rect.y) \(.rect.width)x\(.rect.height)"' | ${pkgs.slurp}/bin/slurp -r -c ${config.look.colors.prime} -B 00000066 -b 00000000)
       if [ -n "$selected_window" ]; then