From 02248d3c8b5b16ef2e9032ba3c08748979afd9ed Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 25 Jan 2025 22:09:37 +0100 Subject: [PATCH] Updated config --- .config/hypr/rules.conf | 12 ++-- .config/waybar/config.jsonc | 23 +------ .config/waybar/modules.jsonc | 106 ++++-------------------------- .config/waybar/style.css | 121 +++-------------------------------- .config/yazi/keymap.toml | 4 ++ .config/yazi/yazi.toml | 2 + .gitignore | 1 + 7 files changed, 34 insertions(+), 235 deletions(-) create mode 100644 .config/yazi/keymap.toml create mode 100644 .config/yazi/yazi.toml diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf index 00877e0..843db0a 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 d684595..4c52703 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,27 +1,6 @@ { "layer": "top", "position": "bottom", - "modules-left": [ - "custom/os", - "hyprland/window" - ], - "modules-center": [ - ], - "modules-right": [ - "group/hardware", - "wireplumber", - "clock" - ], - "group/hardware": { - "orientation": "horizontal", - "modules": [ - "cpu", - "custom/gpu", - "temperature", - "memory", - "disk", - "network" - ], - }, + "modules-right": ["cpu", "custom/gpu", "memory", "disk", "wireplumber", "clock"], "include": "~/.config/waybar/modules.jsonc", } \ No newline at end of file diff --git a/.config/waybar/modules.jsonc b/.config/waybar/modules.jsonc index 578dbb8..8ace900 100644 --- a/.config/waybar/modules.jsonc +++ b/.config/waybar/modules.jsonc @@ -1,120 +1,38 @@ { - "clock": { - "interval": 60, - "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-icons": ["󰾆", "󰾅", "󰓅"], - "max-length": 10, + "format": "CPU: {usage}%", "on-click": "$TERMINAL -e btop", }, - "custom/updates": { - "interval": 300, - "format": "󰏖 {}", - "exec": "~/.bin/updates", - "return-type": "json", - "on-click": "$TERMINAL -e yay", - }, "custom/gpu": { "interval": 2, + "format": "GPU: {}%", "exec": "nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits", - "format": " {}%", "return-type": "", "on-click": "$TERMINAL -e nvtop", - "max-length": 10, }, "memory": { "interval": 2, - "format": "{used} GiB", - "max-length": 10, + "format": "MEM: {used} GiB", "on-click": "$TERMINAL -e btop", }, - "network": { - "interval": 2, - "format-ethernet": "󰛳 {bandwidthTotalBytes}", - "format-disconnected": "", - "max-length": 10, - "on-click": "$TERMINAL -e bandwhich", - }, "disk": { "interval": 30, - "format": "󰋊 {used}", + "format": "SSD: {specific_used:0.0f} GiB", "path": "/", - "max-length": 10, + "unit": "GiB", "on-click": "$TERMINAL -e dua i /", }, - "mpris": { - "format": "{player_icon} {title}", - "format-paused": "{status_icon} {title}", - "player-icons": { - "default": "󰝚", - "mpv": "󰝚" - }, - "status-icons": { - "paused": "󰏤" - }, - "title-len": 30, - }, - "temperature": { - "interval": 2, - "format": " {temperatureC} C", - "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input", - "on-click": "$TERMINAL -e watch -n 1 sensors", - }, "wireplumber": { - "format": "{icon} {volume}%", - "format-muted": "", + "format": "VOL: {volume}%", + "format-muted": "", "scroll-step": 5, - "format-icons": ["", "", ""], - "max-length": 10, "on-click": "easyeffects", }, - "hyprland/window": { - "format": "󰘔 {initialTitle}", - "separate-outputs": true - }, - "hyprland/workspaces": { - "format": "{icon}", - "persistent-workspaces": { - "*": 9 - }, - "format-icons": { - "default": "", - "empty": "", - "active": "", - "urgent": "", - }, - "sort-by-number": true, - "on-click": "activate", - }, - "custom/os":{ - "format": "", - "tooltip": false, - "on-click": "fuzzel", - }, - "tray": { - "icon-size": 21, - "spacing": 10 - }, - "wlr/taskbar": { - "format": "{icon}", - "icon-size": 14, - "tooltip-format": "{title}", - "on-click": "activate", - "on-click-middle": "close", - "ignore-list": [ - "Alacritty", - ], - "app_ids-mapping": { - "firefoxdeveloperedition": "firefox-developer-edition", - }, - "rewrite": { - "Firefox Web Browser": "Firefox", - }, + "clock": { + "interval": 60, + "format": "{:%H:%M}", + "tooltip-format": "{:%A, %Y-%m-%d}", + "on-click": "date -u +'%Y-%m-%dT%H:%M:%SZ' | wl-copy", }, } \ No newline at end of file diff --git a/.config/waybar/style.css b/.config/waybar/style.css index fb21eda..9df1526 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,124 +1,19 @@ -/* ===== Generic ===== */ - * { - border: none; font-family: "UbuntuMono Nerd Font"; font-size: 15px; padding: 0; margin: 0; } -/* ===== Waybar ===== */ - #waybar { - background: rgba(38, 41, 44, 0.5); - border-top: 1px solid rgba(38, 41, 44, 0.6); - /* background: transparent; */ -} - -#waybar.hidden { - opacity: 0.2; -} - -#waybar #window { - opacity: 1; - transition: opacity 200ms ease; -} - -#waybar.empty #window { - opacity: 0; -} - -/* ===== Modules ===== */ - -#clock, -#cpu, -#disk, -#memory, -#mpris, -#network, -#temperature, -#window, -#wireplumber, -#custom-gpu, -#custom-updates { - color: rgba(255, 255, 255, 0.8); - padding: 4px 8px; - margin: 4px; - margin-right: 0; - border-radius: 3px; -} - -#custom-os { - font-size: 150%; - color: rgb(137, 220, 235); - padding: 4px 8px; - margin-right: 4px; -} - -#custom-updates.disabled { - opacity: 0; -} - -/* ===== Taskbar ===== */ - -#taskbar button { - padding: 0px 5px; -} - -#taskbar button:hover {} -#taskbar button.active {} - -/* ===== Workspaces ===== */ - -#workspaces button { - margin-left: 8px; - color: white; background: transparent; - text-shadow: none; - border-radius: 0; - opacity: 0.2; } -#workspaces button.empty { - opacity: 0.2; -} - -#workspaces button.active { - opacity: 1.0; -} - -#workspaces button.visible {} -#workspaces button.urgent {} -#workspaces button.persistent {} -#workspaces button.hidden {} - -/* ===== Extra colors ===== */ - -/*#cpu { - background: rgb(50.15%, 92.07%, 99.48%); -} - -#custom-gpu { - background: rgb(67.06%, 91.37%, 70.2%); -} - -#memory { - background: rgb(100%, 81.7%, 68.38%); -} - -#disk { - background: rgb(100%, 80.74%, 81.04%); -} - -#network { - background: rgb(92.54%, 81.78%, 100%); -} - -#wireplumber { - background: rgb(90%, 90%, 90%); -} - -#clock { - background: rgb(90%, 90%, 90%); -}*/ \ No newline at end of file +#cpu, #custom-gpu, #memory, #disk, #wireplumber, #clock { + border-radius: 3px; + color: rgba(255, 255, 255, 0.9); + background: rgba(38, 41, 44, 0.5); + padding: 4px 8px; + margin-bottom: 10px; + margin-right: 10px; +} \ No newline at end of file diff --git a/.config/yazi/keymap.toml b/.config/yazi/keymap.toml new file mode 100644 index 0000000..b5f0281 --- /dev/null +++ b/.config/yazi/keymap.toml @@ -0,0 +1,4 @@ +[[manager.prepend_keymap]] +on = [ "" ] +run = 'shell "$SHELL" --block --confirm' +desc = "Open shell here" \ No newline at end of file diff --git a/.config/yazi/yazi.toml b/.config/yazi/yazi.toml new file mode 100644 index 0000000..a01d710 --- /dev/null +++ b/.config/yazi/yazi.toml @@ -0,0 +1,2 @@ +[manager] +show_hidden = true \ No newline at end of file diff --git a/.gitignore b/.gitignore index 79c1377..2a17b37 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ lazy-lock.json !/.config/vscode !/.config/waybar !/.config/wlogout +!/.config/yazi !/.config/zed \ No newline at end of file