From f506dd42dceb32ccd7893328e1de282f20425a83 Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Wed, 21 Dec 2022 23:34:28 +0100 Subject: [PATCH] more comfy in hyprland --- .config/hypr/hyprland.conf | 80 ++++++++++++++++++++++----------- .config/kitty/kitty.conf | 6 +-- .config/wal/templates/mako.conf | 13 +++--- .config/waybar/style.css | 29 ++++++------ 4 files changed, 78 insertions(+), 50 deletions(-) diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 0e263e0..925d0e2 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -2,10 +2,17 @@ $scr_left=DP-2 $scr_right=DP-3 $Mod = SUPER $launcher = rofi -show drun +$record = wf-recorder -g "$(slurp)" -f ~/screenshots/mov-$(date +"%Y-%m-%d--%H-%M-%S.mp4") +$bar = waybar -c ~/.config/waybar/hypr-config +$wallpaper = swaybg -m fill -i ~/.cache/wallpaper.jpeg +$term = kitty -exec-once = waybar -c ~/.config/waybar/hypr-config -exec-once = swaybg -i ~/.cache/wallpaper.jpeg -exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = $bar +exec-once = $wallpaper +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = udiskie +exec-once = /usr/lib/kdeconnectd +exec-once = ~/.config/mako/launch.sh monitor=$scr_left,3840x2160,0x0,1.5 monitor=$scr_right,1920x1080@144,2560x0,1 @@ -30,6 +37,7 @@ general { col.active_border = $color4 $color0 $color4 45deg col.inactive_border = $color0 no_border_on_floating = true + no_cursor_warps = true layout = dwindle } @@ -44,6 +52,7 @@ decoration { drop_shadow = false } blurls=waybar +#blurls=notifications # https://wiki.hyprland.org/Configuring/Animations/ animations { @@ -69,8 +78,7 @@ dwindle { misc { no_vfr = false - enable_swallow = true - swallow_regex = urxvt + focus_on_activate = false disable_hyprland_logo = true disable_splash_rendering = true } @@ -81,9 +89,10 @@ windowrule = idleinhibit fullscreen, firefox windowrule = float, imv windowrule = workspace 3, discord windowrule = opacity 0.9 0.9, discord -windowrule = workspace 4, steam +windowrule = workspace 4, Steam windowrule = noborder, ulauncher -windowrule = float, rofi +windowrule = float, Rofi +windowrule = center, Rofi wsbind=1,$scr_left wsbind=2,$scr_left @@ -95,25 +104,40 @@ wsbind=10,$scr_right # Application Bindings -bind = $Mod, Return, exec, kitty +bind = $Mod, Return, exec, $term +bind = $Mod, A, exec, $term -e cava +bind = $Mod SHIFT, A, exec, $term -e pulsemixer bind = $Mod, D, exec, $launcher -bind = $Mod SHIFT, D, exec, discord +bind = $Mod SHIFT, D, exec, discord --enable-gpu-rasterization bind = $Mod CTRL, D, exec, dolphin bind = $Mod SHIFT, E, exec, steam -bind = $Mod, E, exec, kitty -e ranger -bind = $Mod, I, exec, kitty -e btop +bind = $Mod, E, exec, $term -e ranger +bind = $Mod, I, exec, $term -e btop +bind = $Mod, M, exec, spotify +bind = $Mod, P, exec, pass clip -r +bind = $Mod SHIFT, T, exec, teams bind = $Mod SHIFT, W, exec, firefox +# Spotify control +bind = $Mod ALT, L, exec, dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next +bind = $Mod ALT, H, exec, dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous +bind = $Mod CTRL, Space, exec, dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause +bind = $Mod ALT, Space, exec, dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause + # Control bindings -bind = $Mod, P, pseudo, -bind = $Mod, O, togglesplit, +bind = $Mod, V, togglesplit, +bind = $Mod SHIFT, V, togglegroup, bind = $Mod, F, fullscreen, bind = $Mod, Space, togglefloating, bind = $Mod, Q, killactive, bind = $Mod SHIFT, Backspace, exit, +bind = $Mod, O, exec, ~/.scripts/wallpaper; $bar +bind = $Mod SHIFT, O, exec, ~/.scripts/wallpaper-upload + bind = , Print, exec, grim -g "$(slurp)" - | wl-copy -bind = CTRL, Print, exec, grim -g "$(slurp)" ~/screenshot.png +bind = CTRL, Print, exec, grim -g "$(slurp)" ~/screenshot.png && notify-send -i ~/screenshot.png "Screenshot saved" +bindr = SHIFT, Print, exec, killall -s SIGINT wf-recorder || $record bind = $Mod, h, movefocus, l bind = $Mod, l, movefocus, r @@ -128,7 +152,9 @@ binde = $Mod CTRL, h, resizeactive, -20 0 binde = $Mod CTRL, l, resizeactive, 20 0 binde = $Mod CTRL, k, resizeactive, 0 -20 binde = $Mod CTRL, j, resizeactive, 0 20 -bind = $Mod, C, splitratio, 0.5 + +bind = $Mod CTRL SHIFT, h, movecurrentworkspacetomonitor, $scr_left +bind = $Mod CTRL SHIFT, l, movecurrentworkspacetomonitor, $scr_right bind = $Mod, 1, workspace, 1 bind = $Mod, 2, workspace, 2 @@ -141,16 +167,20 @@ bind = $Mod, 8, workspace, 8 bind = $Mod, 9, workspace, 9 bind = $Mod, 0, workspace, 10 -bind = $Mod SHIFT, 1, movetoworkspace, 1 -bind = $Mod SHIFT, 2, movetoworkspace, 2 -bind = $Mod SHIFT, 3, movetoworkspace, 3 -bind = $Mod SHIFT, 4, movetoworkspace, 4 -bind = $Mod SHIFT, 5, movetoworkspace, 5 -bind = $Mod SHIFT, 6, movetoworkspace, 6 -bind = $Mod SHIFT, 7, movetoworkspace, 7 -bind = $Mod SHIFT, 8, movetoworkspace, 8 -bind = $Mod SHIFT, 9, movetoworkspace, 9 -bind = $Mod SHIFT, 0, movetoworkspace, 10 +bind = $Mod SHIFT, 1, movetoworkspacesilent, 1 +bind = $Mod SHIFT, 2, movetoworkspacesilent, 2 +bind = $Mod SHIFT, 3, movetoworkspacesilent, 3 +bind = $Mod SHIFT, 4, movetoworkspacesilent, 4 +bind = $Mod SHIFT, 5, movetoworkspacesilent, 5 +bind = $Mod SHIFT, 6, movetoworkspacesilent, 6 +bind = $Mod SHIFT, 7, movetoworkspacesilent, 7 +bind = $Mod SHIFT, 8, movetoworkspacesilent, 8 +bind = $Mod SHIFT, 9, movetoworkspacesilent, 9 +bind = $Mod SHIFT, 0, movetoworkspacesilent, 10 + + +bind = $Mod, minus, togglespecialworkspace +bind = $Mod SHIFT, minus, movetoworkspace, special bindm = $Mod, mouse:272, movewindow #LMB bindm = $Mod, mouse:273, resizewindow #RMB diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index f154037..49acaef 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -2,9 +2,9 @@ #: Fonts {{{ -font_family Fira Mono Medium for Powerline -bold_font Fira Mono Bold for Powerline -font_size 10.0 +font_family Source Code Pro +bold_font Source Code Pro Black +font_size 11.0 disable_ligatures cursor #: }}} diff --git a/.config/wal/templates/mako.conf b/.config/wal/templates/mako.conf index 0683c2d..b8a222e 100644 --- a/.config/wal/templates/mako.conf +++ b/.config/wal/templates/mako.conf @@ -1,18 +1,18 @@ max-visible=-1 sort=-time -output="DP-1" +output="DP-2" layer=overlay -anchor=bottom-center +anchor=top-right font=Source Code Pro 12 -background-color={background}D9 +background-color={background}90 text-color={foreground} width=300 height=150 -margin=5 +margin=20,20,0 padding=15 border-size=2 border-color={color2} -border-radius=0 +border-radius=10 progress-color=over {color5} icons=1 max-icon-size=64 @@ -23,6 +23,3 @@ default-timeout=6000 ignore-timeout=1 group-by=none invisible=0 - -[app-name=lightcord] -border-color={color4} diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 6a430a8..6c9fac2 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -3,9 +3,9 @@ * { border: none; border-radius: 0; - font-family: 'JetBrainsMono Nerd Font Mono'; + font-family: 'Source Code Pro'; font-weight: bold; - font-size: 16px; + font-size: 18px; min-height: 0; } @@ -14,8 +14,10 @@ window { } window#waybar { - background-color: alpha(@background, 0.7); + background-color: alpha(@background, 0.5); color: @foreground; + background: transparent; + } window#waybar.hidden { @@ -26,12 +28,19 @@ window#waybar.kitty { background-color: #3F3F3F; } +#window { + padding: 0 15px 0 5px; + background-color: alpha(@color2, 0.3); + border-radius: 0 0 10px 0; +} + #workspaces button { - padding: 5px; + padding: 2px 5px 3px 5px; margin: 0 3px; font-weight:bold; background-color: alpha(@background, 0.5); - color: alpha(@foreground, 0.5); + color: alpha(@foreground, 1.0); + border-radius: 0 0 15px 15px; } /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ @@ -40,7 +49,7 @@ window#waybar.kitty { box-shadow: inherit; } -#workspaces button.focused { +#workspaces button.focused, #workspaces button.active { background-color: @color4; color: @foreground; } @@ -67,12 +76,4 @@ window#waybar.kitty { padding: 0 10px; margin: 0 5px; color: @foreground; - text-shadow: 1px 1px 2px @background; -} - -@keyframes blink { - to { - background-color: #ffffff; - color: #000000; - } }