11 files changed, 109 insertions, 28 deletions
diff --git a/dotfiles/common/.config/gtk-3.0/settings.ini b/dotfiles/common/.config/gtk-3.0/settings.ini
index 2023ae6..5b2ba74 100644
--- a/dotfiles/common/.config/gtk-3.0/settings.ini
+++ b/dotfiles/common/.config/gtk-3.0/settings.ini
@@ -3,8 +3,8 @@ gtk-print-backends=file,cups,pdf
 gtk-theme-name=Adwaita-dark
 gtk-icon-theme-name=Papirus-Dark
 gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=Vimix-white-cursors
-gtk-cursor-theme-size=0
+gtk-cursor-theme-name=Bibata-Modern-Ice
+gtk-cursor-theme-size=24
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1
diff --git a/dotfiles/hyprland/.config/hypr/hyprland.conf b/dotfiles/hyprland/.config/hypr/hyprland.conf
index 1883423..a279ced 100644
--- a/dotfiles/hyprland/.config/hypr/hyprland.conf
+++ b/dotfiles/hyprland/.config/hypr/hyprland.conf
@@ -29,7 +29,7 @@ exec-once = insync start
 # Environment Variables
 # ============================================================================
 env = XCURSOR_SIZE,24
-env = XCURSOR_THEME,capitaine-cursors-light
+env = XCURSOR_THEME,Bibata-Modern-Ice
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 env = XDG_SESSION_DESKTOP,Hyprland
@@ -74,7 +74,7 @@ animations {
 # Layout (master-stack like DWM tile)
 # ============================================================================
 master {
-    new_status = slave
+    new_status = master
     mfact = 0.55
 }
 
@@ -101,6 +101,7 @@ input {
 misc {
     force_default_wallpaper = 0
     disable_hyprland_logo = true
+    focus_on_activate = true
 }
 
 # ============================================================================
@@ -295,9 +296,9 @@ bind = CTRL ALT, SPACE, exec, amixer set Capture toggle && amixer get Capture |
 # Bluetooth (from DWM and sxhkdrc)
 bind = $mod SHIFT, B, exec, blueman-manager
 
-# Screenshots (grim + slurp + satty for annotation)
-bind = $mod, S, exec, grim -g "$(slurp)" - | satty --filename - --output-filename ~/pictures/screenshots/$(date +%Y.%m.%d-%H%M%S).png
-bind = , Print, exec, grim - | satty --filename - --output-filename ~/pictures/screenshots/$(date +%Y.%m.%d-%H%M%S).png
+# Screenshots (grim + slurp + fuzzel menu)
+bind = $mod, S, exec, screenshot region
+bind = $mod, Print, exec, screenshot fullscreen
 
 # Lock screen (from sxhkdrc: super+Escape)
 bind = $mod, ESCAPE, exec, hyprlock
diff --git a/dotfiles/hyprland/.config/themes/dupre/Xresources b/dotfiles/hyprland/.config/themes/dupre/Xresources
index be8f7f4..1646b87 100644
--- a/dotfiles/hyprland/.config/themes/dupre/Xresources
+++ b/dotfiles/hyprland/.config/themes/dupre/Xresources
@@ -4,8 +4,8 @@
 
 !! X Font Settings
 Xft.dpi: 109
-Xcursor.size: 32
-Xcursor.theme: Vimix-white-cursors
+Xcursor.size: 24
+Xcursor.theme: Bibata-Modern-Ice
 Xft.autohint: 0
 Xft.lcdfilter: lcddefault
 Xft.hintstyle: hintfull
diff --git a/dotfiles/hyprland/.config/themes/dupre/waybar.css b/dotfiles/hyprland/.config/themes/dupre/waybar.css
index e83f851..18ba0f1 100644
--- a/dotfiles/hyprland/.config/themes/dupre/waybar.css
+++ b/dotfiles/hyprland/.config/themes/dupre/waybar.css
@@ -49,7 +49,7 @@ window#waybar {
 #cpu,
 #temperature,
 #memory,
-#disk,
+#custom-disk,
 #custom-netspeed,
 #battery,
 #wireplumber,
@@ -73,7 +73,7 @@ window#waybar {
 #cpu:hover,
 #temperature:hover,
 #memory:hover,
-#disk:hover,
+#custom-disk:hover,
 #custom-netspeed:hover,
 #wireplumber:hover,
 #sysmonitor:hover,
@@ -90,8 +90,24 @@ window#waybar {
     color: #969385;
 }
 
-#wireplumber.muted {
-    color: #58574e;
+#custom-netspeed.disconnected {
+    color: #d47c59;
+}
+
+#temperature.warning {
+    color: #d7af5f;
+}
+
+#temperature.critical {
+    color: #d47c59;
+}
+
+#custom-disk.warning {
+    color: #d7af5f;
+}
+
+#custom-disk.critical {
+    color: #d47c59;
 }
 
 #battery.warning {
