diff --git a/.bin/.e b/.bin/.e index f6c7a6b..5bb2414 100755 --- a/.bin/.e +++ b/.bin/.e @@ -23,6 +23,7 @@ declare -A mapper=( ["sxhkd"]="$HOME/.config/sxhkd/sxhkdrc" ["vim"]="$HOME/.config/vim/vimrc" ["wakatime"]="$HOME/.config/wakatime/.wakatime.cfg.tpl" + ["waybar"]="$HOME/.config/waybar/" ["xprofile"]="$HOME/.xprofile" ["zsh"]="$HOME/.config/zsh/.zshrc" ) diff --git a/.bin/autostart-manage b/.bin/autostart-manage index 9bbfe62..819a4d0 100755 --- a/.bin/autostart-manage +++ b/.bin/autostart-manage @@ -90,9 +90,9 @@ _autostart_run_graphical () { start-audio pipewire wait-for-service "network-online.target" - if ! pgrep -x keepassxc + if ! pgrep keepassxc >/dev/null then - if pass + if pass x then (pass keepass | head -n 1 | keepassxc --pw-stdin ~/sync/passwords.kdbx) & fi diff --git a/.config/hypr/base.conf b/.config/hypr/base.conf index 25362a4..e54fe89 100644 --- a/.config/hypr/base.conf +++ b/.config/hypr/base.conf @@ -49,22 +49,20 @@ decoration { blur = yes blur_size = 3 blur_passes = 1 - blur_new_optimizations = on + blur_new_optimizations = true } animations { - enabled = yes + enabled = true # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + bezier = overshot, 0.05, 0.9, 0.1, 1.1 - animation = windows, 1, 7, myBezier - 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 = windows, 1, 3, overshot, slide + animation = fade, 1, 6, default + animation = border, 1, 6, default + animation = workspaces, 1, 6, overshot, slide } dwindle { diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index b708af3..8879e9e 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -9,6 +9,7 @@ bind = $mainMod, V, togglefloating, bind = $mainMod, D, exec, j4-dmenu-desktop --dmenu="$DMENU" bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, Pause, exec, menu-shutdown bind = $mainMod SHIFT, R, exec, autostart-manage run-wayland diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf index b49afdd..6b2a466 100644 --- a/.config/hypr/rules.conf +++ b/.config/hypr/rules.conf @@ -1,19 +1,19 @@ ### Workspace rules -windowrulev2 = workspace $ws_web,class:(qutebrowser) -windowrulev2 = workspace $ws_web,class:(firefox) +windowrulev2 = workspace $ws_web silent, class:(qutebrowser) +windowrulev2 = workspace $ws_web, class:(firefox) -windowrulev2 = workspace $ws_focus,class:^(jetbrains-) +windowrulev2 = workspace $ws_focus, class:^(jetbrains-) -windowrulev2 = workspace $ws_media,class:(Chromium) -windowrulev2 = workspace $ws_media,class:(FreeTube) +windowrulev2 = workspace $ws_media, class:(Chromium) +windowrulev2 = workspace $ws_media, class:(FreeTube) -windowrulev2 = workspace $ws_voip,class:(discord) -windowrulev2 = workspace $ws_voip,class:(Element) -windowrulev2 = workspace $ws_voip,class:(TeamSpeak 3) +windowrulev2 = workspace $ws_voip silent, class:(discord) +windowrulev2 = workspace $ws_voip silent, class:(Element) +windowrulev2 = workspace $ws_voip silent, class:(TeamSpeak 3) -windowrulev2 = workspace $ws_msg,class:(thunderbird) -windowrulev2 = workspace $ws_msg,class:(Signal) +windowrulev2 = workspace $ws_msg silent, class:(thunderbird) +windowrulev2 = workspace $ws_msg silent, class:(Signal) ### Specific rules @@ -21,4 +21,4 @@ windowrulev2 = workspace $ws_msg,class:(Signal) #windowrulev2 = workspace $ws_steam silent,class:(steam) # Moves menues too :/ #windowrulev2 = noinitialfocus,class:(steam) # No focus on menues :/ -windowrulev2 = fullscreen,class:(FreeTube) +windowrulev2 = fullscreen, class:(FreeTube) diff --git a/.config/waybar/config b/.config/waybar/config index cf7b277..93ee91a 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -2,7 +2,7 @@ "layer": "top", "position": "bottom", "height": 24, - "spacing": 4, + "spacing": 6, "modules-left": [ "wlr/workspaces" ], @@ -10,11 +10,10 @@ ], "modules-right": [ "network", - "cpu", "temperature", + "cpu", "memory", "custom/pacman", - "idle_inhibitor", "custom/weather", "clock", "tray" @@ -57,9 +56,22 @@ "max-length": 128 }, "clock": { - "format": "{:%Y-%m-%d %H:%M:%S}", + "interval": 1, + "format": " {:%Y-%m-%d %H:%M:%S}", "tooltip-format": "{:%Y %B}\n{calendar}" }, + "cpu": { + "format": " {usage}%" + }, + "memory": { + "format": " {percentage}%" + }, + "network": { + "format": " {ipaddr}" + }, + "temperature": { + "format": " {temperatureC}°C" + }, "tray": { "spacing": 4 }, diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 0d17fdc..19cda04 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,36 +1,58 @@ @import url("./colors.css"); + * { border: none; - border-radius: 0; - font-family: Iosevka; - font-size: 11pt; + border-radius: 0; + + font-family: "JetBrains Mono", monospace; + font-size: 10pt; min-height: 0; } + window#waybar { - opacity: 1; background: @background-darker; color: @foreground; - border-bottom: 2px solid @background; } + + +#clock { + border-bottom: solid 2px @yellow; +} + +#cpu { + border-bottom: solid 2px @purple; +} + +#memory { + border-bottom: solid 2px @pink; +} + +#network { + border-bottom: solid 2px @green; +} + +#temperature { + border-bottom: solid 2px @red; +} + #workspaces button { - padding: 0 10px; - background: @background; - color: @foreground; + background: none; + border-bottom: solid 2px @background; } #workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; - background-image: linear-gradient(0deg, @selection, @background-darker); + border-bottom: solid 2px @selection; } #workspaces button.active, #workspaces button.focused, #workspaces button.visible { - background-image: linear-gradient(0deg, @purple, @selection); + border-bottom: solid 2px @purple; } -#taskbar button.active { - background-image: linear-gradient(0deg, @pruple, @background-darker); + + +#custom-weather { + border-bottom: solid 2px @green; } -#clock { - padding: 0 4px; - background: @background; + +#custom-pacman { + border-bottom: solid 2px @cyan; }