From 56aa5d1e9da30ae6b1e768e57e4bdb3a0d4e2d4a Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Fri, 24 Jan 2025 11:04:56 +0100 Subject: [PATCH] Updated config --- .config/environment.d/10-xdg.conf | 2 ++ .config/environment.d/30-general.conf | 1 + .config/hypr/rules.conf | 12 ++++----- .config/waybar/config.jsonc | 9 ++++--- .config/waybar/modules.jsonc | 37 ++++++++++++--------------- .config/waybar/style.css | 7 +++-- 6 files changed, 36 insertions(+), 32 deletions(-) diff --git a/.config/environment.d/10-xdg.conf b/.config/environment.d/10-xdg.conf index b797bb6..d1372d1 100644 --- a/.config/environment.d/10-xdg.conf +++ b/.config/environment.d/10-xdg.conf @@ -1,4 +1,6 @@ XDG_CACHE_HOME=$HOME/.cache XDG_CONFIG_HOME=$HOME/.config XDG_DATA_HOME=$HOME/.local/share +XDG_BIN_HOME=$HOME/.local/bin +XDG_LIB_HOME=$HOME/.local/lib XDG_STATE_HOME=$HOME/.local/state \ No newline at end of file diff --git a/.config/environment.d/30-general.conf b/.config/environment.d/30-general.conf index c0084ac..8ce7a7a 100644 --- a/.config/environment.d/30-general.conf +++ b/.config/environment.d/30-general.conf @@ -1,5 +1,6 @@ BROWSER=firefox EDITOR=nvim LANG=en_US.UTF-8 +PAGER=less SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket TERMINAL=foot \ No newline at end of file diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf index 843db0a..00877e0 100644 --- a/.config/hypr/rules.conf +++ b/.config/hypr/rules.conf @@ -13,9 +13,9 @@ windowrulev2 = suppressevent maximize, class:.* windowrulev2 = float, class:($wallpaper) # No gaps when there is a single window -# workspace = w[tv1], gapsout:0, gapsin:0 -# workspace = f[1], gapsout:0, gapsin:0 -# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] -# windowrulev2 = rounding 0, floating:0, onworkspace:f[1] \ No newline at end of file +workspace = w[tv1], gapsout:0, gapsin:0 +workspace = f[1], gapsout:0, gapsin:0 +windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] +windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] +windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] +windowrulev2 = rounding 0, floating:0, onworkspace:f[1] \ No newline at end of file diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index b529606..d684595 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,16 +1,16 @@ { "layer": "top", - "position": "top", + "position": "bottom", "modules-left": [ - "hyprland/workspaces" + "custom/os", + "hyprland/window" ], "modules-center": [ - "clock" ], "modules-right": [ "group/hardware", - "custom/updates", "wireplumber", + "clock" ], "group/hardware": { "orientation": "horizontal", @@ -20,6 +20,7 @@ "temperature", "memory", "disk", + "network" ], }, "include": "~/.config/waybar/modules.jsonc", diff --git a/.config/waybar/modules.jsonc b/.config/waybar/modules.jsonc index a8ae0b4..578dbb8 100644 --- a/.config/waybar/modules.jsonc +++ b/.config/waybar/modules.jsonc @@ -1,14 +1,14 @@ { "clock": { "interval": 60, - "format": " {:%H : %M}", + "format": " {:%H:%M}", "tooltip-format": "{:%A, %Y-%m-%d}", "on-click": "$TERMINAL -e peaclock", "on-click-right": "date -u +'%Y-%m-%dT%H:%M:%SZ' | wl-copy", }, "cpu": { "interval": 2, - "format": "{icon} {usage}%", + "format": "{icon} {usage}%", "format-icons": ["󰾆", "󰾅", "󰓅"], "max-length": 10, "on-click": "$TERMINAL -e btop", @@ -34,30 +34,23 @@ "max-length": 10, "on-click": "$TERMINAL -e btop", }, - "network#up": { + "network": { "interval": 2, - "format": "{bandwidthUpBits}", - "tooltip-format": " {ifname} upload", + "format-ethernet": "󰛳 {bandwidthTotalBytes}", + "format-disconnected": "", "max-length": 10, - "on-click": "$TERMINAL -e nethogs", - }, - "network#down": { - "interval": 2, - "format": "{bandwidthDownBits}", - "tooltip-format": " {ifname} download", - "max-length": 10, - "on-click": "$TERMINAL -e nethogs", + "on-click": "$TERMINAL -e bandwhich", }, "disk": { "interval": 30, "format": "󰋊 {used}", "path": "/", "max-length": 10, - "on-click": "$TERMINAL -e dua i", + "on-click": "$TERMINAL -e dua i /", }, "mpris": { - "format": "{player_icon} {title}", - "format-paused": "{status_icon} {title}", + "format": "{player_icon} {title}", + "format-paused": "{status_icon} {title}", "player-icons": { "default": "󰝚", "mpv": "󰝚" @@ -70,10 +63,11 @@ "temperature": { "interval": 2, "format": " {temperatureC} C", - "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input" + "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input", + "on-click": "$TERMINAL -e watch -n 1 sensors", }, "wireplumber": { - "format": "{icon} {volume}%", + "format": "{icon} {volume}%", "format-muted": "", "scroll-step": 5, "format-icons": ["", "", ""], @@ -101,12 +95,15 @@ "custom/os":{ "format": "", "tooltip": false, - "on-click": "$TERMINAL --hold -e fastfetch", + "on-click": "fuzzel", + }, + "tray": { + "icon-size": 21, + "spacing": 10 }, "wlr/taskbar": { "format": "{icon}", "icon-size": 14, - "icon-theme": "Adwaita", "tooltip-format": "{title}", "on-click": "activate", "on-click-middle": "close", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 2a0caf0..fb21eda 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -2,8 +2,8 @@ * { border: none; - font-family: "Ubuntu Nerd Font"; - font-size: 14px; + font-family: "UbuntuMono Nerd Font"; + font-size: 15px; padding: 0; margin: 0; } @@ -12,6 +12,7 @@ #waybar { background: rgba(38, 41, 44, 0.5); + border-top: 1px solid rgba(38, 41, 44, 0.6); /* background: transparent; */ } @@ -51,6 +52,8 @@ #custom-os { font-size: 150%; color: rgb(137, 220, 235); + padding: 4px 8px; + margin-right: 4px; } #custom-updates.disabled {