From 8099e507d7effd90a68cbbd3b808c65d76b503d6 Mon Sep 17 00:00:00 2001 From: Trianta <56975502+Trimutex@users.noreply.github.com> Date: Tue, 19 Nov 2024 00:36:14 -0600 Subject: [PATCH] armory: update dotfiles --- hypr/hyprland.conf | 36 ++++++++++++++++++++++-------------- hypr/scripts/xrandr.sh | 8 ++++++-- waybar/config | 14 ++++++++++---- waybar/style.css | 11 +++++++++-- 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index ed60681..b0dbfd2 100755 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -4,8 +4,8 @@ source = ~/.config/hypr/mocha.conf # Catppuccin colorscheme # monitors #monitor=HDMI-A-4, disabled -monitor = HDMI-A-4, 3840x2160@60, 0x0, 1.6, bitdepth, 8 -monitor = DP-1, 3440x1440@160, auto-right, 1, vrr, 1, bitdepth, 8 +monitor = HDMI-A-4, 3840x2160@60, 0x0, 2, bitdepth, 8 +monitor = DP-1, 3440x1440@160, 1920x0, 1, vrr, 1, bitdepth, 8 # < End Section > @@ -14,12 +14,16 @@ monitor = DP-1, 3440x1440@160, auto-right, 1, vrr, 1, bitdepth, 8 # < Start Section > # environment variables -env = xdg_current_desktop,hyprland +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 +env = QT_AUTO_SCREEN_SCALE_FACTOR,1 +env = QT_QPA_PLATFORM,wayland;xcb +env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 +env = QT_QPA_PLATFORMTHEME,qt5ct # < End Section > @@ -48,6 +52,7 @@ exec-once = syncthing --no-browser exec-once = xwaylandvideobridge # main applications +exec-once = thunderbird exec-once = vesktop --enable-features=UseOzonePlatform --ozone-platform=wayland exec-once = spotify exec-once = alacritty @@ -74,6 +79,7 @@ workspace = 4, monitor:DP-1, persistent:true # Workspaces swapped for ease of use workspace = 6, monitor:DP-1, persistent:true workspace = 5, monitor:HDMI-A-4, persistent:true +workspace = 5, layoutopt:orientation:right # < End Section > @@ -86,15 +92,17 @@ general { gaps_in = 0 gaps_out = 4 border_size = 2 - col.active_border = $surface1 - col.inactive_border = $surface1 + col.active_border = 0x000000 + col.inactive_border = 0x000000 layout = master resize_on_border = false } decoration { - rounding = 12 - drop_shadow = false + rounding = 0 + shadow { + enabled = false + } dim_special = 0.3 fullscreen_opacity = 1.0 @@ -147,6 +155,7 @@ misc { vrr = 1 vfr = true middle_click_paste = false + render_unfocused_fps = 15 } xwayland { @@ -156,7 +165,6 @@ xwayland { } cursor { - no_hardware_cursors = true inactive_timeout = 2 no_warps = false default_monitor = DP-1 @@ -167,8 +175,8 @@ debug { } render { - explicit_sync = 2 - explicit_sync_kms = 2 + explicit_sync = 1 + explicit_sync_kms = 1 direct_scanout = false } @@ -191,9 +199,9 @@ master { # window rules # core -workspace = w[t1], gapsout:0, border: 0, rounding:0 +workspace = w[t1], gapsout:0, border:0, rounding:0 windowrulev2 = suppressevent maximize, class:^(.*)$ -#windowrulev2 = renderunfocused,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)$ @@ -206,7 +214,7 @@ windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ windowrulev2 = workspace 1 silent, class:^(discord)$ windowrulev2 = workspace 1 silent, class:^(vesktop)$ windowrulev2 = workspace 1 silent, class:^(Dopamine)$ -windowrulev2 = workspace 1 silent, initialTitle:^(Spotify Premium)$ +windowrulev2 = workspace 5 silent, class:^(spotify)$ windowrulev2 = workspace 2 silent, class:^(Alacritty)$ windowrulev2 = float, class:^(Alacritty)$ windowrulev2 = size 1920 1080, class:^(Alacritty)$ @@ -293,7 +301,7 @@ 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 +bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar -c ~/.config/waybar/config # toggle waybar # main application shortcuts bind = $mainMod, RETURN, exec, alacritty diff --git a/hypr/scripts/xrandr.sh b/hypr/scripts/xrandr.sh index 0ac2b61..16dcbca 100755 --- a/hypr/scripts/xrandr.sh +++ b/hypr/scripts/xrandr.sh @@ -1,10 +1,10 @@ #!/bin/bash -# Custom resolution through xrandr +# Custom resolution through xrandr (21:9) xrandr --newmode "2560x1080" 677.75 2560 2784 3064 3568 1080 1083 1093 1188 -hsync +vsync xrandr --addmode DP-1 2560x1080 -# 3200x900 suggestion +# 3200x900 suggestion (32:9) xrandr --newmode "3200x900" 704.50 3200 3472 3824 4448 900 903 913 991 -hsync +vsync xrandr --addmode DP-1 3200x900 @@ -12,4 +12,8 @@ xrandr --addmode DP-1 3200x900 xrandr --newmode "3200x1100" 863.75 3200 3480 3832 4464 1100 1103 1113 1210 -hsync +vsync xrandr --addmode DP-1 3200x1100 +# 3200x1100 suggestion (21:9) +xrandr --newmode "2100x900" 462.50 2100 2280 2512 2920 900 903 913 991 -hsync +vsync +xrandr --addmode DP-1 2100x900 + sleep 2 && xrandr --output DP-1 --primary # Set primary monitor for xwayland diff --git a/waybar/config b/waybar/config index 7c7e7a4..de82045 100755 --- a/waybar/config +++ b/waybar/config @@ -3,19 +3,21 @@ "name": "main", "layer": "bottom", "position": "top", - "height": 28, + "height": 40, "spacing": 0, "output": "DP-1", "reload_style_on_change": true, "modules-left": [ - "hyprland/workspaces", + "custom/appmenu", "disk", "memory", "cpu", "custom/gpu", "temperature" ], - "modules-center": [], + "modules-center": [ + "hyprland/workspaces" + ], "modules-right": [ "tray", "wireplumber", @@ -99,6 +101,10 @@ "icon-size": 21, "spacing": 10 }, + "custom/appmenu": { + "format": "", + "on-click": "pkill -x rofi || rofi -show drun" + }, "custom/gpu": { "format": "󰔂 {}%", "interval": 5, @@ -108,7 +114,7 @@ "custom/poweroff": { "tooltip": false, "format": " ", - "on-click": "bash $HOME/.config/waybar/scripts/poweroff.sh" + "on-click": "pgrep poweroff.sh || $HOME/.config/waybar/scripts/poweroff.sh" }, } ] diff --git a/waybar/style.css b/waybar/style.css index fc51a76..8e7f93b 100755 --- a/waybar/style.css +++ b/waybar/style.css @@ -5,7 +5,7 @@ border-radius: 0px; min-height: 0; font-weight: bold; - font-size: 12px; + font-size: 14px; font-family: "Hack Nerd Font"; } @@ -19,7 +19,7 @@ window#waybar { color: @peach; border-radius: 8px; margin: 4px 2px; - padding: 0px 2px; + padding: 0px 8px; transition: all 0.4s ease; } @@ -52,6 +52,7 @@ window#waybar { #wireplumber, #workspaces, #network, +#custom-appmenu, #custom-gpu, #custom-poweroff, #custom-weather { @@ -69,6 +70,12 @@ window#waybar { padding: 0px; } +#custom-appmenu, +#workspaces label, +#network { + font-size: 18px; +} + #clock { min-width: 80px;