diff --git a/private_dot_config/btop/btop.conf b/private_dot_config/btop/btop.conf index d1914b6..5316fad 100644 --- a/private_dot_config/btop/btop.conf +++ b/private_dot_config/btop/btop.conf @@ -1,4 +1,4 @@ -#? Config file for btop v. 1.4.4 +#? Config file for btop v. 1.4.5 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" @@ -115,6 +115,9 @@ cpu_bottom = False #* Shows the system uptime in the CPU box. show_uptime = True +#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo. +show_cpu_watts = True + #* Show cpu temperature. check_temp = True diff --git a/private_dot_config/hypr/hyprland/exec.conf b/private_dot_config/hypr/hyprland/exec.conf index 3ebd3bb..93eab6e 100644 --- a/private_dot_config/hypr/hyprland/exec.conf +++ b/private_dot_config/hypr/hyprland/exec.conf @@ -6,3 +6,4 @@ exec-once = uwsm app -- mangohud steam exec-once = uwsm app -- kdeconnect-indicator exec-once = uwsm app -- waybar exec-once = uwsm app -- hyprpaper +exec-once = openrgb -c white diff --git a/private_dot_config/hypr/hyprland/monitors.conf b/private_dot_config/hypr/hyprland/monitors.conf index 68221ea..154c7a9 100644 --- a/private_dot_config/hypr/hyprland/monitors.conf +++ b/private_dot_config/hypr/hyprland/monitors.conf @@ -1,3 +1,3 @@ -monitor = DP-1, 2560x1440@180.06, 0x0, 1, bitdepth, 10, cm, hdr, sdrbrightness, 1.3, sdrsaturation, 0.99 -monitor = DP-2, 1920x1080@144, auto-left, 1 +monitor = DP-1, 2560x1440@180.06, 0x0, 1.25, bitdepth, 10, cm, hdr, sdrbrightness, 1.3, sdrsaturation, 0.8, vrr, 1 +monitor = DP-2, 1920x1080@144, auto-left, 1, vrr, 1 monitor = , preferred, auto, 1 diff --git a/private_dot_config/hypr/hyprland/rules/vesktop.conf b/private_dot_config/hypr/hyprland/rules/vesktop.conf index c4d23e0..00681bc 100644 --- a/private_dot_config/hypr/hyprland/rules/vesktop.conf +++ b/private_dot_config/hypr/hyprland/rules/vesktop.conf @@ -2,5 +2,3 @@ windowrule = workspace 1 silent, class:^(vesktop)$ windowrule = noinitialfocus, class:^(vesktop)$ windowrule = focusonactivate 0, class:^(vesktop)$ windowrule = renderunfocused, class:^(vesktop)$ -windowrule = pseudo, class:^(vesktop)$ -windowrule = size 65% 80%, class:^(vesktop)$ diff --git a/private_dot_config/waybar/config.jsonc b/private_dot_config/waybar/config.jsonc index 9d6b237..ebca411 100644 --- a/private_dot_config/waybar/config.jsonc +++ b/private_dot_config/waybar/config.jsonc @@ -1,92 +1,76 @@ // -*- mode: jsonc -*- { "layer": "top", // Waybar at top layer - "position": "top", // Waybar position (top|bottom|left|right) - "spacing": 5, // Gaps between modules (4px) + "position": "right", // Waybar position (top|bottom|left|right) + "spacing": 4, // Gaps between modules (4px) "output": "DP-1", // Choose the order of the modules "modules-left": [ + "clock", + "custom/notifications", + "network", "privacy", - "tray", "custom/spotify", - "custom/media" + "pulseaudio" ], "modules-center": [ - "clock", + "hyprland/workspaces" ], "modules-right": [ - "group/hardware", - "pulseaudio", - "custom/notifications", "battery", + "tray" ], "hyprland/workspaces": { - "active-only": true, + "format": "{icon}", + "on-click": "activate", + "on-click-right": "close", + "all-outputs": true, + "active-only": false, + "sort-by-number": true, + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "8": "", + "9": "", + "default": "" + } }, "tray": { "spacing": 10 }, "clock": { - "format": "{:%H:%M}", + "format": "{:%R}", + "format-alt": "{:%d.%m.%Y}", "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "group/hardware": { - "orientation": "inherit", - "drawer": { - "transition-duration": 500, - "children-class": "not-power", - "transition-left-to-right": true, + "calendar": { + "mode": "year", + "mode-mon-col": 3, + "weeks-pos": "right", + "on-scroll": 1, + "format": { + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" + }, + "actions": { + "on-click-right": "mode", + "on-scroll-up": "tz_up", + "on-scroll-down": "tz_down" + } }, - "modules": [ - "custom/hardware", - "temperature", - "memory", - "disk", - "cpu", - "network", - ], - }, - "temperature": { - "format": "|TEMP: {temperatureC}%|", - "tooltip": false, - }, - "memory": { - "format": "|RAM: {percentage}%|", - }, - "disk": { - "format": "|DISK: {percentage_used}%|", - "tooltip": false, - }, - "cpu": { - "format": "|CPU: {usage}%|", - }, - "battery": { - "states": { - "good": 95, - "warning": 20, - "critical": 10 - }, - "format": "|{capacity}% {icon}|", - "format-charging": "|{capacity}% |", - "format-plugged": "|{capacity}% |", - "format-alt": "|{time} {icon}|", - "format-full": "", - "format-icons": [ - "", - "", - "", - "", - "" - ] }, "network": { "format-wifi": "Wifi: {essid} ({signalStrength}%)  ", - "format-ethernet": "Ethernet:  ", + "format-ethernet": "", "tooltip-format": "{ifname} via {gwaddr} with {ipaddr}/{cidr} ", - "format-linked": "{ifname} (No IP)  ", + "format-linked": "{ifname} (No IP) ", "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" + "on-click": "kitty nmtui" }, "pulseaudio": { // "scroll-step": 1, // %, can be a float @@ -110,7 +94,7 @@ ] }, "on-click": "pavucontrol -t 3", - "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle" }, "custom/spotify": { "format": "{}", @@ -123,10 +107,7 @@ "hide-empty-text": true, "justify": "center", "max-length": 40, - "exec": "$HOME/.config/waybar/scripts/mediaplayer.sh spotify", - }, - "custom/hardware": { - "format": "", + "exec": "$HOME/.config/waybar/scripts/mediaplayer.sh spotify" }, "custom/notifications": { "format": "{text}", @@ -135,6 +116,6 @@ "exec-on-event": "~/.local/bin/check-do-not-disturb.sh show", "tooltip": false, "return-type": "text", - "signal": 2, - }, + "signal": 2 + } } diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css index 2217ef8..f41f7da 100644 --- a/private_dot_config/waybar/style.css +++ b/private_dot_config/waybar/style.css @@ -1,143 +1,76 @@ @import "./colors.css"; +/* Global styles */ * { - transition: 0.4s all ease-in-out; - font-family: "Cousine Nerd Font Mono"; + transition: 0.7s all ease-in-out; font-size: 16px; - padding: 2px; - margin: 1px 4px; + font-family: inherit; + padding: 3px; + margin: 1px 2px; color: @text; - text-shadow: none; border-radius: 12px; + min-width: 20px; } *:hover { text-shadow: none; } -window { - background-color: @base; - margin: 1px; -} - +/* Window */ window#waybar { - background: @surface0; - border-radius: 12px; + background-color: @base; } -/* modules */ +/* Workspaces */ #workspaces button { - background-color: @surface1; - margin-left: 5px; - color: @text; + padding: 2px; + margin: 1px; + background: transparent; + color: @lavender; + box-shadow: inset 0 1.5px; } #workspaces button:hover { - background-color: @blue; - color: @base; + background-color: @surface1; + box-shadow: inset 2px 5px; +} + +#workspaces button.active { + box-shadow: inset 1px 4px 0 1px; + background-color: @surface0; } #workspaces button.urgent { background-color: @red; - animation: blink; - animation-duration: 2s; } +/* Clock */ #clock { - margin: 10px; + font-style: oblique; + opacity: 1; } -tooltip { - background-color: @surface1; - color: @text; +/* Modules */ +.modules-left, +.modules-right, +.modules-center { + background-color: @crust; } -menu { - background-color: @surface1; - border-radius: 10px; +/* Tray */ +#tray>.needs-attention { + background-color: @red; } -/* moduły */ -#media, -#network, -#pulseaudio, -#battery { - border-radius: 12px; - margin: 5px; - background-color: @surface2; -} - -#tray { - background-color: @surface1; - border-radius: 5px; - padding: 5px; - margin: 5px; -} - -#tray:hover { - background-color: @blue; - color: @base; -} - -/* battery */ -#battery.warning:not(.charging) { - background: @yellow; - color: @base; - animation-name: blink; - animation-duration: 1s; - animation-timing-function: steps(12); - animation-iteration-count: infinite; - animation-direction: alternate; -} - -#battery.charging, -#battery.plugged { - color: @base; +/* Custom */ +#custom-spotify:hover { background-color: @green; } -#battery.critical:not(.charging) { - background-color: @red; - color: @base; - animation-name: blink; - animation-duration: 1s; - animation-timing-function: steps(12); - animation-iteration-count: infinite; - animation-direction: alternate; +#network:hover { + background-color: @sky; } -@keyframes blink { - to { - background-color: @red; - color: @base; - } -} - -/* spotify */ -#custom-spotify { - background-color: rgba(100, 149, 237, 0.2); - /* delikatny niebieski */ - color: @text; - padding: 10px; - margin: 5px; - border-radius: 5px; -} - -#custom-spotify:hover { - background-color: rgba(100, 149, 237, 0.8); - color: @base; -} - -/* notifications, hardware */ -#custom-notifications { - border-radius: 5px; - padding: 5px; - margin: 5px; - background-color: @surface2; -} - -#custom-hardware { - border-radius: 10px; - margin: 4px; - background-color: @surface2; +#custom-notifications:hover { + background-color: @sapphire; }