updates

14 files changed, 86 insertions, 28 deletions

diff --git a/dot-config/gtk-3.0/settings.ini b/dot-config/gtk-3.0/settings.ini
index 8aa6b30b..7022fa71 100644
--- a/dot-config/gtk-3.0/settings.ini
+++ b/dot-config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=Arc-Dark
+gtk-theme-name=Arc-Darker
 gtk-icon-theme-name=BeautyLine
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-name=Bibata-Rainbow-Modern
@@ -12,6 +12,6 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=0
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
-; gtk-xft-rgba=rgb
+gtk-xft-hintstyle=hintslight
 gtk-application-prefer-dark-theme=1
+; gtk-xft-rgba=rgb
diff --git a/dot-config/gtk-4.0/settings.ini b/dot-config/gtk-4.0/settings.ini
index 727b73ff..74dd93ed 100644
--- a/dot-config/gtk-4.0/settings.ini
+++ b/dot-config/gtk-4.0/settings.ini
@@ -2,7 +2,7 @@
 gtk-theme-name=Arc-Dark
 gtk-icon-theme-name=BeautyLine
 gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=LyraB-cursors
+gtk-cursor-theme-name=Bibata-Rainbow-Modern
 gtk-cursor-theme-size=24
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
diff --git a/dot-config/hypr/autostart.conf b/dot-config/hypr/autostart.conf
index 87902985..2cbd60b9 100644
--- a/dot-config/hypr/autostart.conf
+++ b/dot-config/hypr/autostart.conf
@@ -5,8 +5,15 @@
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 
-exec-once = dbus-update-activation-environment --all && dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
+# seems to be builtin?
+# exec-once = dbus-update-activation-environment --all && dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+# exec-once = systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
+
+
+# Launch hyprland plugins
+exec-once = hyprpm reload || hyprpm update
+# Start pyprland daemon
+exec-once = pyprland
 
 # Waybar
 exec-once = waybar
@@ -38,6 +45,9 @@ exec-once = wl-paste --type image --watch cliphist store
 # Notification agent
 exec-once = swaync
 
+# window swicher daemon
+exec-once = hyprswitch init --show-title
+
 # audio auto adjust
 exec-once = $HOME/scripts/audio-autoAdjust.sh --daemon
 
diff --git a/dot-config/hypr/binds.conf b/dot-config/hypr/binds.conf
index 1c4d5bb6..0b1edb23 100644
--- a/dot-config/hypr/binds.conf
+++ b/dot-config/hypr/binds.conf
@@ -16,6 +16,7 @@ bind = $mainMod shift, return, exec, $terminal --class "alacritty-float,alacritt
 bind = super alt, Delete, exec, $rofiexec/rofi_powermenu
 bind = alt, F1, exec, $rofiexec/rofi_launcher
 bind = alt, F2, exec, $rofiexec/rofi_runner
+bind = $mainMod, period, exec, $rofiexec/rofi_emoji
 # utils
 bind = $mainMod, c, exec, $rofiexec/rofi_configs
 bind = $mainMod, m, exec, $rofiexec/rofi_music