diff --git a/dotfiles/hyprland/.config/themes/hudson/Xresources b/dotfiles/hyprland/.config/themes/hudson/Xresources
index 96e4803..4b35809 100644
--- a/dotfiles/hyprland/.config/themes/hudson/Xresources
+++ b/dotfiles/hyprland/.config/themes/hudson/Xresources
@@ -10,8 +10,8 @@ Xft.hintstyle: hintfull
 Xft.hinting: 1
 Xft.antialias: 1
 Xft.rgba: rgb
-Xcursor.size: 32
-Xcursor.theme: Vimix-white-cursors
+Xcursor.size: 24
+Xcursor.theme: Bibata-Modern-Ice
 
 !! Emacs
 Emacs*toolBar: 0
diff --git a/dotfiles/hyprland/.config/themes/hudson/waybar.css b/dotfiles/hyprland/.config/themes/hudson/waybar.css
index 9056529..299f1c2 100644
--- a/dotfiles/hyprland/.config/themes/hudson/waybar.css
+++ b/dotfiles/hyprland/.config/themes/hudson/waybar.css
@@ -49,7 +49,7 @@ window#waybar {
 #cpu,
 #temperature,
 #memory,
-#disk,
+#custom-disk,
 #custom-netspeed,
 #battery,
 #wireplumber,
@@ -73,7 +73,7 @@ window#waybar {
 #cpu:hover,
 #temperature:hover,
 #memory:hover,
-#disk:hover,
+#custom-disk:hover,
 #custom-netspeed:hover,
 #wireplumber:hover,
 #sysmonitor:hover,
@@ -90,8 +90,24 @@ window#waybar {
     color: #bbbbbb;
 }
 
-#wireplumber.muted {
-    color: #666666;
+#custom-netspeed.disconnected {
+    color: #ff5858;
+}
+
+#temperature.warning {
+    color: #daa520;
+}
+
+#temperature.critical {
+    color: #ff5858;
+}
+
+#custom-disk.warning {
+    color: #daa520;
+}
+
+#custom-disk.critical {
+    color: #ff5858;
 }
 
 #battery.warning {
diff --git a/dotfiles/hyprland/.config/waybar/config b/dotfiles/hyprland/.config/waybar/config
index 5b9879e..fdff160 100644
--- a/dotfiles/hyprland/.config/waybar/config
+++ b/dotfiles/hyprland/.config/waybar/config
@@ -28,7 +28,7 @@
             "cpu",
             "temperature",
             "memory",
-            "disk",
+            "custom/disk",
             "battery"
         ]
     },
@@ -62,6 +62,7 @@
         "interval": 10,
         "hwmon-path-abs": "/sys/devices/pci0000:00/0000:00:18.3/hwmon",
         "input-filename": "temp1_input",
+        "warning-threshold": 70,
         "critical-threshold": 80,
         "format": "<span size='large'>󰔏</span> {temperatureC}°C",
         "format-critical": "<span size='large'>󰸁</span> {temperatureC}°C",
@@ -74,10 +75,11 @@
         "on-click": "toggle-scratchpad monitor"
     },
 
