From 91496e369146b5644f1ea53f7232ee7f84f3ba16 Mon Sep 17 00:00:00 2001
From: EdenQwQ <lsahlm1eden@gmail.com>
Date: Mon, 6 Oct 2025 16:29:34 +0800
Subject: [PATCH] better shell activation

---
 home/default.nix                    | 26 ++++++++++++++------------
 home/programs/desktop/caelestia.nix |  2 +-
 home/programs/desktop/dms.nix       |  4 ++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 2a6f5fc..f8fdbef 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -43,21 +43,23 @@
           ''
             run --quiet ${pkgs.procps}/bin/pkill -HUP swhkd
           '';
-    }
-    // lib.mkIf (config.desktopShell == "waybar") {
-      reload-waybar =
+      reload-shell =
         lib.hm.dag.entryAfter [ "reload-swhkd" ]
           # bash
           ''
-            run --quiet ${pkgs.systemd}/bin/systemctl --user reload waybar.service
-          '';
-    }
-    // lib.mkIf (config.desktopShell == "dms") {
-      reload-dms =
-        lib.hm.dag.entryAfter [ "reload-swhkd" ]
-          # bash
-          ''
-            run --quiet ${pkgs.systemd}/bin/systemctl --user reload quickshell.service
+            # only run stop if the service is active
+            if ${pkgs.systemd}/bin/systemctl --user is-active waybar.service; then
+              run --silence ${pkgs.systemd}/bin/systemctl --user stop waybar.service
+            fi
+            if ${pkgs.systemd}/bin/systemctl --user is-active quickshell.service; then
+              run --silence ${pkgs.systemd}/bin/systemctl --user stop quickshell.service
+            fi
+            if ${pkgs.systemd}/bin/systemctl --user is-active caelestia.service; then
+              run --silence ${pkgs.systemd}/bin/systemctl --user stop caelestia.service
+            fi
+            run --silence ${pkgs.systemd}/bin/systemctl --user start ${
+              if config.desktopShell == "dms" then "quickshell" else config.desktopShell
+            }.service
           '';
     };
   };
diff --git a/home/programs/desktop/caelestia.nix b/home/programs/desktop/caelestia.nix
index 6b42cb4..db040fc 100644
--- a/home/programs/desktop/caelestia.nix
+++ b/home/programs/desktop/caelestia.nix
@@ -21,7 +21,7 @@
     settings = {
       appearance.font.family = {
         mono = config.stylix.fonts.monospace.name;
-        sans = config.stylix.fonts.sansSerif.name;
+        sans = "Hug Me Tight";
       };
       background.enabled = false;
       bar = {
diff --git a/home/programs/desktop/dms.nix b/home/programs/desktop/dms.nix
index 773faa0..41ea8f0 100644
--- a/home/programs/desktop/dms.nix
+++ b/home/programs/desktop/dms.nix
@@ -171,11 +171,11 @@ in
         "dankBarCenterWidgets": ["music", "clock", "weather"],
         "dankBarRightWidgets": [
           {
-            "id": "notepadButton",
+            "id": "systemTray",
             "enabled": true
           },
           {
-            "id": "cpuUsage",
+            "id": "memUsage",
             "enabled": true
           },
           {