From 6ece988c9770a588ff8f2f58b56721f55c227c4e Mon Sep 17 00:00:00 2001
From: Trianta <56975502+Trimutex@users.noreply.github.com>
Date: Mon, 29 Jul 2024 03:59:27 -0500
Subject: [PATCH] hypr: update config

---
 hypr/hyprland.conf             | 97 +++++++++++++++++++++++-----------
 hypr/scripts/resetxdgportal.sh |  3 --
 2 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 6967dd7..8474dd2 100755
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -3,9 +3,14 @@ source = ~/.config/hypr/mocha.conf # Catppuccin colorscheme
 # < Start Section >
 # monitors
 
+# nvidia
 # Single
-monitor=DP-1, 3440x1440@160, 0x0, 1, vrr, 1, bitdepth, 10
-monitor=DP-2, disable
+#monitor=DP-3, 3440x1440@160, 0x0, 1, vrr, 1, bitdepth, 8
+
+# intel
+# Single
+monitor=DP-1, 3440x1440@160, 0x0, 1, vrr, 1, bitdepth, 8
+#monitor=DP-2, disable
 
 # Double
 #monitor=DP-1, 3440x1440@160, 1920x0, 1, vrr, 1, bitdepth, 8
@@ -15,13 +20,39 @@ monitor=DP-2, disable
 
 
 
+# < Start Section >
+# environment variables
+
+env = xdg_current_desktop,hyprland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+env = MOZ_ENABLE_WAYLAND,1
+env = HYPRCURSOR_THEME, rose-pine-hyprcursor
+env = HYPRCURSOR_SIZE, 24
+
+# nvidia
+#env = LIBVA_DRIVER_NAME,nvidia
+#env = XDG_SESSION_TYPE,wayland
+#env = GDM_BACKEND,nvidia-drm
+#env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+
+# possible fnv fix?
+#env = intel_btimr, false
+
+# aquamarine
+#env = AQ_TRACE, 1
+#env = HYPRLAND_TRACE, 1
+
+# < End Section >
+
+
+
 # < Start Section >
 # startup applications
 
 # environment launches
-$scrPath = ~/.config/hypr/scripts
-exec-once = $scrPath/resetxdgportal.sh # reset XDPH for screenshare
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
+exec-once = ~/.config/hypr/scripts/resetxdgportal.sh # reset XDPH for screenshare
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE
 exec-once = dbus-update-activation-environment --systemd --all
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps
@@ -29,22 +60,27 @@ exec-once = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Moch
 exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 
 # xrandr settings
-exec-once = $scrPath/xrandr.sh
+exec-once = ~/.config/hypr/scripts/xrandr.sh
 
+# wayland to xwayland copy fix (text only)
+#exec-once = wl-paste -t text -w xclip -selection clipboard
+
+# background applications
 exec-once = waybar -c ~/.config/waybar/config
 exec-once = dunst
-exec-once = swww init
+exec-once = swww-daemon
 exec-once = syncthing --no-browser
 exec-once = xwaylandvideobridge
 
 # main applications
-#exec-once = discord --enable-features=UseOzonePlatform --ozone-platform=wayland
+exec-once = discord
+#exec-once = dopamine 
 exec-once = spotify --disable-gpu
-exec-once = alacritty
+exec-once = cool-retro-term 
 exec-once = firefox
-exec-once = taskset -c 1-7 steam
+#exec-once = taskset -c 1-7 steam
 #exec-once = taskset -c 1-7 gamescope -W 3200 -H 1100 -b -- steam
-exec-once = bolt
+#exec-once = bolt
 
 # < End Section >
 
@@ -53,10 +89,12 @@ exec-once = bolt
 # < Start Section >
 # workspace rules
 
-workspace = 1, monitor:DP-1, persistent:true, gapsout:0 440 0 440, default:true
-workspace = 2, monitor:DP-1, persistent:true, gapsout:126 756 180 756
-workspace = 3, monitor:DP-1, persistent:true, gapsout:0 440 0 440
-workspace = 4, monitor:DP-1, persistent:true, gapsout:0 0 40 0
+# gaps numbers (top, right, bottom, left)
+workspace = 1, monitor:DP-1, persistent:true, default:true
+#workspace = 1, monitor:DP-1, persistent:true, gapsout:0 440 0 440, default:true
+workspace = 2, monitor:DP-1, persistent:true, gapsout:160 756 146 756
+workspace = 3, monitor:DP-1, persistent:true, gapsout:50 440 50 440
+workspace = 4, monitor:DP-1, persistent:true, gapsout:45 0 0 0
 
 # Workspaces swapped for ease of use
 workspace = 6, monitor:DP-1, persistent:true
