From 5e08e02cd5017ac0db842ee6974a22611dbd24be Mon Sep 17 00:00:00 2001
From: EdenQwQ <lsahlm1eden@gmail.com>
Date: Thu, 16 Oct 2025 20:46:51 +0800
Subject: [PATCH] fix dms service

---
 flake.lock                         | 30 +++++++++++++++---------------
 home/default.nix                   |  8 +++-----
 home/programs/desktop/noctalia.nix |  1 +
 home/tweaks/default.nix            |  2 +-
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1147a49..6a33d91 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,11 +166,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759884507,
-        "narHash": "sha256-YhsD1d0Xk2LXp4Hgx7xI5nRS9REMKb+QGpejFM3fcdU=",
+        "lastModified": 1760584313,
+        "narHash": "sha256-cCEZoo/ClpMzs8dHMcH5nb+zTfJyrBfgEVQt1+8Fy30=",
         "owner": "AvengeMedia",
         "repo": "DankMaterialShell",
-        "rev": "8cd0d5faa5f546472d3be5e843d58402ae3215a6",
+        "rev": "daa0d368ab8f1e6216679d74225d817eca93eabf",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757252286,
-        "narHash": "sha256-QwWQzlxAGvIi6VAc8DQ6ONCKKwtPyaHQW1cQyGbP7Og=",
+        "lastModified": 1760238269,
+        "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=",
         "owner": "AvengeMedia",
         "repo": "dgop",
-        "rev": "a65a02ddf8bade9c109d055e644e4bd851183bd5",
+        "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5",
         "type": "github"
       },
       "original": {
@@ -230,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757296630,
-        "narHash": "sha256-3H236F5oIKkqpfnwrvZQs4Y5imKb6JCMFGDkHs8VDjQ=",
+        "lastModified": 1760241259,
+        "narHash": "sha256-DlLGn+4M6tIafoDsHr2WhHG2hrHrC24S2IL3+KAvjEU=",
         "owner": "AvengeMedia",
         "repo": "danklinux",
-        "rev": "dac591711ab30d6b071a5cec674a3d2e04665ee1",
+        "rev": "dae4c3ff4ce0feb930361c399747edb29d081775",
         "type": "github"
       },
       "original": {
@@ -1197,11 +1197,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1757034884,
-        "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=",
+        "lastModified": 1760164275,
+        "narHash": "sha256-gKl2Gtro/LNf8P+4L3S2RsZ0G390ccd5MyXYrTdMCFE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ca77296380960cd497a765102eeb1356eb80fed0",
+        "rev": "362791944032cb532aabbeed7887a441496d5e6e",
         "type": "github"
       },
       "original": {
@@ -1331,11 +1331,11 @@
         "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1760488990,
-        "narHash": "sha256-Aeil4laSOfqcOPdhApUVyIKR371yKuEIfJ5xMD5S6Zw=",
+        "lastModified": 1760571015,
+        "narHash": "sha256-rG3pqJ3Yta+cCrnclftJ4Dx6961XCW18NHS+CO1b+Os=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "33a52ec5fd683a52c82ec8ff380d0def77602cd1",
+        "rev": "2ce0992b19dca6c3d9934259936526b0c36ef0c3",
         "type": "github"
       },
       "original": {
diff --git a/home/default.nix b/home/default.nix
index a74ca0f..7718e30 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -51,8 +51,8 @@
             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
+            if ${pkgs.systemd}/bin/systemctl --user is-active dms.service; then
+              run --silence ${pkgs.systemd}/bin/systemctl --user stop dms.service
             fi
             if ${pkgs.systemd}/bin/systemctl --user is-active caelestia.service; then
               run --silence ${pkgs.systemd}/bin/systemctl --user stop caelestia.service
@@ -60,9 +60,7 @@
             if ${pkgs.systemd}/bin/systemctl --user is-active noctalia-shell.service; then
               run --silence ${pkgs.systemd}/bin/systemctl --user stop noctalia-shell.service
             fi
-            run --silence ${pkgs.systemd}/bin/systemctl --user start ${
-              if config.desktopShell == "dms" then "quickshell" else config.desktopShell
-            }.service
+            run --silence ${pkgs.systemd}/bin/systemctl --user start ${config.desktopShell}.service
           '';
     };
   };
diff --git a/home/programs/desktop/noctalia.nix b/home/programs/desktop/noctalia.nix
index 3a1f02c..23f56ba 100644
--- a/home/programs/desktop/noctalia.nix
+++ b/home/programs/desktop/noctalia.nix
@@ -25,6 +25,7 @@
       mTeritiary = base0C;
     };
     settings = {
+      setupCompleted = true;
       bar = {
         backgroundOpacity = 0.6;
         density = "comfortable";
diff --git a/home/tweaks/default.nix b/home/tweaks/default.nix
index 1afb122..1bffab5 100644
--- a/home/tweaks/default.nix
+++ b/home/tweaks/default.nix
@@ -7,5 +7,5 @@
     ./wallpaper.nix
     ./colorscheme.nix
   ];
-  desktopShell = "noctalia-shell";
+  desktopShell = "dms";
 }