From 65e6b9cab99791e64f9c218509a6f39cfa64dcdf Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo@depeuter.dev>
Date: Sun, 28 Sep 2025 16:32:40 +0200
Subject: [PATCH] [hypr] Fix modes

---
 stow/hyprland/.config/hypr/hyprland.conf | 18 +----------
 stow/hyprland/.config/hypr/keybinds.conf |  9 +++---
 stow/hyprland/.config/hypr/modes.conf    | 38 ++++++++++++++++++++++++
 stow/waybar/.config/waybar/config.jsonc  |  3 ++
 4 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 stow/hyprland/.config/hypr/modes.conf

diff --git a/stow/hyprland/.config/hypr/hyprland.conf b/stow/hyprland/.config/hypr/hyprland.conf
index 73bfa92..b9629db 100644
--- a/stow/hyprland/.config/hypr/hyprland.conf
+++ b/stow/hyprland/.config/hypr/hyprland.conf
@@ -270,23 +270,7 @@ $lock = swaylock
 
 source = /home/tdpeuter/.config/hypr/input-output.conf
 source = /home/tdpeuter/.config/hypr/keybinds.conf
-
-$mode_launcher = Launch (f)irefox, (t)hunderbird.
-bind = $flag, O, submap, $mode_launcher
-submap = $mode_launcher
-
-bind = , F, exec,   firefox
-bind = , F, submap, reset
-bind = , T, exec,   thunderbird
-bind = , T, submap, reset
-bind = , Z, exec,   zen
-bind = , Z, submap, reset
-
-bind = $flag, O, submap, reset
-bind = , Escape, submap, reset
-bind = , Return, submap, reset
-
-submap = reset
+source = /home/tdpeuter/.config/hypr/modes.conf
 
 # https://wiki.hyprland.org/Nvidia/#environment-variables
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
diff --git a/stow/hyprland/.config/hypr/keybinds.conf b/stow/hyprland/.config/hypr/keybinds.conf
index 880a1f8..26385f3 100644
--- a/stow/hyprland/.config/hypr/keybinds.conf
+++ b/stow/hyprland/.config/hypr/keybinds.conf
@@ -58,9 +58,8 @@ bind = $flag,       s, setfloating
 bind = $flag+Shift, s, pin
 bind = $flag+Shift, s, settiled
 
-bind = $flag, F11, fullscreen, 1
-# bind = $flag, Prior, fullscreen, 1
-# bind = $flag, KP_Prior, fullscreen, 1
+bind = $flag,       F11,      fullscreen, 1
+bind = $flag+Shift, F11,      fullscreen, 0
 
 # Workspaces
 
@@ -158,9 +157,9 @@ bind = , XF86Calculator,            exec, qalculate-gtk
 # Shortcuts
 
 # Reload
-bind = Alt+Shift, r, exec, "hyperctl reload"
+bind = Alt+Shift,      r, exec, "hyperctl reload"
 bind = Ctrl+Alt+Shift, r, forcerendererreload
-bind = Alt+Shift, e, exit
+bind = Alt+Shift,      e, exit
 
 # Kill a window
 bind = $flag,    q,      closewindow, activewindow
diff --git a/stow/hyprland/.config/hypr/modes.conf b/stow/hyprland/.config/hypr/modes.conf
new file mode 100644
index 0000000..72e9a3d
--- /dev/null
+++ b/stow/hyprland/.config/hypr/modes.conf
@@ -0,0 +1,38 @@
+# System actions
+$mode_system = System (l)ock, (s)leep, (h)ibernate, (r)eboot, (Shift+s)hutdown
+bind = Ctrl+Alt, Delete, submap, $mode_system
+submap = $mode_system
+
+bind =      , l, exec, $lock
+bind =      , l, submap, reset
+bind =      , s, exec, $lock, exec, systemctl suspend
+bind =      , s, submap, reset
+bind =      , h, exec, $lock, exec, systemctl hibernate
+bind =      , h, submap, reset
+bind =      , r, exec, systemctl reboot
+bind = Shift, s, exec, systemctl poweroff -i
+
+bind = Ctrl+Alt, Delete, submap, reset
+bind =         , Escape, submap, reset
+bind =         , Return, submap, reset
+
+submap = reset
+
+# Launcher
+$mode_launcher = Launch (f)irefox, (t)hunderbird.
+bind = $flag, O, submap, $mode_launcher
+submap = $mode_launcher
+
+bind = , F, exec,   firefox
+bind = , F, submap, reset
+bind = , T, exec,   thunderbird
+bind = , T, submap, reset
+bind = , Z, exec,   zen
+bind = , Z, submap, reset
+
+bind = $flag, O, submap, reset
+bind = , Escape, submap, reset
+bind = , Return, submap, reset
+
+submap = reset
+
diff --git a/stow/waybar/.config/waybar/config.jsonc b/stow/waybar/.config/waybar/config.jsonc
index 2a4f8a4..ff861e3 100644
--- a/stow/waybar/.config/waybar/config.jsonc
+++ b/stow/waybar/.config/waybar/config.jsonc
@@ -40,11 +40,14 @@
             "sway/window",
             "group/workspaces",
             "custom/scratchpad-indicator",
+            "group/mode"
         ],
         "modules-center": [
             "mpris"
         ],
         "modules-right": [
+            "keyboard-state#numlock",
+            "keyboard-state#capslock",
             "privacy",
             "tray",
             "group/control-center",