From 275dad511fc1794fe54d62ff1a64f20e92d11b2b Mon Sep 17 00:00:00 2001
From: EdenQwQ <lsahlm1eden@gmail.com>
Date: Mon, 6 Oct 2025 12:08:21 +0800
Subject: [PATCH] optimise dms

---
 home/default.nix                         |  2 +-
 home/programs/desktop/dms.nix            |  2 --
 home/programs/desktop/niri/autostart.nix |  2 +-
 home/tweaks/default.nix                  |  2 +-
 modules/home-manager/desktop-shell.nix   | 10 ++++++++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 8700dc3..2a6f5fc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -57,7 +57,7 @@
         lib.hm.dag.entryAfter [ "reload-swhkd" ]
           # bash
           ''
-            run --quiet ${pkgs.systemd}/bin/systemctl --user reload dms.service
+            run --quiet ${pkgs.systemd}/bin/systemctl --user reload quickshell.service
           '';
     };
   };
diff --git a/home/programs/desktop/dms.nix b/home/programs/desktop/dms.nix
index 2dcbb45..773faa0 100644
--- a/home/programs/desktop/dms.nix
+++ b/home/programs/desktop/dms.nix
@@ -242,9 +242,7 @@ in
         "animationSpeed": 2
       }
     '';
-  programs.dankMaterialShell.enableSystemd = true;
   home.sessionVariables = {
     DMS_DISABLE_MATUGEN = "1";
-    QT_QPA_PLATFORM = "gtk3";
   };
 }
diff --git a/home/programs/desktop/niri/autostart.nix b/home/programs/desktop/niri/autostart.nix
index e8f5f42..006b79a 100644
--- a/home/programs/desktop/niri/autostart.nix
+++ b/home/programs/desktop/niri/autostart.nix
@@ -175,7 +175,7 @@ in
     };
   };
   home.activation.restart-niri-blur-wallpaper =
-    lib.hm.dag.entryAfter [ "reload-waybar" ]
+    lib.hm.dag.entryAfter [ "reload-swhkd" ]
       # bash
       ''run --quiet ${pkgs.systemd}/bin/systemctl --user restart niri-blur-wallpaper'';
   programs.niri.settings.spawn-at-startup = [
diff --git a/home/tweaks/default.nix b/home/tweaks/default.nix
index 511deee..1bffab5 100644
--- a/home/tweaks/default.nix
+++ b/home/tweaks/default.nix
@@ -7,5 +7,5 @@
     ./wallpaper.nix
     ./colorscheme.nix
   ];
-  desktopShell = "dank";
+  desktopShell = "dms";
 }
diff --git a/modules/home-manager/desktop-shell.nix b/modules/home-manager/desktop-shell.nix
index bb4bbed..d535c04 100644
--- a/modules/home-manager/desktop-shell.nix
+++ b/modules/home-manager/desktop-shell.nix
@@ -7,7 +7,13 @@ with lib;
   };
 
   config = {
-    programs.waybar.enable = config.desktopShell == "waybar";
-    programs.dankMaterialShell.enable = config.desktopShell == "dank";
+    programs.waybar = {
+      enable = config.desktopShell == "waybar";
+      systemd.enable = config.desktopShell == "waybar";
+    };
+    programs.dankMaterialShell = {
+      enable = config.desktopShell == "dms";
+      enableSystemd = config.desktopShell == "dms";
+    };
   };
 }