From 16d3e7e80a0a0b2665888c722fd2bb4a39842503 Mon Sep 17 00:00:00 2001
From: agryphus <agryphus@gmail.com>
Date: Thu, 7 Dec 2023 07:13:06 -0500
Subject: [PATCH] Fix Wayland GTK Theme

---
 .config/gtk-3.0/settings.ini |  2 +-
 .config/hypr/hyprland.conf   | 18 ++++++++++++------
 .config/zsh/.zshenv          |  5 ++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 9e8847f..b67ba62 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=gruvbox-dark
+gtk-application-prefer-dark-theme=1
 gtk-icon-theme-name=hicolor
 gtk-font-name=Sans 10
 gtk-cursor-theme-size=0
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index ad7d194..dc45443 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -7,8 +7,10 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=,highrr,auto,auto
 
-# Some default env vars.
+# Wayland related environment variables.
 env = XCURSOR_SIZE,24
+env = WLR_NO_HARDWARE_CURSORS=1
+
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -98,7 +100,8 @@ misc {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
     force_default_wallpaper = 0 # Set to 0 to disable the anime mascot wallpapers
     enable_swallow = true
-    swallow_regex = ^foot$
+    swallow_regex = ^footclient$
+    mouse_move_enables_dpms = true
 }
 
 # Example per-device config
@@ -116,11 +119,12 @@ device:epic-mouse-v1 {
 $mainMod = SUPER
 
 # Program spawning hotkeys
-bind = CONTROL ALT, BACKSPACE, exec, $TERMINAL -e $SHELL -c 'htop'
-bind = $mainMod,       RETURN, exec, foot
+bind = CONTROL ALT, BACKSPACE, exec, footclient -e zsh -c 'htop'
+bind = $mainMod,       RETURN, exec, footclient
 bind = $mainMod,       W,      exec, firefox
-bind = $mainMod,       E,      exec, $TERMINAL -e $SHELL -c 'tmp="$(mktemp)" && command lf -last-dir-path="$tmp" "$@" && test -f "$tmp" && dir="$(command cat "$tmp")" && rm -f "$tmp" && test -d "$dir" && cd "$dir" && exec $SHELL'
+bind = $mainMod,       E,      exec, footclient -e zsh -c 'tmp="$(mktemp)" && command lf -last-dir-path="$tmp" "$@" && test -f "$tmp" && dir="$(command cat "$tmp")" && rm -f "$tmp" && test -d "$dir" && cd "$dir" && exec $SHELL'
 bind = $mainMod SHIFT, E,      exec, emacsclient -c -a 'emacs'
+bind = $mainMod,       P,      exec, rofi-pass
 
 # Menu hoykeys
 bind = $mainMod, R, exec, menu-run
@@ -134,7 +138,7 @@ binde = ,F7,                    exec, change-brightness up
 binde = ,XF86MonBrightnessUp,   exec, change-brightness up
 binde = ,F6,                    exec, change-brightness down
 binde = ,XF86MonBrightnessDown, exec, change-brightness down
-bind  = $mainMod,       L,      exec, swaylock -e -c 000000
+bind  = $mainMod,       L,      exec, hyprctl dispatch dpms off; swaylock -e -c 000000
 
 # Kill commands
 bind = $mainMod CONTROL SHIFT, Q, exit, 
@@ -213,5 +217,7 @@ exec-once = hyprctl dispatch focusmonitor 3; hyprctl dispatch exec 'hyprdwm goto
 exec-once = waybar
 exec-once = hyprland-autoname-workspaces
 exec-once = kanshi
+exec-once = fcitx5
+exec-once = foot --server
 exec-once = sleep 1 && swww img ~/.config/wallpaper
 
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index f58ec4b..a46f7a1 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -14,15 +14,14 @@ fi
 # export GBM_BACKEND=nvidia-drm
 # export __GLX_VENDOR_LIBRARY_NAME=nvidia
 
-export WLR_NO_HARDWARE_CURSORS=1
-
 export BROWSER="$(which firefox)"
 export EDITOR="$(which nvim)"
-export TERMINAL="$(which foot)"
 
 export MANPAGER='nvim +Man! -c "ZenMode" -c "map q :qa!<CR>"'
 export PAGER=
 
+export GTK_THEME=gruvbox-dark
+
 # Configuring input method
 export GTK_IM_MODULE='fcitx'
 export QT_IM_MODULE='fcitx'