From d637bb5dc38b0effd50d8884034acc44330d037a Mon Sep 17 00:00:00 2001
From: reidlab <reidlab325@gmail.com>
Date: Sat, 25 Apr 2026 00:23:31 -0700
Subject: [PATCH] those are core packages

---
 modules/desktop/hypridle.nix             | 10 +++++-----
 modules/desktop/niri.nix                 |  4 ++--
 modules/desktop/themes/config/waybar.css |  2 +-
 modules/desktop/waybar.nix               |  7 ++-----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/desktop/hypridle.nix b/modules/desktop/hypridle.nix
index 9a380cc..8658d8e 100644
--- a/modules/desktop/hypridle.nix
+++ b/modules/desktop/hypridle.nix
@@ -21,10 +21,10 @@ in {
 
       settings = {
         general = {
-          lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
-          unlock_cmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock";
+          lock_cmd = "pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
+          unlock_cmd = "pkill -USR1 hyprlock";
 
-          before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session";
+          before_sleep_cmd = "loginctl lock-session";
         };
 
         listener = [
@@ -32,7 +32,7 @@ in {
             timeout = if config.modules.core.laptop
               then 60 * 2 # 2 min
               else 60 * 35; # 35 min
-            on-timeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock computer
+            on-timeout = "loginctl lock-session"; # lock computer
           }
         ] ++ optionals (config.modules.core.laptop) [
           {
@@ -47,7 +47,7 @@ in {
           }
           {
             timeout = 60 * 15; # 15 min
-            on-timeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend
+            on-timeout = "systemctl suspend"; # sleep/suspend
           }
         ] ++ optional config.modules.desktop.niri.enable {
           timeout = if config.modules.core.laptop
diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index 58f2d77..411b85e 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -437,12 +437,12 @@ in {
 
           "XF86LaunchA".action.screenshot = { show-pointer = false; };
           "XF86LaunchB".action = sh "${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20";
-          "XF86ScreenSaver".action = sh "${pkgs.systemd}/bin/loginctl lock-session";
+          "XF86ScreenSaver".action = sh "loginctl lock-session";
 
           # substitutions for when not on laptop
           "Mod+Shift+S".action.screenshot = { show-pointer = false; };
           "Mod+Shift+P".action = sh "${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20";
-          "Mod+L".action = sh "${pkgs.systemd}/bin/loginctl lock-session";
+          "Mod+L".action = sh "loginctl lock-session";
 
           "Mod+T".action = spawn "wezterm";
           "Mod+E".action = spawn "nautilus";
diff --git a/modules/desktop/themes/config/waybar.css b/modules/desktop/themes/config/waybar.css
index 8da7f82..cbbb594 100644
--- a/modules/desktop/themes/config/waybar.css
+++ b/modules/desktop/themes/config/waybar.css
@@ -12,7 +12,7 @@ window#waybar {
   color: @base05;
   background: alpha(@base00, 0.9999999);
   border-radius: @roundingpx;
-  font-family: "CozetteVector", monospace, "FontAwesome 6 Free", "Noto Sans CJK";
+  font-family: "CozetteVector", monospace, "FontAwesome 6 Free", "Noto Sans CJK"; /* TODO: make this use proper font */
   font-size: 13px; /* TODO: make this use proper font size */
   font-style: normal;
 
diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix
index 198b9bc..5e1417a 100644
--- a/modules/desktop/waybar.nix
+++ b/modules/desktop/waybar.nix
@@ -107,10 +107,10 @@ in {
                     systemctl hibernate
                     ;;
                   " lock")
-                    ${pkgs.systemd}/bin/loginctl lock-session
+                    loginctl lock-session
                     ;;
                   "⎋ exit desktop environment")
-                    ${pkgs.systemd}/bin/loginctl terminate-session $XDG_SESSION_ID
+                    loginctl terminate-session $XDG_SESSION_ID
                     ;;
                 esac
               '';
@@ -180,9 +180,6 @@ in {
               format = " {usage}%";
               on-click = "${lib.getExe pkgs.mission-center}";
             };
-            # bluetooth = {
-            #
-            # };
             memory = {
               interval = 4;
               format = " {percentage}%";