From 6f79b3b714747758c2ac99348516c94ac94cd7d2 Mon Sep 17 00:00:00 2001 From: Trianta <56975502+Trimutex@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:04:26 -0500 Subject: [PATCH] hyprland: update armory config with latest --- hypr/hyprland.conf | 112 +++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 71 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 8474dd2..6b7c588 100755 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -3,18 +3,8 @@ source = ~/.config/hypr/mocha.conf # Catppuccin colorscheme # < Start Section > # monitors -# nvidia -# Single -#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 -#monitor=DP-2, 1920x1080@120, 0x180, 1, vrr, 0 +monitor=DP-1, 3440x1440@160, 1920x0, 1, vrr, 1 +monitor=DP-2, 1920x1080@144, 0x180, 1, vrr, 1 # < End Section > @@ -30,19 +20,6 @@ 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 > @@ -62,9 +39,6 @@ exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' # xrandr settings 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 @@ -73,14 +47,14 @@ exec-once = syncthing --no-browser exec-once = xwaylandvideobridge # main applications -exec-once = discord -#exec-once = dopamine -exec-once = spotify --disable-gpu -exec-once = cool-retro-term +exec-once = vesktop --enable-features=UseOzonePlatform --ozone-platform=wayland +exec-once = spotify +exec-once = alacritty exec-once = firefox -#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 = taskset -c 1-7 steam + +# completion alert +exec-once = sleep 5 && pw-play --volume=2.0 ~/.alert/finished.mp3 # < End Section > @@ -91,14 +65,13 @@ exec-once = firefox # 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 = 2, monitor:DP-1, persistent:true, gapsout:70 597 54 597 workspace = 3, monitor:DP-1, persistent:true, gapsout:50 440 50 440 -workspace = 4, monitor:DP-1, persistent:true, gapsout:45 0 0 0 +workspace = 4, monitor:DP-1, persistent:true # Workspaces swapped for ease of use workspace = 6, monitor:DP-1, persistent:true -workspace = 5, monitor:DP-1, persistent:true +workspace = 5, monitor:DP-2, persistent:true # < End Section > @@ -109,10 +82,9 @@ workspace = 5, monitor:DP-1, persistent:true general { gaps_in = 0 - gaps_out = 8 - border_size = 3 + gaps_out = 4 + border_size = 4 col.active_border = $peach - #col.inactive_border = $peach layout = dwindle resize_on_border = false } @@ -152,12 +124,9 @@ animations { input { kb_layout = us - kb_options = caps:swapescape + kb_options = caps:escape follow_mouse = 2 - #follow_mouse = 3 mouse_refocus = false; - - sensitivity = -.75 # -1.0 - 1.0, 0 means no modification. force_no_accel = 1 } @@ -174,16 +143,13 @@ misc { force_default_wallpaper = 0 vrr = 1 vfr = true - no_direct_scanout = true + middle_click_paste = false } xwayland { - # latest configuration - # use_nearset_neighbor = true - # force_zero_scaling = true - # current configuration - use_nearest_neighbor = true - force_zero_scaling = false + enabled = true + use_nearest_neighbor = true + force_zero_scaling = false } cursor { @@ -195,16 +161,12 @@ cursor { debug { disable_logs = true - #disable_logs = false } -#device { -# name = opentabletdriver-virtual-tablet -# enabled = yes -#} - -experimental { - explicit_sync = true +render { + explicit_sync = 1 + explicit_sync_kms = 1 + direct_scanout = true } # < End Section > @@ -238,6 +200,8 @@ master { # window rules # core +windowrulev2 = suppressevent maximize, class:^(.*)$ +windowrulev2 = renderunfocused,class:^(.*)$ windowrulev2 = opacity 0.80 0.80,class:^(.*)$ windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$ windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$ @@ -248,31 +212,37 @@ windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ # main windowrulev2 = workspace 1 silent, class:^(discord)$ +windowrulev2 = workspace 1 silent, class:^(vesktop)$ windowrulev2 = workspace 1 silent, class:^(Dopamine)$ -windowrulev2 = workspace 1 silent, class:^(Spotify)$ -windowrulev2 = workspace 2 silent, class:^(cool-retro-term.cool-retro-term)$ +windowrulev2 = workspace 5 silent, initialTitle:^(Spotify Premium)$ +windowrulev2 = workspace 2 silent, class:^(Alacritty)$ windowrulev2 = workspace 3 silent, class:^(firefox)$ +windowrulev2 = workspace 3 silent, class:^(firefox-nightly)$ windowrulev2 = workspace 4 silent, class:^(steam)$ +windowrulev2 = workspace 4 silent, class:^(org.prismlauncher.PrismLauncher)$ windowrulev2 = workspace 4 silent, title:^(Minecraft.*)$ 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:^(steam)$ -windowrulev2 = workspace 6 silent, class:^(Bolt.*)$ +windowrulev2 = workspace 5 silent, class:^(Bolt.*)$ +windowrulev2 = workspace 6 silent, class:^(steam)$ # development -windowrulev2 = pseudo, title:^(SnakePlusPlus)$ +windowrulev2 = float, title:^(SnakePlusPlus)$ windowrulev2 = center, title:^(SnakePlusPlus)$ windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$ windowrulev2 = float, title:^(TetrisPlusPlus)$ windowrulev2 = center, title:^(TetrisPlusPlus)$ +windowrulev2 = workspace 4 silent, class:^(aquamarine)$ +windowrulev2 = fullscreen, class:^(aquamarine)$ # games # 16:9 windowed - 1920 1080 # 21:9 windowed - 2560 1080 # 32:9 windowed - 3200 900 # theoretical mix - 3200 1100 +# alternative - 2660 1140 # runelite windowrulev2 = opacity 1.00 override 1.00 override, class:^(net-runelite-client-RuneLite)$ windowrulev2 = pseudo, class:^(net-runelite-client-RuneLite)$ @@ -284,11 +254,9 @@ windowrulev2 = size 3200 1100, title:^(Minecraft.*)$ # native windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$ windowrulev2 = pseudo, class:^(steam_app_.*)$ -#windowrulev2 = size 3200 900, class:^(steam_app_.*)$ # proton windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$ windowrulev2 = pseudo, class:^(steam_proton)$ -#windowrulev2 = size 3200 900, class:^(steam_proton)$ # hl2 (css, etc) windowrulev2 = opacity 1.00 override 1.00 override, class:^(hl2_linux)$ # gamescope @@ -318,13 +286,15 @@ windowrulev2 = noblur,class:^(xwaylandvideobridge)$ $mainMod = SUPER # passthrough -bind = , mouse:275, pass, ^(discord)$ -bind = SHIFT, mouse:275, pass, ^(discord)$ +#bind = , mouse:275, pass, class:^(discord)$ +#bind = , mouse:275, sendshortcut, ALT, V, class:^(vesktop)$ +#bind = SHIFT, mouse:275, sendshortcut, ALT, V, class:^(vesktop)$ # core binds bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, M, exit bind = $mainMod, SPACE, togglefloating, +bind = $mainMod, C, centerwindow bind = $mainMod, F, fullscreen, bind = $mainMod SHIFT, L, exec, hyprlock bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar @@ -332,7 +302,7 @@ bind = $mainMod SHIFT, J, togglesplit, # dwindle bind = $mainMod SHIFT, SPACE, pseudo, # dwindle # main application shortcuts -bind = $mainMod, RETURN, exec, cool-retro-term +bind = $mainMod, RETURN, exec, alacritty 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