From 5d1cf93b46f0bdba2fcb266d8d069b3c7f8f0d66 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Tue, 17 Sep 2024 18:37:32 +0800 Subject: improvements, waybar, hyprlock --- dot-config/hypr/autostart.conf | 2 +- dot-config/hypr/binds.conf | 25 +++---------------------- dot-config/hypr/hyprlock.conf | 4 ++-- dot-config/hypr/rules.conf | 15 ++++++++------- dot-config/waybar/modules.jsonc | 5 +++-- dot-zshrc | 2 +- 6 files changed, 18 insertions(+), 35 deletions(-) diff --git a/dot-config/hypr/autostart.conf b/dot-config/hypr/autostart.conf index 9359603a..b2c4f677 100644 --- a/dot-config/hypr/autostart.conf +++ b/dot-config/hypr/autostart.conf @@ -20,7 +20,7 @@ exec-once = pyprland # Waybar exec-once = waybar # Hypr-Eco -exec-once = hyprpaper +# exec-once = hyprpaper exec-once = $SCRIPTSDIR/hyprpaper.sh exec-once = hypridle diff --git a/dot-config/hypr/binds.conf b/dot-config/hypr/binds.conf index 7bd81fd7..99bdaf34 100644 --- a/dot-config/hypr/binds.conf +++ b/dot-config/hypr/binds.conf @@ -80,7 +80,7 @@ bind = $mainMod, q, killactive bind = $mainMod shift, q, exec, kill -9 $(hyprctl activewindow | grep pid | tail -1 | awk '{print$2}') bind = ctrl alt, escape, exec, hyprctl kill bind = ctrl $mainMod shift, r, exec, systemctl restart $sessionManager -bind = ctrl $mainMod, escape, exec, killall waybar; waybar +bind = ctrl $mainMod, escape, exec, killall -SIGUSR2 waybar # bind = ctrl, up, hyprexpo:expo, on # bind = ctrl, down, hyprexpo:expo, off # bind = ctrl, up, overview:open @@ -89,27 +89,8 @@ bind = ctrl $mainMod, escape, exec, killall waybar; waybar # bind = alt, grave, exec, hyprswitch gui --reverse # bindr = alt, tab, exec, hyprswitch close # bindr = alt, grave, exec, hyprswitch close -# allows repeated switching with same keypress that starts the submap -binde = alt, tab, exec, hyprswitch gui --do-initial-execute -bind = alt, tab, submap, switch - -# allows repeated switching with same keypress that starts the submap -binde = alt grave, tab, exec, hyprswitch gui --do-initial-execute -r -bind = alt grave, tab, submap, switch - -submap = switch -# allow repeated window switching in submap (same keys as repeating while starting) -binde = alt, tab, exec, hyprswitch gui -binde = alt grave, tab, exec, hyprswitch gui -r - -# exit submap and stop hyprswitch -bindrt = alt, tab, exec, hyprswitch close -bindrt = alt, tab, submap, reset - -# if it somehow doesn't close on releasing $switch_release, escape can kill (doesnt switch) -bindr = ,escape, exec, hyprswitch close --kill -bindr = ,escape, submap, reset -submap = reset +bind = alt, tab, exec, /home/system/.cargo/bin/hyprswitch gui --mod-key alt_l --key tab --close mod-key-release && hyprswitch dispatch +bind = alt shift, tab, exec, /home/system/.cargo/bin/hyprswitch gui --mod-key alt_l --key tab --close mod-key-release && hyprswitch dispatch -r # restart bar bind = ctrl alt, left, workspace, -1 diff --git a/dot-config/hypr/hyprlock.conf b/dot-config/hypr/hyprlock.conf index 6331a748..b11295c6 100644 --- a/dot-config/hypr/hyprlock.conf +++ b/dot-config/hypr/hyprlock.conf @@ -4,7 +4,7 @@ general { background { monitor = - path = ~/.cache/cwall.png + path = ~/.cache/bg.png # only png supported for now color = rgba(25, 20, 20, 1.0) @@ -39,7 +39,7 @@ input-field { capslock_color = -1 numlock_color = -1 bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) - invert_numlock = false # change color if numlock is off + invert_numlock = true # change color if numlock is off swap_font_color = false # see below position = 0, -468 halign = center diff --git a/dot-config/hypr/rules.conf b/dot-config/hypr/rules.conf index 0d57a0b4..7715bea0 100644 --- a/dot-config/hypr/rules.conf +++ b/dot-config/hypr/rules.conf @@ -17,7 +17,7 @@ windowrulev2 = workspace 2, class:($browser|Brave-browser|chromium|firefox) windowrulev2 = workspace 3, class:($fileManager|Pcmanfm|Thunar|qBittorrent|Caja) # Code editors on workspace 4 -windowrulev2 = workspace 4, class:(Geany|code|code-url-handler|cursor-url-handler|code-oss|Code - OSS|install4j-burp-StartBurp|burp-StartBurp|Unity|jetbrains-pycharm-ce) +windowrulev2 = workspace 4, class:(Geany|code|code-url-handler|cursor-url-handler|code-oss|Code - OSS|install4j-burp-StartBurp|burp-StartBurp|Unity|jetbrains-pycharm-ce|Postman) # Office applications on workspace 5 windowrulev2 = workspace 5, class:(Gucharmap|Atril|Evince|libreoffice-writer|libreoffice-calc|libreoffice-impress|libreoffice|Soffice|Typora|obsidian|figma-linux|anytype|craft-nativefier-e0958b) @@ -56,7 +56,7 @@ windowrulev2 = opacity 0.85 0.75, class:(thorium-app.shortwave.com__-Default|tho windowrulev2 = pin, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) windowrulev2 = size 53% 60%, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) # custom animation windowrulev2 = move 46.5% 5%, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) -windowrulev2 = animation slide right top, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper) +windowrulev2 = animation slide right top, class:(thorium-app.shortwave.com__-Default|thorium-mdpkiolbdkhdjpekfbkbmhigcaggjagi-Profile_1|thorium-lnachpgegbbmnnlgpokibfjlmppeciah-Default|Beeper|blobdrop) # bitwarden chrome extension popup windowrulev2 = pin, class:(thorium-nngceckbapebfimnlniiiahkandclblb-Default) @@ -184,11 +184,12 @@ windowrulev2 = maxsize 1 1, class:^(xwaylandvideobridge)$ windowrulev2 = noblur, class:^(xwaylandvideobridge)$ # Tearing -windowrule=immediate,.*\.exe -windowrulev2=immediate,class:(steam_app) -windowrulev2=immediate,class:(Minecraft*) -windowrulev2=immediate,class:(genshinimpact.exe) -windowrulev2=immediate,class:(Lunar Client*) +windowrule = immediate,.*\.exe +windowrulev2 = immediate,class:(steam_app) +windowrulev2 = immediate,class:(Minecraft.*) +windowrulev2 = immediate,class:(genshinimpact.exe) +windowrulev2 = immediate,class:(Lunar Client.*) +windowrulev2 = immediate,class:(lunarclient) windowrulev2 = plugin:chromakey,fullscreen:0 plugin:chromakey_background = rgb(07121b) diff --git a/dot-config/waybar/modules.jsonc b/dot-config/waybar/modules.jsonc index 4962c70d..b2c7df9a 100644 --- a/dot-config/waybar/modules.jsonc +++ b/dot-config/waybar/modules.jsonc @@ -76,11 +76,12 @@ }, "network": { - "format-wifi": "󰤨  {bandwidthDownBytes}  {bandwidthUpBytes}", - "format-ethernet": " {ifname}: Aesthetic", + "format-wifi": "{icon}  {bandwidthDownBytes}  {bandwidthUpBytes}", + "format-ethernet": " {ifname}: Ethernet", "format-linked": " {ifname} (No IP)", "format-disconnected": "󰤭", "format-alt": " {ifname}: {ipaddr}/{cidr}", + "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"], "tooltip-format": "Strength: {signalStrength}%", // "on-click-right": "nm-connection-editor", "on-click-right": "nmd", diff --git a/dot-zshrc b/dot-zshrc index 3d889468..34cbc066 100644 --- a/dot-zshrc +++ b/dot-zshrc @@ -25,7 +25,7 @@ source $HOME/.config/zsh/plugins-customization.zsh source $HOME/.config/zsh/aliases.zsh # utilitys -source $HOME/.config/zsh/utility.zsh +source $HOME/.config/zsh/func.zsh # options source $HOME/.config/zsh/options.zsh -- cgit v1.2.3