diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index e075e21..3d93f11 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -56,7 +56,7 @@ exec-once = /usr/lib/polkit-kde-authentication-agent-1 exec-once = sleep 1; blueman-applet exec-once = hyprpaper exec-once = swaync -exec-once = [workspace special:music silent] sleep 1; feishin --enable-features=UseOzonePlatform --ozone-platform=wayland +exec-once = [workspace special:music silent] sleep 1; supersonic-desktop exec-once = waybar exec-once = hypridle exec-once = hyprctl setcursor Dracula-cursors 24 @@ -66,9 +66,9 @@ exec-once = gimp exec-once = virt-manager exec-once = [workspace 2 silent] kitty --session ~/.config/kitty/session --listen-on=unix:@mykitty exec-once = [workspace 2 silent] sleep 1; kitty newsboat -exec-once = [workspace 7 silent] kitty btop -exec-once = [workspace 7 silent] sleep 1; kitty -exec-once = [workspace 7 silent] sleep 2;kitty zsh -c "source ~/.zshrc;nnn -deUxH" +exec-once = [workspace 6 silent] kitty btop +exec-once = [workspace 6 silent] sleep 1; kitty +exec-once = [workspace 6 silent] sleep 2;kitty zsh -c "source ~/.zshrc;nnn -deUxH" exec-once = steam -silent exec-once = sleep 1; heroic --ozone-platform=wayland exec-once = [workspace special:password silent] keepassxc @@ -148,6 +148,7 @@ windowrule = workspace 3 silent,class:libreoffice-writer windowrule = workspace 4 silent,class:gimp windowrule = workspace 5 silent,class:virt-manager windowrule = workspace special:email silent,class:tutanota-desktop +windowrule = workspace special:music silent,class:supersonic-desktop windowrule = size 300 500,title:Friends List windowrule = center,title:Steam windowrule = float,class:steam @@ -174,9 +175,6 @@ windowrule = size 1000 600,title:Open Files windowrule = float,title:Signal windowrule = center,title:Signal windowrule = size 1280 720,title:Signal -windowrule = float,class:feishin -windowrule = center,class:feishin -windowrule = size 1600 900, class:feishin windowrule = float,class:org.keepassxc.KeePassXC windowrule = size 800 600,class:org.keepassxc.KeePassXC windowrule = center,class:org.keepassxc.KeePassXC @@ -203,9 +201,6 @@ windowrule = center,class:imv windowrule = float,class:org.pwmt.zathura windowrule = center,class:org.pwmt.zathura windowrule = idleinhibit fullscreen, fullscreen:1 -windowrule = float,class:tutanota-desktop -windowrule = center,class:tutanota-desktop -windowrule = size 1705 909,class:tutanota-desktop windowrule = float,class:xdg-desktop-portal-gtk windowrule = float,class:blueman-manager windowrule = center,class:blueman-manager @@ -230,7 +225,7 @@ bind = $mainMod CTRL, Y, exec, heroic bind = $mainMod, N, exec, exec swaync-client -t -sw bind = $mainMod CTRL, U, exec, [workspace special:scratchpad silent] signal-desktop --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations bind = $mainMod CTRL, P, exec, [workspace special:password silent] keepassxc -bind = $mainMod CTRL, M, exec, [workspace special:music silent] sleep 1; feishin --enable-features=UseOzonePlatform --ozone-platform=wayland +bind = $mainMod CTRL, M, exec, [workspace special:music silent] sleep 1; supersonic-desktop # Resize windows main keybind bind=ALT,R,submap,resize @@ -336,8 +331,8 @@ workspace = 2, monitor:DP-1 workspace = 3, monitor:DP-1 workspace = 4, monitor:DP-1 workspace = 5, monitor:DP-1 -workspace = 6, monitor:DP-1 -workspace = 7, monitor:DP-2, default:true +workspace = 6, monitor:DP-2, default:true +workspace = 7, monitor:DP-2 workspace = 8, monitor:DP-2 workspace = 9, monitor:DP-2 workspace = 10, monitor:DP-2 diff --git a/.config/swaync/config.json b/.config/swaync/config.json index 9d3d69e..80fb817 100755 --- a/.config/swaync/config.json +++ b/.config/swaync/config.json @@ -49,6 +49,8 @@ "mpris": { "image-size": 96, "image-radius": 12 + "blacklist": [ "playerctld", "feishin" ], + "autohide": true } } } diff --git a/.config/waybar/config b/.config/waybar/config index 3ad4919..3104e96 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,13 +1,56 @@ [{ "output": "DP-1", "layer": "top", + "modules-left": ["hyprland/window"], + "modules-center": ["hyprland/mode"], + "hyprland/window": { + "format": "{title} ", + "max-length": 60, + "icon": true, + "icon-size": 20, + "all-outputs" : true, + }, + }, { + "output": "DP-2", + "layer": "top", "modules-left": ["hyprland/workspaces", "hyprland/mode"], - "modules-center": ["hyprland/window"], - "modules-right": ["mpris"], - + "modules-center": ["custom/gpu-usage", "cpu", "memory", "group/disks", "temperature", "clock", "custom/weather", "idle_inhibitor", "custom/pacman", "group/networks", "bluetooth", "group/audio-player"], + /* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */ + "modules-right": ["group/taskbar", "group/group-power"], + + "hyprland/mode": { + "format": " 󰹶 {}" + }, + "hyprland/workspaces": { + "format": "{icon}", + "all-outputs": true, + "on-click": "activate", + "format-icons": { + "1": "󰈹", + "2": "󰒋", + "3": "󰷈", + "4": "󱇤", + "5": "", + "6": "", + "7": "󰙵", + "8": "󰙵", + "9": "󰙵", + "10": "󰙵", + "11": "󰙵", + "12": "󰙵", + }, + "sort-by-number": true + }, + "group/audio-player": { + "orientation": "inherit", + "modules": [ + "mpris", + "cava" + ] + }, "mpris": { - "format": "{player_icon} {dynamic}", - "format-paused": "{status_icon} {dynamic}", + "format": "{player_icon} Playing ", + "format-paused": "{status_icon} Paused ", "tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})", "interval": 1, "album-len": 0, @@ -18,51 +61,29 @@ "status-icons": { "paused": "", }, - "ignored-players": ["firefox"] +// "ignored-players": ["firefox"] }, - "hyprland/window": { - "format": "{title} ", - "max-length": 60, - "icon": true, - "icon-size": 20, - "all-outputs" : true, - }, - "hyprland/workspaces": { - "format": "{icon}", - "on-click": "activate", - "format-icons": { - "1": "󰈹", - "2": "󰒋", - "3": "󰷈", - "4": "󱇤", - "5": "", - "6": "󰙵", - }, - "sort-by-number": true - }, - }, { - "output": "DP-2", - "layer": "top", - "modules-left": ["hyprland/workspaces", "hyprland/mode"], - "modules-center": ["custom/gpu-usage", "cpu", "memory", "temperature", "network", "custom/vpn", "bluetooth", "clock", "custom/weather", "idle_inhibitor", "custom/pacman", "disk", "disk#disk2", "disk#disk3", "disk#disk4", "disk#disk5"], - /* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */ - "modules-right": ["tray", "pulseaudio", "group/group-power"], - "hyprland/mode": { - "format": " 󰹶 {}" - }, - "hyprland/workspaces": { - "format": "{icon}", - "on-click": "activate", - "format-icons": { - "7": "", - "8": "󰈹", - "9": "󰙵", - "10": "󰙵", - "11": "󰙵", - "12": "󰙵", - }, - "sort-by-number": true +"cava": { + "cava_config": "/home/peter/.config/cava/config", + "framerate": 240, + "autosens": 1, + "bars": 6, + "lower_cutoff_freq": 50, + "higher_cutoff_freq": 10000, + "method": "pipewire", + "source": "auto", + "stereo": true, + "reverse": false, + "bar_delimiter": 32, + "monstercat": false, + "waves": false, + "noise_reduction": 0.77, + "input_delay": 2, + "format-icons" : ["", "", "", "", "", "", "", "" ], + "actions": { + "on-click-right": "mode" + } }, "custom/pacman": { "format": "{}", @@ -101,6 +122,13 @@ "tooltip": false, "on-click": "shutdown -h now" }, + "group/networks": { + "orientation": "inherit", + "modules": [ + "network", + "custom/vpn", + ] + }, "network": { "interface": "enp7s0", "format": "{ifname}", @@ -122,6 +150,13 @@ }, "on-click": "toggleRemote" }, + "group/taskbar": { + "orientation": "inherit", + "modules": [ + "tray", + "pulseaudio" + ] + }, "tray": { "icon-size": 20, "spacing": 6 @@ -150,6 +185,21 @@ "format": " {temperatureC}°C", "tooltip": false, }, + "group/disks": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "transition-left-to-right": true, + "click-to-reveal": true, + }, + "modules": [ + "disk", + "disk#disk2", + "disk#disk3", + "disk#disk4", + "disk#disk5" + ] + }, "disk": { "interval": 30, "format": "󰋊 /: {percentage_used}%", @@ -206,7 +256,7 @@ "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%" }, "custom/vpn": { - "format": " VPN", + "format": "", "tooltip": true, "tooltip-format": "Connected", "exec": "echo '{\"class\": \"connected\"}'", @@ -224,7 +274,7 @@ // "format-alt": "{alt}", }, "custom/gpu-usage": { - "exec": "cat /sys/class/hwmon/hwmon2/device/gpu_busy_percent", + "exec": "cat /sys/class/hwmon/hwmon1/device/gpu_busy_percent", "format": "󰍹 {}%", "return-type": "", "interval": 1, diff --git a/.config/waybar/style.css b/.config/waybar/style.css index c0bccfb..702d439 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -49,7 +49,7 @@ window#waybar.hidden { } -#network { +#networks { margin-top: 6px; margin-left: 8px; padding-left: 10px; @@ -64,15 +64,8 @@ window#waybar.hidden { } #pulseaudio { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #282a36; - background: #50fa7b; + margin-left: 2px; + color: #f8f8f2; } #bluetooth { @@ -168,9 +161,9 @@ window#waybar.hidden { background: #282a36; } -#tray { +#taskbar { margin-top: 6px; - margin-left: 28px; + margin-left: 8px; padding-left: 10px; margin-bottom: 0px; padding-right: 10px; @@ -218,15 +211,7 @@ window#waybar.hidden { } #custom-vpn { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; color: #f8f8f2; - background: #282a36; } #custom-weather { @@ -269,6 +254,19 @@ window#waybar.hidden { color: #f8f8f2; } +#user { + margin-top: 6px; + margin-left: 8px; + padding-left: 10px; + padding-right: 10px; + margin-bottom: 0px; + border-radius: 10px; + transition: none; + color: #f8f8f2; + background: transparent; + +} + #custom-gpu-usage { margin-top: 6px; margin-left: 8px; @@ -280,19 +278,7 @@ window#waybar.hidden { color: #f8f8f2; background: #282a36; } -#mpris { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 6px; - margin-right: 6px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #bd93f9; - background: #282a36; -} -#custom-scratchpad-indicator { +#audio-player { margin-top: 6px; margin-left: 8px; padding-left: 10px; @@ -300,8 +286,8 @@ window#waybar.hidden { margin-bottom: 0px; border-radius: 10px; transition: none; - color: #f8f8f2; - background: #6272a4; + color: #50fa7b; + background: #282a36; } #custom-power { margin-top: 6px; @@ -340,9 +326,9 @@ window#waybar.hidden { #custom-pacman { margin-top: 6px; margin-left: 2px; - padding-left: 2px; + padding-left: 5px; padding-right: 5px; - margin-right: 5px; + margin-right: 2px; margin-bottom: 0px; border-radius: 10px; transition: none;