@@ -71,6 +109,7 @@ workspace = 5, monitor:DP-1, persistent:true
 
 general {
     gaps_in = 0
+    gaps_out = 8
     border_size = 3
     col.active_border = $peach
     #col.inactive_border = $peach
@@ -113,6 +152,7 @@ animations {
 
 input {
     kb_layout = us
+    kb_options = caps:swapescape
     follow_mouse = 2
     #follow_mouse = 3
     mouse_refocus = false;
@@ -134,6 +174,7 @@ misc {
     force_default_wallpaper = 0
     vrr = 1
     vfr = true
+    no_direct_scanout = true
 }
 
 xwayland {
@@ -162,6 +203,10 @@ debug {
 #    enabled = yes
 #}
 
+experimental {
+    explicit_sync = true
+}
+
 # < End Section >
 
 
@@ -200,12 +245,12 @@ windowrulev2 = float, class:^(qt5ct)$
 windowrulev2 = float, class:^(nwg-look)$
 windowrulev2 = float, class:^(pavucontrol)$
 windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
-#windowrulev2 = float, class:^(steam)$ 
 
 # main
 windowrulev2 = workspace 1 silent, class:^(discord)$
+windowrulev2 = workspace 1 silent, class:^(Dopamine)$
 windowrulev2 = workspace 1 silent, class:^(Spotify)$
-windowrulev2 = workspace 2 silent, class:^(Alacritty)$
+windowrulev2 = workspace 2 silent, class:^(cool-retro-term.cool-retro-term)$
 windowrulev2 = workspace 3 silent, class:^(firefox)$
 windowrulev2 = workspace 4 silent, class:^(steam)$
 windowrulev2 = workspace 4 silent, title:^(Minecraft.*)$
@@ -213,7 +258,8 @@ windowrulev2 = workspace 4 silent, class:^(steam_app_.*)$
 windowrulev2 = workspace 4 silent, class:^(steam_proton)$
 windowrulev2 = workspace 4 silent, class:^(hl2_linux)$
 windowrulev2 = workspace 4 silent, class:^(gamescope)$
-windowrulev2 = workspace 5 silent, class:^(Bolt.*)$
+windowrulev2 = workspace 5 silent, class:^(steam)$ 
+windowrulev2 = workspace 6 silent, class:^(Bolt.*)$
 
 # development
 windowrulev2 = pseudo, title:^(SnakePlusPlus)$ 
@@ -286,7 +332,7 @@ bind = $mainMod SHIFT, J, togglesplit, # dwindle
 bind = $mainMod SHIFT, SPACE, pseudo, # dwindle
 
 # main application shortcuts
-bind = $mainMod, RETURN, exec, alacritty
+bind = $mainMod, RETURN, exec, cool-retro-term
 bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
 bind = $mainMod SHIFT, 7, exec, taskset -c 1-7 prismlauncher
 bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun
@@ -340,16 +386,3 @@ bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
 # < End Section >
-
-
-
-# < Start Section >
-# environment variables
-
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = MOZ_ENABLE_WAYLAND,1
-env = HYPRCURSOR_THEME, rose-pine-hyprcursor
-env = HYPRCURSOR_SIZE, 24
-
-# < End Section >
diff --git a/hypr/scripts/resetxdgportal.sh b/hypr/scripts/resetxdgportal.sh
index 32983ec..b6f3018 100755
--- a/hypr/scripts/resetxdgportal.sh
+++ b/hypr/scripts/resetxdgportal.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
-sleep 1
 killall xdg-desktop-portal-hyprland
 killall xdg-desktop-portal-gnome
 killall xdg-desktop-portal-kde
 killall xdg-desktop-portal-lxqt
 killall xdg-desktop-portal-wlr
 killall xdg-desktop-portal
-sleep 1
 /usr/lib/xdg-desktop-portal-hyprland &
-sleep 2
 /usr/lib/xdg-desktop-portal &