From 3dbe78f2246d7d64289f2157dc1d95b9cf63385c Mon Sep 17 00:00:00 2001 From: Amy Retzerau Date: Sun, 7 Sep 2025 12:37:58 +0200 Subject: [PATCH] feat: moved env variables from hyprland to uwsm to fix many bugs --- .bashrc | 2 - .config/fish/fish_variables | 4 +- .config/hypr/hypridle.conf | 2 +- .config/hypr/hyprland.conf | 97 ++++++++++++++++++++++--------------- .config/okularrc | 3 -- .config/uwsm/env | 8 +++ .config/uwsm/env-hyprland | 9 ++++ 7 files changed, 77 insertions(+), 48 deletions(-) create mode 100644 .config/uwsm/env create mode 100644 .config/uwsm/env-hyprland diff --git a/.bashrc b/.bashrc index 34fa0cd..131732d 100644 --- a/.bashrc +++ b/.bashrc @@ -14,5 +14,3 @@ alias ls='ls --color=auto' alias grep='grep --color=auto' PS1='[\u@\h \W]\$ ' -alias dotfiles='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' -[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh" diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 73d4956..0cd433e 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,6 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_initialized:3400 +SETUVAR __fish_initialized:3800 SETUVAR budspencer_colors:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900 SETUVAR budspencer_cursors:\x5c033\x5d12\x3b\x23268bd2\x5c007\x1e\x5c033\x5d12\x3b\x23b58900\x5c007\x1e\x5c033\x5d12\x3b\x23af005f\x5c007\x1e\x5c033\x5d12\x3b\x236c71c4\x5c007 SETUVAR budspencer_day:000000\x1e333333\x1e666666\x1effffff\x1effff00\x1eff6600\x1eff0000\x1eff0033\x1e3300ff\x1e00aaff\x1e00ffff\x1e00ff00 @@ -26,7 +26,7 @@ SETUVAR fish_color_operator:brcyan SETUVAR fish_color_param:cyan SETUVAR fish_color_quote:yellow SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf index 4b185be..1376274 100644 --- a/.config/hypr/hypridle.conf +++ b/.config/hypr/hypridle.conf @@ -29,6 +29,6 @@ listener { } listener { - timeout = 1800 # 30min + timeout = 3600 # 30min on-timeout = systemctl suspend # suspend pc } diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 0e29a4d..dee4edd 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,4 +1,4 @@ -# ####################################################################################### + ####################################################################################### # AUTOGENERATED HYPR CONFIG. # PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, # OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. @@ -25,9 +25,13 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ #debug:disable_scale_checks = true monitor= eDP-1,1920x1080@60.04900,0x0,1 -monitor= HDMI-A-2,1920x1080@60.00,-1920x-1440,1 -monitor= DP-3, 2560x1440@74.97,0x-1440,1 +monitor= desc:Hewlett Packard HP 24es 3CM6310XHM,1920x1080@60.00,-1920x-1440,1 +monitor= desc:AOC Q3279WG5B 0x00005175, 2560x1440@74.97,0x-1440,1 + +monitor = , preferred, auto, 1, mirror, eDP-1 + +#monitor= DP-3,1600x1200@60.00,auto,auto ################### ### MY PROGRAMS ### ################### @@ -37,7 +41,7 @@ monitor= DP-3, 2560x1440@74.97,0x-1440,1 # Set programs that you use $terminal = kitty $fileManager = dolphin -$menu = rofi -show run -run-command "uwsm app -- {cmd}" -show-icons -icon-theme "Papirus" +$menu = rofi -show drun -run-command "uwsm app -- {cmd}" -show-icons -icon-theme "Papirus" ################# @@ -55,38 +59,39 @@ $menu = rofi -show run -run-command "uwsm app -- {cmd}" -show-icons -icon-theme exec-once = uwsm app -- syncthing #exec-once = uwsm app -- keepassxc #exec-once = nwg-dock-hyprland -x -mb 10 -mt -10 +exec-once = ~/.config/hypr/start-xdg-hyprland.sh ############################# ### ENVIRONMENT VARIABLES ### ############################# # See https://wiki.hyprland.org/Configuring/Environment-variables/ -env = XCURSOR_SIZE,24 -env = XCURSOR_THEME,BreezeX-Black -env = XCURSOR_PATH,$HOME/.icons -#env = HYPRCURSOR_SIZE,24 -#env = HYPRCURSOR_THEME,rose-pine-cursor-hyprcursor -env = QT_QPA_PLATFORMTHEME,qt6ct -#env QT_QPA_PLATFORMTHEME=qt5ct dolphin -env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -env = QT_AUTO_SCREEN_SCALE_FACTOR,1 -env = QT_QPA_PLATFORM,xcb -env = QT_STYLE_OVERRIDE=kvantum -env = EDITOR, nano -env = GTK_THEME, Sweet:dark -env = XDG_CURRENT_DESKTOP,Hyprland -env = XDG_SESSION_TYPE,wayland -env = XDG_SESSION_DESKTOP,Hyprland +#env = XCURSOR_SIZE,24 +#env = XCURSOR_THEME,BreezeX-Black +#env = XCURSOR_PATH,$HOME/.icons +##env = HYPRCURSOR_SIZE,24 +##env = HYPRCURSOR_THEME,rose-pine-cursor-hyprcursor +#env = QT_QPA_PLATFORMTHEME,qt6ct +##env QT_QPA_PLATFORMTHEME=qt5ct dolphin +#env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 +#env = QT_AUTO_SCREEN_SCALE_FACTOR,1 +#env = QT_QPA_PLATFORM,xcb +#env = QT_STYLE_OVERRIDE=kvantum +env = EDITOR, nvim +#env = GTK_THEME, Sweet:dark +#env = XDG_CURRENT_DESKTOP,Hyprland +#env = XDG_SESSION_TYPE,wayland +#env = XDG_SESSION_DESKTOP,Hyprland #Dolphin open with env = XDG_MENU_PREFIX,arch- kbuildsycoca6 #Nvidi Envs - #env = LIBVA_DRIVER_NAME,nvidia #env = GBM_BACKEND,nvidia +#env = DRI_PRIME,pci-0000_03_00_0 +#env = __VK_LAYER_NV_optimus,NVIDIA_only #env = __GLX_VENDOR_LIBRARY_NAME,nvidia #env = VDPAU_DRIVER, nvidia -env = SHELL, /bin/bash -#env = AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1 +#env = SHELL, /bin/bash cursor { no_hardware_cursors = true @@ -103,13 +108,13 @@ general { gaps_in = 5 gaps_out = 10 - border_size = 2 + border_size = 0 # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.active_border = rgba(3244a8aa) rgba(6f32a8aa) 45deg - #col.active_border - col.inactive_border = rgba(595959aa) + #col.active_border = rgba(3244a8aa) rgba(6f32a8aa) 45deg + #col.active_border = rgba(6f32a8aa) + #col.inactive_border = rgba(595959aa) # Set to true enable resizing windows by clicking and dragging on borders and gaps resize_on_border = false @@ -121,9 +126,9 @@ general { } group{ # col.border_active = rgb(ffffff) - col.border_active = rgba(3244a8aa) rgba(6f32a8aa) 45deg + #col.border_active = rgba(3244a8aa) rgba(6f32a8aa) 45deg #col.active_border - col.border_inactive = rgba(595959aa) + #col.border_inactive = rgba(595959aa) groupbar{ @@ -146,15 +151,15 @@ decoration { #col.shadow = rgba(1a1a1aee) shadow { enabled = true - range = 4 - render_power = 3 - color = rgba(1a1a1aee) + range = 20 + render_power = 4 + color = rgba(00052288) } # https://wiki.hyprland.org/Configuring/Variables/#blur blur { enabled = true size = 3 - passes = 1 + passes = 2 vibrancy = 0.1696 } @@ -168,12 +173,12 @@ animations { bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default + animation = windows, 1, 7, myBezier, slide + # animation = windowsOut, 1, 7, default, popin 80% + #animation = border, 1, 10, default + #animation = borderangle, 1, 8, default animation = fade, 1, 7, default - animation = workspaces, 1, 6, default + animation = workspaces, 1, 6, myBezier, slide } # Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ @@ -267,11 +272,12 @@ bind = $mainMod, M, exec, uwsm stop bind = $mainMod, E, exec, uwsm app -- $fileManager bind = $mainMod, V, togglefloating, bind = $mainMod, R, exec, uwsm app -- $menu -bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, P, exec, uwsm app -- hyprpicker -a +#bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle #bind = $mainMod, L, exec, hyprlock & sleep 1 ; systemctl suspend #bind = $mainMod, L, exec, hyprlock -bind = $mainMod, L, exec, uwsm app -- swaylock +bind = $mainMod, L, exec, uwsm app -- hyprlock # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r @@ -362,3 +368,14 @@ layerrule = blur, notifications layerrule = ignorealpha, notifications layerrule = blur, waybar layerrule = ignorealpha, waybar + + +opengl { + nvidia_anti_flicker = false +} + +#bind = $mainMod, S, togglespecialworkspace, magic +#bind = $mainMod, S, movetoworkspace, +0 +#bind = $mainMod, S, togglespecialworkspace, magic +#bind = $mainMod, S, movetoworkspace, special:magic +#bind = $mainMod, S, togglespecialworkspace, magic diff --git a/.config/okularrc b/.config/okularrc index 5269a1d..761f9a2 100644 --- a/.config/okularrc +++ b/.config/okularrc @@ -5,9 +5,6 @@ FullScreen=false LockSidebar=true ShowSidebar=true -[MainWindow] -ToolBarsMovable=Disabled - [Recent Files] File1[$e]=$HOME/Documents/Unity URP Intruduction.pdf File2[$e]=$HOME/Documents/The Unity Shaders Bible A linear shader explanation from beginner to advanced. Improve your game graphics with Unity and... (Fabrizio EspŠ½ndola, Pablo Yeber etc.) (Z-Library).pdf diff --git a/.config/uwsm/env b/.config/uwsm/env new file mode 100644 index 0000000..138c5da --- /dev/null +++ b/.config/uwsm/env @@ -0,0 +1,8 @@ +export XCURSOR_SIZE=24 +export XCURSOR_THEME=BreezeX-Black +export XCURSOR_PATH=$HOME/.icons +export QT_QPA_PLATFORMTHEME=qt6ct +export XDG_CURRENT_DESKTOP=Hyprland +export XDG_SESSION_TYPE=wayland +export XDG_SESSION_DESKTOP=Hyprland + diff --git a/.config/uwsm/env-hyprland b/.config/uwsm/env-hyprland new file mode 100644 index 0000000..ed233cb --- /dev/null +++ b/.config/uwsm/env-hyprland @@ -0,0 +1,9 @@ + +export LIBVA_DRIVER_NAME=nvidia +export GBM_BACKEND=nvidia +export DRI_PRIME=pci-0000_03_00_0 +export __VK_LAYER_NV_optimus=NVIDIA_only +export __GLX_VENDOR_LIBRARY_NAME=nvidia +export __NV_PRIME_RENDER_OFFLOAD=1 +export VDPAU_DRIVER=nvidia +export AQ_DRM_DEVICES=/dev/dri/card0:/dev/dri/card1