From b18d5e4d9da37c5a372d63402d64d9342cd389fd Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Mon, 26 May 2025 16:34:16 -0700
Subject: [PATCH] feat: wlogout

---
 modules/home/programs/default.nix                   |   3 +++
 modules/home/programs/waybar.nix                    |   1 +
 .../home/programs}/wlogout/default.nix              |   2 ++
 .../home/programs}/wlogout/hibernate.png            | Bin
 .../home/programs}/wlogout/lock.png                 | Bin
 .../home/programs}/wlogout/logout.png               | Bin
 .../home/programs}/wlogout/reboot.png               | Bin
 .../home/programs}/wlogout/shutdown.png             | Bin
 .../home/programs}/wlogout/suspend.png              | Bin
 modules/home/shell/niri.nix                         |   1 +
 10 files changed, 7 insertions(+)
 rename {snowflake/modules/home/programs/wayland => modules/home/programs}/wlogout/default.nix (97%)
 rename {snowflake/modules/home/programs/wayland => modules/home/programs}/wlogout/hibernate.png (100%)
 rename {snowflake/modules/home/programs/wayland => modules/home/programs}/wlogout/lock.png (100%)
 rename {snowflake/modules/home/programs/wayland => modules/home/programs}/wlogout/logout.png (100%)
 rename {snowflake/modules/home/programs/wayland => modules/home/programs}/wlogout/reboot.png (100%)
 rename {snowflake/modules/home/programs/wayland => modules/home/programs}/wlogout/shutdown.png (100%)
 rename {snowflake/modules/home/programs/wayland => modules/home/programs}/wlogout/suspend.png (100%)

diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
index 3443951..1ecee1c 100644
--- a/modules/home/programs/default.nix
+++ b/modules/home/programs/default.nix
@@ -1,5 +1,8 @@
 {
   imports = [
     ./nh.nix
+    ./waybar.nix
+    # TODO: uncomment when swaylock is figured out
+    # ./wlogout
   ];
 }
diff --git a/modules/home/programs/waybar.nix b/modules/home/programs/waybar.nix
index b909453..94a2b95 100644
--- a/modules/home/programs/waybar.nix
+++ b/modules/home/programs/waybar.nix
@@ -17,6 +17,7 @@ in {
   config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     marleyos = {
       # services.swaync.enable = true;
+      # TODO: enable once swaylock is figured out
       # programs.wlogout.enable = true;
     };
 
diff --git a/snowflake/modules/home/programs/wayland/wlogout/default.nix b/modules/home/programs/wlogout/default.nix
similarity index 97%
rename from snowflake/modules/home/programs/wayland/wlogout/default.nix
rename to modules/home/programs/wlogout/default.nix
index b0a7f83..a301dc8 100644
--- a/snowflake/modules/home/programs/wayland/wlogout/default.nix
+++ b/modules/home/programs/wlogout/default.nix
@@ -16,8 +16,10 @@ in {
 
       layout = let
         systemctl = lib.getExe' pkgs.systemd "systemctl";
+        # TODO: use niri msg action quit
         hyprctrl =
           lib.getExe' config.wayland.windowManager.hyprland.package "hyprctrl";
+        # TODO: switch to swaylock
         hyprlock = lib.getExe config.programs.hyprlock.package;
       in [
         {
diff --git a/snowflake/modules/home/programs/wayland/wlogout/hibernate.png b/modules/home/programs/wlogout/hibernate.png
similarity index 100%
rename from snowflake/modules/home/programs/wayland/wlogout/hibernate.png
rename to modules/home/programs/wlogout/hibernate.png
diff --git a/snowflake/modules/home/programs/wayland/wlogout/lock.png b/modules/home/programs/wlogout/lock.png
similarity index 100%
rename from snowflake/modules/home/programs/wayland/wlogout/lock.png
rename to modules/home/programs/wlogout/lock.png
diff --git a/snowflake/modules/home/programs/wayland/wlogout/logout.png b/modules/home/programs/wlogout/logout.png
similarity index 100%
rename from snowflake/modules/home/programs/wayland/wlogout/logout.png
rename to modules/home/programs/wlogout/logout.png
diff --git a/snowflake/modules/home/programs/wayland/wlogout/reboot.png b/modules/home/programs/wlogout/reboot.png
similarity index 100%
rename from snowflake/modules/home/programs/wayland/wlogout/reboot.png
rename to modules/home/programs/wlogout/reboot.png
diff --git a/snowflake/modules/home/programs/wayland/wlogout/shutdown.png b/modules/home/programs/wlogout/shutdown.png
similarity index 100%
rename from snowflake/modules/home/programs/wayland/wlogout/shutdown.png
rename to modules/home/programs/wlogout/shutdown.png
diff --git a/snowflake/modules/home/programs/wayland/wlogout/suspend.png b/modules/home/programs/wlogout/suspend.png
similarity index 100%
rename from snowflake/modules/home/programs/wayland/wlogout/suspend.png
rename to modules/home/programs/wlogout/suspend.png
diff --git a/modules/home/shell/niri.nix b/modules/home/shell/niri.nix
index f733a51..3de8a96 100644
--- a/modules/home/shell/niri.nix
+++ b/modules/home/shell/niri.nix
@@ -26,6 +26,7 @@ in {
       shell.wayland = enabled;
       programs = {
         waybar = enabled;
+        #   TODO: enable once swaylock is figured out
         #   wlogout = enabled;
         #   fuzzel = enabled;
         #   xwayland-satellite = enabled;