From 9728c1c97f92e4172ef59efd328723dd1653ffe9 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Wed, 20 Sep 2023 08:33:16 +0200 Subject: Improve hyprland configs --- .config/hypr/hyprland.conf | 53 +++++++++++--------- .config/waybar/config-hyprland-bot.json | 24 --------- .config/waybar/config-hyprland-top.json | 89 --------------------------------- .config/waybar/config-hyprland.json | 24 +++++++++ .config/waybar/config.json | 89 +++++++++++++++++++++++++++++++++ 5 files changed, 143 insertions(+), 136 deletions(-) delete mode 100644 .config/waybar/config-hyprland-bot.json delete mode 100644 .config/waybar/config-hyprland-top.json create mode 100644 .config/waybar/config-hyprland.json create mode 100644 .config/waybar/config.json diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index fada0f1..d484720 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,10 +1,12 @@ monitor=,preferred,auto,1 -exec-once=waybar -c ~/.config/waybar/config-hyprland-top.json -exec-once=waybar -c ~/.config/waybar/config-hyprland-bot.json exec-once=dunst +exec-once=keepassx +exec-once=ntfy sub --from-config +exec-once=swaybg -i "$(find ~/pictures/wallpapers/1920x1080 | shuf -n 1)" exec-once=swayidle -# TODO: Wallpaper +exec-once=waybar -c ~/.config/waybar/config-hyprland.json +exec-once=waybar -c ~/.config/waybar/config.json # TODO: polkit agent # TODO: PipeWire @@ -32,8 +34,8 @@ general { gaps_in=4 gaps_out=8 border_size=2 - col.active_border=0x663381da - col.inactive_border=0x66cccccc + col.active_border=0xff3381da + col.inactive_border=0xff333333 apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) @@ -64,15 +66,6 @@ gestures { workspace_swipe=no } -# example window rules -# for windows named/classed as abc and xyz -#windowrule=move 69 420,abc -#windowrule=size 420 69,abc -#windowrule=tile,xyz -#windowrule=float,abc -#windowrule=pseudo,abc -#windowrule=monitor 0,xyz - # Keybinds bind=SUPER,RETURN,exec,alacritty bind=SUPER,X,killactive, @@ -80,8 +73,18 @@ bind=SUPER_SHIFT,X,exit, bind=SUPER,E,exec,fuzzel bind=SUPER_SHIFT,S,exec,loginctl lock-session +bindl=,XF86AudioMute,exec,vol toggle +bindel=,XF86AudioRaiseVolume,exec,sh -c "vol inc 5" +bindel=,XF86AudioLowerVolume,exec,vol dec 5 +binde=,XF86MonBrightnessUp,exec,bl inc 5 +binde=,XF86MonBrightnessDown,exec,bl dec 5 +#bind=,Print,exec, +#bind=,XF86AudioMicMute,exec, + bind=SUPER,J,layoutmsg,cyclenext bind=SUPER,K,layoutmsg,cycleprev +bind=SUPER,H,splitratio,-0.05 +bind=SUPER,L,splitratio,+0.05 bind=SUPER_SHIFT,RETURN,layoutmsg,swapwithmaster bind=SUPER_SHIFT,J,layoutmsg,swapnext bind=SUPER_SHIFT,K,layoutmsg,swapprev @@ -89,6 +92,7 @@ bind=SUPER_SHIFT,H,layoutmsg,addmaster bind=SUPER_SHIFT,L,layoutmsg,removemaster bind=SUPER,SPACE,layoutmsg,orientationnext bind=SUPER_SHIFT,SPACE,layoutmsg,orientationprev +bind=SUPER,M,fullscreen,1 bind=SUPER,2,workspace,1 bind=SUPER,3,workspace,2 @@ -100,15 +104,18 @@ bind=SUPER,8,workspace,7 bind=SUPER,9,workspace,8 bind=SUPER,0,workspace,9 -bind=SUPER_SHIFT,2,movetoworkspace,1 -bind=SUPER_SHIFT,3,movetoworkspace,2 -bind=SUPER_SHIFT,4,movetoworkspace,3 -bind=SUPER_SHIFT,5,movetoworkspace,4 -bind=SUPER_SHIFT,6,movetoworkspace,5 -bind=SUPER_SHIFT,7,movetoworkspace,6 -bind=SUPER_SHIFT,8,movetoworkspace,7 -bind=SUPER_SHIFT,9,movetoworkspace,8 -bind=SUPER_SHIFT,0,movetoworkspace,9 +bind=SUPER_SHIFT,2,movetoworkspacesilent,1 +bind=SUPER_SHIFT,3,movetoworkspacesilent,2 +bind=SUPER_SHIFT,4,movetoworkspacesilent,3 +bind=SUPER_SHIFT,5,movetoworkspacesilent,4 +bind=SUPER_SHIFT,6,movetoworkspacesilent,5 +bind=SUPER_SHIFT,7,movetoworkspacesilent,6 +bind=SUPER_SHIFT,8,movetoworkspacesilent,7 +bind=SUPER_SHIFT,9,movetoworkspacesilent,8 +bind=SUPER_SHIFT,0,movetoworkspacesilent,9 bind=SUPER,mouse_down,workspace,e+1 bind=SUPER,mouse_up,workspace,e-1 + +# Rules +windowrulev2=workspace 2,class:(firefox) diff --git a/.config/waybar/config-hyprland-bot.json b/.config/waybar/config-hyprland-bot.json deleted file mode 100644 index 1daf3eb..0000000 --- a/.config/waybar/config-hyprland-bot.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "waybar-bot", - "layer": "top", - "position": "bottom", - "height": 20, - "spacing": 4, - "modules-left": [ - "hyprland/workspaces", - "hyprland/window" - ], - "modules-center": [ - ], - "modules-right": [ - ], - "hyprland/workspaces": { - "format": "{icon}", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1" - }, - "hyprland/window": { - "max-length": 200, - "seperate-outputs": true - } -} diff --git a/.config/waybar/config-hyprland-top.json b/.config/waybar/config-hyprland-top.json deleted file mode 100644 index cb07737..0000000 --- a/.config/waybar/config-hyprland-top.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "waybar-top", - "layer": "top", - "position": "top", - "height": 20, - "spacing": 4, - "modules-left": [ - "cpu", - "memory", - "network" - ], - "modules-center": [ - "clock" - ], - "modules-right": [ - "pulseaudio", - "temperature", - "backlight", - "battery", - "idle_inhibitor", - "tray" - ], - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - "spacing": 10 - }, - "clock": { - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "CPU: {usage}%", - "tooltip": false - }, - "memory": { - "format": "RAM: {}%" - }, - "temperature": { - "critical-threshold": 80, - "format": "{temperatureC}°C 🫠" - }, - "backlight": { - "format": "{percent}% 💡" - }, - "battery": { - "states": { - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% 🔋", - "format-charging": "{capacity}% ⚡", - "format-plugged": "{capacity}% 🔌", - "format-alt": "{time} {icon}" - }, - "network": { - "interface": "wlp*", - "interval": 1, - "format": "RX: {bandwidthDownBits} / TX: {bandwidthUpBits}", - "format-wifi": "RX: {bandwidthDownBits} / TX: {bandwidthUpBits}" - }, - "pulseaudio": { - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": [ - "", - "", - "" - ] - }, - "on-click": "pavucontrol" - } -} diff --git a/.config/waybar/config-hyprland.json b/.config/waybar/config-hyprland.json new file mode 100644 index 0000000..1daf3eb --- /dev/null +++ b/.config/waybar/config-hyprland.json @@ -0,0 +1,24 @@ +{ + "name": "waybar-bot", + "layer": "top", + "position": "bottom", + "height": 20, + "spacing": 4, + "modules-left": [ + "hyprland/workspaces", + "hyprland/window" + ], + "modules-center": [ + ], + "modules-right": [ + ], + "hyprland/workspaces": { + "format": "{icon}", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1" + }, + "hyprland/window": { + "max-length": 200, + "seperate-outputs": true + } +} diff --git a/.config/waybar/config.json b/.config/waybar/config.json new file mode 100644 index 0000000..cb07737 --- /dev/null +++ b/.config/waybar/config.json @@ -0,0 +1,89 @@ +{ + "name": "waybar-top", + "layer": "top", + "position": "top", + "height": 20, + "spacing": 4, + "modules-left": [ + "cpu", + "memory", + "network" + ], + "modules-center": [ + "clock" + ], + "modules-right": [ + "pulseaudio", + "temperature", + "backlight", + "battery", + "idle_inhibitor", + "tray" + ], + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + "spacing": 10 + }, + "clock": { + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "CPU: {usage}%", + "tooltip": false + }, + "memory": { + "format": "RAM: {}%" + }, + "temperature": { + "critical-threshold": 80, + "format": "{temperatureC}°C 🫠" + }, + "backlight": { + "format": "{percent}% 💡" + }, + "battery": { + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% 🔋", + "format-charging": "{capacity}% ⚡", + "format-plugged": "{capacity}% 🔌", + "format-alt": "{time} {icon}" + }, + "network": { + "interface": "wlp*", + "interval": 1, + "format": "RX: {bandwidthDownBits} / TX: {bandwidthUpBits}", + "format-wifi": "RX: {bandwidthDownBits} / TX: {bandwidthUpBits}" + }, + "pulseaudio": { + "format": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": " {format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", + "", + "" + ] + }, + "on-click": "pavucontrol" + } +} -- cgit v1.1