@@ -73,6 +74,36 @@ bind = $mainMod shift, q, exec, kill -9 $(hyprctl activewindow | grep pid | tail
 bind = ctrl alt, escape, exec, hyprctl kill
 bind = ctrl $mainMod shift, r, exec, systemctl restart $sessionManager
 bind = ctrl $mainMod, escape, exec, killall waybar; waybar
+# bind = ctrl, up, hyprexpo:expo, on
+# bind = ctrl, down, hyprexpo:expo, off
+bind = ctrl, up, overview:open
+bind = ctrl, down, overview:close
+# bind = alt, tab, exec, hyprswitch gui
+# bind = alt, grave, exec, hyprswitch gui --reverse
+# bindr = alt, tab, exec, hyprswitch close
+# bindr = alt, grave, exec, hyprswitch close
+# allows repeated switching with same keypress that starts the submap
+binde = alt, tab, exec, hyprswitch gui --do-initial-execute
+bind = alt, tab, submap, switch
+
+# allows repeated switching with same keypress that starts the submap
+binde = alt grave, tab, exec, hyprswitch gui --do-initial-execute -r
+bind = alt grave, tab, submap, switch
+
+submap = switch
+# allow repeated window switching in submap (same keys as repeating while starting)
+binde = alt, tab, exec, hyprswitch gui
+binde = alt grave, tab, exec, hyprswitch gui -r
+
+# exit submap and stop hyprswitch
+bindrt = alt, tab, exec, hyprswitch close
+bindrt = alt, tab, submap, reset
+
+# if it somehow doesn't close on releasing $switch_release, escape can kill (doesnt switch)
+bindr = ,escape, exec, hyprswitch close --kill
+bindr = ,escape, submap, reset
+submap = reset
+
 # restart bar
 bind = ctrl alt, left, workspace, -1
 bind = ctrl alt, right, workspace, +1
diff --git a/dot-config/hypr/env.conf b/dot-config/hypr/env.conf
index 85238583..5b227bb3 100644
--- a/dot-config/hypr/env.conf
+++ b/dot-config/hypr/env.conf
@@ -6,7 +6,7 @@
 
 env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
-env = HYPRCURSOR_THEME,Bibata-rainbow-modern
+env = HYPRCURSOR_THEME,Bibata-Rainbow-Modern
 
 # Nvidia
 env = LIBVA_DRIVER_NAME,nvidia
@@ -45,3 +45,9 @@ env = INPUT_METHOD,fcitx
 env = XMODIFIERS,fcitx
 env = IMSETTINGS_MODULE,fcitx
 env = QT_IM_MODULE,fcitx
+
+# wine
+env = WINEPREFIX,/opt/windows.wine
+
+# howdy avoid spam from gstreamer
+env = OPENCV_LOG_LEVEL,ERROR
diff --git a/dot-config/hypr/hyprland.conf b/dot-config/hypr/hyprland.conf
index fa06338a..139b6e74 100644
--- a/dot-config/hypr/hyprland.conf
+++ b/dot-config/hypr/hyprland.conf
@@ -143,10 +143,15 @@ cursor {
     allow_dumb_copy = true
 }
 
-
+plugin {
+    overview {
+        disableGestures = true
+        panelHeight = 150
+    }
+}
 
 source = ~/.config/hypr/env.conf
 source = ~/.config/hypr/rules.conf
 source = ~/.config/hypr/binds.conf
 source = ~/.config/hypr/autostart.conf
-render:explicit_sync = 1
+exec-shutdown = hyprctl clients > ~/asdf
diff --git a/dot-config/hypr/hyprlock.conf b/dot-config/hypr/hyprlock.conf
index 7ef51575..6331a748 100644
--- a/dot-config/hypr/hyprlock.conf
+++ b/dot-config/hypr/hyprlock.conf
@@ -52,7 +52,7 @@ label {
   color = rgba(242, 243, 244, 0.75)
   font_size = 14
   font_family = SF Pro Text
-  position = 20, 512
+  position = 20, 1024
   halign = left
   valign = center
 }
@@ -63,7 +63,7 @@ label {
   color = rgba(242, 243, 244, 0.75)
   font_size = 16
   font_family = SF Pro Text
-  position = -35, 512
+  position = -35, 1024
   halign = right
   valign = center
 }
@@ -74,7 +74,7 @@ label {
   color = rgba(242, 243, 244, 0.75)
   font_size = 15
   font_family = SF Pro Text
-  position = -150, 512
+  position = -150, 1024
   halign = right
   valign = center
 }
@@ -92,7 +92,8 @@ label {
 
 label {
   monitor = 
-  text = cmd[update:1000] echo "$(date +"%k:%M")"
+  # text = cmd[update:1000] echo "$(date +"%k:%M")"
+  text = $TIME
   color = rgba(242, 243, 244, 0.75)
   font_size = 93
   font_family = SF Pro Display Bold
diff --git a/dot-config/hypr/rules.conf b/dot-config/hypr/rules.conf
index 9056ea75..0ed3a11b 100644
--- a/dot-config/hypr/rules.conf
+++ b/dot-config/hypr/rules.conf
@@ -32,16 +32,17 @@ windowrulev2 = workspace 5, class:(Gucharmap|Atril|Evince|libreoffice-writer|lib
 windowrulev2 = workspace 6, class:(Thunderbird|TelegramDesktop|Hexchat|discord|vesktop|VencordDesktop|Chat-gpt|Whatsapp-for-linux|Chatbox)
 
 # Media applications on workspace 7
-windowrulev2 = workspace 7, class:(Audacity|Music|MPlayer|Lxmusic|Inkscape|Gimp|Blender|obs|zoom|Zoom|Pitivi|kdenlive|openshot|vlc|Spotify|Spotify Premium|cider|Cider|shotwell|Shotwell)
+windowrulev2 = workspace 7, class:(Audacity|Music|MPlayer|Lxmusic|Inkscape|Gimp|Blender|obs|zoom|Zoom|Pitivi|kdenlive|openshot|vlc|cider|Cider|shotwell|Shotwell|fr.handbrake.ghb)
+windowrulev2 = workspace 7, title:(Spotify|Spotify Premium)
 
 # Games on workspace 8
-windowrulev2 = workspace 8, class:(Minecraft|Badlion|War|steam_proton|csgo_linux64|minecraft-launcher|Lutris|genshinimpact.exe|moe.launcher.an-anime-game-launcher)
+windowrulev2 = workspace 8, class:(Minecraft|Badlion|War|steam_proton|csgo_linux64|minecraft-launcher|lutris|genshinimpact.exe|moe.launcher.an-anime-game-launcher)
 
 # System applications on workspace 9
 windowrulev2 = workspace 9, class:(Virt-manager|blueman-adapters|GParted|Xdm-app|timeshift-gtk|com.nextcloud.desktopclient.nextcloud|gearlever)
 
 # Settings applications on workspace 9
-windowrulev2 = workspace 9, class:(Lxappearance|Lxtask|Lxrandr|Arandr|System-config-printer.py|Pavucontrol|Exo-helper-1|Protonvpn|Xfce4-power-manager-settings|Mysql-workbench-bin|Grub-customizer|Nitrogen|archlinux-tweak-tool.py|pamac-manager|helvum|Vmware|Btrfs Assistant|Bitwarden|wootility-lekker)
+windowrulev2 = workspace 9, class:(Lxappearance|Lxtask|Lxrandr|Arandr|System-config-printer.py|Pavucontrol|Exo-helper-1|Protonvpn|Xfce4-power-manager-settings|Mysql-workbench-bin|Grub-customizer|Nitrogen|archlinux-tweak-tool.py|pamac-manager|helvum|Vmware|btrfs-assistant|Bitwarden|wootility-lekker)
 
 # Miscellaneous applications on workspace 10
 windowrulev2 = workspace 10, class:(maxautoclicker|os_server|Os_server)
@@ -121,7 +122,7 @@ windowrulev2 = opacity 0.85 0.75, class:^code-oss$
 windowrulev2 = opacity 0.85 0.75, class:^code$
 windowrulev2 = opacity 0.85 0.75, class:^code-url-handler$
 windowrulev2 = opacity 1.00 0.90, class:^TelegramDesktop$
-windowrulev2 = opacity 0.90 0.80, class:^Spotify$
+windowrulev2 = opacity 0.90 0.80, title:Spotify
 windowrulev2 = opacity 0.90 0.80, class:^Cider$
 windowrulev2 = opacity 0.50 0.40, class:^fcitx$
 windowrulev2 = opacity 0.90 0.80, class:^Brave-browser$
diff --git a/dot-config/rofi/config.rasi b/dot-config/rofi/config.rasi
index 9956ccb7..836b8dbb 100644
--- a/dot-config/rofi/config.rasi
+++ b/dot-config/rofi/config.rasi
@@ -1,6 +1,6 @@
 configuration {
 	/*---------- General setting ----------*/
-	modi: "drun,run,filebrowser,window,emoji,calc";
+	modi: "drun,run,filebrowser,window,emoji";
 	case-sensitive: false;
 	cycle: true;
 	filter: "";
diff --git a/dot-config/rofi/launcher.rasi b/dot-config/rofi/launcher.rasi
index 9c4972de..6b2852f1 100644
--- a/dot-config/rofi/launcher.rasi
+++ b/dot-config/rofi/launcher.rasi
@@ -1,10 +1,10 @@
 /*****----- Configuration -----*****/
 configuration {
-	modi:                       "drun,run,file-browser-extended,window";
+	modi:                       "drun,run,filebrowser,window";
     show-icons:                 true;
     display-drun:               " Apps";
     display-run:                " Run";
-    display-file-browser-extended:        " Files";
+    display-filebrowser:        " Files";
     display-window:             " Windows";
 	drun-display-format:        "{name}";
 	window-format:              "{c} · {t}";
diff --git a/dot-config/user-dirs.locale b/dot-config/user-dirs.locale
index c574d073..3e0b4191 100644
--- a/dot-config/user-dirs.locale
+++ b/dot-config/user-dirs.locale
@@ -1 +1 @@
-en
+en_US
\ No newline at end of file
diff --git a/dot-config/waybar/modules.jsonc b/dot-config/waybar/modules.jsonc
index 6da47d65..4962c70d 100644
--- a/dot-config/waybar/modules.jsonc
+++ b/dot-config/waybar/modules.jsonc
@@ -100,6 +100,10 @@
     },
     "hyprland/window": {
         // "on-click": "hyprctl dispatch focuswindow 'title:{title}'",
+        "rewrite": {
+            "(.*) - Thorium": "$1",
+        },
+        "separate-outputs": true
     },
     "custom/gpu": {
         "format": " {}%",
diff --git a/dot-config/waybar/style.css b/dot-config/waybar/style.css
index 42e91d0a..01e5e139 100644
--- a/dot-config/waybar/style.css
+++ b/dot-config/waybar/style.css
@@ -26,7 +26,7 @@ window#waybar {
     font-size: 0.8rem;
 }
 
-window#waybar.empty #window,#modules-center {
+window#waybar.empty {
     background-color: transparent;
     border: none;
 }
diff --git a/dot-zshenv b/dot-zshenv
index 88530ab7..41a009ac 100644
--- a/dot-zshenv
+++ b/dot-zshenv
@@ -1,7 +1,7 @@
 typeset -U PATH path
-export GTK_IM_MODULE='fcitx'
-export QT_IM_MODULE='fcitx'
-export SDL_IM_MODULE='fcitx'
-export XMODIFIERS='@im=fcitx'
-export OPENCV_LOG_LEVEL=ERROR
-export WINEPREFIX=/opt/windows.wine
+# export GTK_IM_MODULE='fcitx'
+# export QT_IM_MODULE='fcitx'
+# export SDL_IM_MODULE='fcitx'
+# export XMODIFIERS='@im=fcitx'
+# export OPENCV_LOG_LEVEL=ERROR
+# export WINEPREFIX=/opt/windows.wine