hypr: fixup, update. refactor vars

5 files changed, 29 insertions, 16 deletions

diff --git a/dot-config/hypr/autostart.conf b/dot-config/hypr/autostart.conf
index 95952d37..5fdfcba2 100644
--- a/dot-config/hypr/autostart.conf
+++ b/dot-config/hypr/autostart.conf
@@ -19,8 +19,8 @@ exec-once = waybar
 # Hypr-Eco
 # exec-once = hyprpaper
 # exec-once = $SCRIPTSDIR/hyprpaper.sh
-# exec-once = $SCRIPTSDIR/swww.sh
-exec-once = $SCRIPTSDIR/mpvpaper.sh
+exec-once = $bgChangerBin
+# exec-once = $SCRIPTSDIR/mpvpaper.sh
 exec-once = hypridle
 
 exec-once = hyprsunset
@@ -75,9 +75,9 @@ exec-once = bitwarden-desktop
 # exec-once = kdeconnectd
 exec-once = killall input-leap input-leaps; input-leap # works with https://github.com/3l0w/Hyprland/tree/feat/input-capture-impl
 exec-once = nextcloud --background
-exec-once = [noinitialfocus; workspace, special]localsend --hidden
+exec-once = [noinitialfocus; workspace, special] localsend --hidden
 exec-once = [workspace 6 silent; noinitialfocus] vesktop-bin --start-minimized
-exec-once = /opt/Beeper/beeper $waylandarg --no-sandbox --hidden --default-frame --enable-wayland-ime
+exec-once = /opt/BeeperTexts/beepertexts $waylandarg --no-sandbox --hidden --default-frame --enable-wayland-ime
 # exec-once = echo 'ddcci 0x37' | sudo tee /sys/bus/i2c/devices/i2c-13/new_device
 
 # Notify if stuff is already started