-    "disk": {
+    "custom/disk": {
+        "exec": "waybar-disk",
+        "return-type": "json",
         "interval": 30,
-        "format": "<span size='large'>󰆼</span> {percentage_used}%",
-        "path": "/",
+        "format": "<span size='large'>󰆼</span> {}",
         "on-click": "toggle-scratchpad monitor"
     },
 
diff --git a/dotfiles/hyprland/.config/waybar/style.css b/dotfiles/hyprland/.config/waybar/style.css
index 9056529..299f1c2 100644
--- a/dotfiles/hyprland/.config/waybar/style.css
+++ b/dotfiles/hyprland/.config/waybar/style.css
@@ -49,7 +49,7 @@ window#waybar {
 #cpu,
 #temperature,
 #memory,
-#disk,
+#custom-disk,
 #custom-netspeed,
 #battery,
 #wireplumber,
@@ -73,7 +73,7 @@ window#waybar {
 #cpu:hover,
 #temperature:hover,
 #memory:hover,
-#disk:hover,
+#custom-disk:hover,
 #custom-netspeed:hover,
 #wireplumber:hover,
 #sysmonitor:hover,
@@ -90,8 +90,24 @@ window#waybar {
     color: #bbbbbb;
 }
 
-#wireplumber.muted {
-    color: #666666;
+#custom-netspeed.disconnected {
+    color: #ff5858;
+}
+
+#temperature.warning {
+    color: #daa520;
+}
+
+#temperature.critical {
+    color: #ff5858;
+}
+
+#custom-disk.warning {
+    color: #daa520;
+}
+
+#custom-disk.critical {
+    color: #ff5858;
 }
 
 #battery.warning {
diff --git a/dotfiles/hyprland/.local/bin/screenshot b/dotfiles/hyprland/.local/bin/screenshot
new file mode 100755
index 0000000..45925c6
--- /dev/null
+++ b/dotfiles/hyprland/.local/bin/screenshot
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Screenshot tool with fuzzel menu
+# Usage: screenshot [region|fullscreen]
+
+DIR="$HOME/pictures/screenshots"
+mkdir -p "$DIR"
+FILE="$DIR/$(date +%Y-%m-%d_%H%M%S).png"
+
+# Capture
+case "${1:-region}" in
+    region)     grim -g "$(slurp)" "$FILE" || exit 1 ;;
+    fullscreen) grim "$FILE" || exit 1 ;;
+esac
+
+# Menu
+CHOICE=$(printf '󰅍  Copy Path\n󰋩  Copy Image\n󰏫  Annotate' | \
+    fuzzel --dmenu --prompt "Screenshot: " --width 20 --lines 3)
+
+case "$CHOICE" in
+    *"Copy Path"*)  echo -n "$FILE" | wl-copy --type text/plain ;;
+    *"Copy Image"*) wl-copy --type image/png < "$FILE" ;;
+    *"Annotate"*)   satty --filename "$FILE" --output-filename "$FILE" --copy-command wl-copy ;;
+esac
diff --git a/dotfiles/hyprland/.local/bin/waybar-disk b/dotfiles/hyprland/.local/bin/waybar-disk
new file mode 100755
index 0000000..6050653
--- /dev/null
+++ b/dotfiles/hyprland/.local/bin/waybar-disk
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Waybar disk usage module with warning/critical states
+PCT=$(df --output=pcent / | tail -1 | tr -d ' %')
+CLASS=""
+[ "$PCT" -ge 80 ] && CLASS="warning"
+[ "$PCT" -ge 90 ] && CLASS="critical"
+printf '{"text": "%s%%", "class": "%s", "tooltip": "Root: %s%% used"}\n' "$PCT" "$CLASS" "$PCT"
diff --git a/dotfiles/hyprland/.local/bin/waybar-netspeed b/dotfiles/hyprland/.local/bin/waybar-netspeed
index 97e8e5e..a6296b0 100755
--- a/dotfiles/hyprland/.local/bin/waybar-netspeed
+++ b/dotfiles/hyprland/.local/bin/waybar-netspeed
@@ -6,7 +6,7 @@
 INTERFACE=$(ip route | awk '/default/ {print $5; exit}')
 
 if [ -z "$INTERFACE" ]; then
-    echo '{"text": "󰤭 Disconnected", "tooltip": "No network connection", "class": "disconnected"}'
+    echo '{"text": "󰤭 Offline", "tooltip": "No network connection", "class": "disconnected"}'
     exit 0
 fi