diff --git a/dot-config/hypr/binds.conf b/dot-config/hypr/binds.conf
index 4702bbe3..2d85845b 100644
--- a/dot-config/hypr/binds.conf
+++ b/dot-config/hypr/binds.conf
@@ -12,7 +12,7 @@ binds {
 $mod = SUPER # Sets "SUPER" key as main modifier
 
 # Launching...
-bind = $mod, return, execr, $term
+bind = $mod, return, execr, $termLaunch
 bind = $mod shift, return, exec, $termfloat
 # bind = $mod space, return, execr, $terminal start --class pseudo
 bind = $mod alt, Delete, execr, $rofiexec/rofi_powermenu
@@ -37,7 +37,7 @@ bind = $mod shift, f, execr, $fileManager
 bind = $mod shift, w, execr, $browser # -new-tab about:sessionrestore
 bind = $mod shift, e, execr, code
 bind = $mod shift, d, execr, vesktop-bin $waylandarg
-bind = $mod shift, b, execr, /opt/Beeper/beeper $waylandarg --default-frame --enable-wayland-ime
+bind = $mod shift, b, execr, /opt/BeeperTexts/beepertexts $waylandarg --default-frame --enable-wayland-ime
 # CLI
 bind = ctrl alt, a, exec, $termfloat --title=pulsemixer -e pulsemixer
 bind = ctrl alt, r, exec, $termfloat --title=ranger -e ranger
@@ -100,7 +100,7 @@ bind = ctrl $mod shift, r, execr, hyprctl reload
 # restart bar
 bind = ctrl $mod, escape, execr, killall -SIGUSR2 waybar || waybar &
 # reload wall
-bind = $mod alt, b, execr, killall wallust mpvpaper.sh; $SCRIPTSDIR/mpvpaper.sh
+bind = $mod alt, b, execr, killall wallust $bgChanger; $bgChangerBin
 # bind = ctrl, up, hyprexpo:expo, on
 # bind = ctrl, down, hyprexpo:expo, off
 # bind = ctrl $mod alt, up, overview:open
diff --git a/dot-config/hypr/env.conf b/dot-config/hypr/env.conf
index 9f50bb4c..6bc140e6 100644
--- a/dot-config/hypr/env.conf
+++ b/dot-config/hypr/env.conf
@@ -73,4 +73,4 @@ env = MOZ_ENABLE_WAYLAND,1
 # defaults
 env = BROWSER, zen-bin
 env = EDITOR, lvim
-env = TERM, ghostty
+env = TERM, kitty
diff --git a/dot-config/hypr/hyprland.conf b/dot-config/hypr/hyprland.conf
index 3e062f3a..2b1838a6 100644
--- a/dot-config/hypr/hyprland.conf
+++ b/dot-config/hypr/hyprland.conf
@@ -12,7 +12,8 @@ monitor=,highres@highrr,auto,auto,bitdepth,10
 ###################
 
 # Program defaults
-$term = ghostty
+$term = kitty
+$termLaunch = $term -1
 $termfloat = [float; size 40% 40%; workspace +0] $term
 $editor = lvim
 # $browser = thorium-browser
@@ -26,7 +27,8 @@ $HYPRDIR = $HOME/.config/hypr
 $WAYBARDIR = $HOME/.config/waybar
 $SCRIPTSDIR = $HOME/scripts
 $rofiexec = $HOME/.config/rofi/scripts
-
+$bgChangerBin = $SCRIPTSDIR/walls/swww.sh
+$bgChanger = swww.sh
 # global vars
 $outer_gaps = 12
 
@@ -46,7 +48,7 @@ $waylandarg = --enable-features=WaylandWindowDecorations,UseOzonePlatform,WebRTC
 general { 
     gaps_in = 3
     gaps_out = 7
-    float_gaps_out = 7
+    # float_gaps_out = 7
     border_size = 3
 
     # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
@@ -75,6 +77,7 @@ general {
 ecosystem {
     no_donation_nag = true
     no_update_news = true
+	enforce_permissions = 1
 }
 
 xwayland {
@@ -252,8 +255,8 @@ input {
 }
 
 cursor {
-    # use_cpu_buffer = true
-    no_hardware_cursors = true
+    use_cpu_buffer = true
+    # no_hardware_cursors = true
     no_break_fs_vrr = true
     # zoom_rigid = true
     persistent_warps = true
diff --git a/dot-config/hypr/rules.conf b/dot-config/hypr/rules.conf
index 377279ea..9e2c2b14 100644
--- a/dot-config/hypr/rules.conf
+++ b/dot-config/hypr/rules.conf
@@ -8,15 +8,25 @@
 ### TAG ###
 # workspaces
 windowrule = workspace 1, tag:terminal
+# workspace = 1, persistent:true
 windowrule = workspace 2, tag:web
+# workspace = 2, persistent:true
 windowrule = workspace 3, tag:file
+# workspace = 3, persistent:true
 windowrule = workspace 4, tag:code
+# workspace = 4, persistent:true
 windowrule = workspace 5, tag:office
+# workspace = 5, persistent:true
 windowrule = workspace 6, tag:communication
+# workspace = 6, persistent:true
 windowrule = workspace 7, tag:media
+# workspace = 7, persistent:true
 windowrule = workspace 8, tag:games
+# workspace = 8, persistent:true
 windowrule = workspace 9, tag:system
+# workspace = 9, persistent:true
 windowrule = workspace 10, tag:misc
+# workspace = 10, persistent:true
 
 # content hints(content-type-v1)
 windowrule = content game, tag:games
@@ -76,7 +86,7 @@ windowrule = movetoworkspacesilent, special:minimized, tag:hidden
 # windowrule = group, ^virt-manager$
 
 # Terminal applications
-windowrule = tag +terminal, class:^(Alacritty|Xfce4-terminal|Kitty|$terminal|com.mitchellh.ghostty)$
+windowrule = tag +terminal, class:^(Alacritty|Xfce4-terminal|Kitty|$term|com.mitchellh.ghostty)$
 
 # Web browsers
 windowrule = tag +web, class:^($browser|Brave-browser|chromium|firefox|thorium|zen)$
@@ -109,7 +119,7 @@ windowrule = tag +system, class:^(virt-manager|blueman-adapters|GParted|Xdm-app|
 windowrule = tag +misc, class:^(os_server|Os_server)$
 
 # floating applications
-windowrule = float, class:^(zoom|sxiv|Sxiv|Viewnior|feh|nm-connection-editor|install4j-burp-StartBurp|thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|float|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper|electron|com.github.rafostar.Clapper|io.github.celluloid_player.Celluloid)$
+windowrule = float, class:^(zoom|sxiv|Sxiv|Viewnior|feh|nm-connection-editor|install4j-burp-StartBurp|thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|float|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|BeeperTexts|electron|com.github.rafostar.Clapper|io.github.celluloid_player.Celluloid)$
 windowrule = float, title:^(Steam Settings|Sign in – Google accounts)$
 
 # pin apps
@@ -124,7 +134,7 @@ windowrule = pin, title:^(zoom_linux_float_video_window)$
 windowrule = stayfocused, title:(menu window)
 
 # GUI Utils applications
-windowrule = tag +gui-utils, class:^(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper)$
+windowrule = tag +gui-utils, class:^(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|BeeperTexts)$
 windowrule = animation slide right top, tag:gui-utils
 
 # bitwarden chrome extension popup