From 8931c1696f818c7d78331946f5ce5c628a2cc963 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Tue, 11 Feb 2025 17:37:34 +0100 Subject: [PATCH] Updated config --- .config/fish/alias.fish | 1 + .config/foot/foot.ini | 2 +- .config/hypr/autostart.conf | 3 +- .config/hypr/general.conf | 15 ++++++--- .config/nvim/lua/packages.lua | 3 ++ .config/vscode/settings.json | 7 ---- .config/waybar/config.jsonc | 5 +-- .config/waybar/modules.jsonc | 60 ++++++++++++++++++++++++++--------- .config/waybar/style.css | 23 +++++++++++--- 9 files changed, 83 insertions(+), 36 deletions(-) diff --git a/.config/fish/alias.fish b/.config/fish/alias.fish index c4d65bd..d263d6e 100644 --- a/.config/fish/alias.fish +++ b/.config/fish/alias.fish @@ -8,6 +8,7 @@ alias gs "git status" # Go alias gb "go build -v" +alias godeps "go list -f '{{ join .Deps \"\n\"}}' ." alias gt "go test -v" alias gts "gotestsum" diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index 9d7eda2..b84557b 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -2,7 +2,7 @@ font=UbuntuMono Nerd Font:size=15.5 [colors] background=26292C -foreground=F8F8F0 +foreground=E0E0E0 regular0=272822 regular1=F92672 regular2=A6E22E diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf index 6b20e79..1d84f1d 100644 --- a/.config/hypr/autostart.conf +++ b/.config/hypr/autostart.conf @@ -1,4 +1,5 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = waypaper --restore -exec-once = wl-paste --watch cliphist store \ No newline at end of file +exec-once = wl-paste --watch cliphist store +exec-once = $statusbar \ No newline at end of file diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf index af1173b..34605e9 100644 --- a/.config/hypr/general.conf +++ b/.config/hypr/general.conf @@ -1,15 +1,15 @@ general { gaps_in = 5 gaps_out = 10 - border_size = 2 + border_size = 1 allow_tearing = true - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = rgb(7f7f7f) + col.inactive_border = rgb(4f4f4f) } decoration { rounding = 5 - active_opacity = 0.8 + active_opacity = 1.0 inactive_opacity = 0.8 blur { @@ -19,7 +19,12 @@ decoration { } shadow { - enabled = false + enabled = true + range = 100 + render_power = 3 + color = rgba(1a1a1aaf) + offset = 0 40 + scale = 0.9 } } diff --git a/.config/nvim/lua/packages.lua b/.config/nvim/lua/packages.lua index dc35abb..82a9611 100644 --- a/.config/nvim/lua/packages.lua +++ b/.config/nvim/lua/packages.lua @@ -22,6 +22,9 @@ require("lazy").setup("plugins", { change_detection = { notify = false }, + rocks = { + enabled = false + }, ui = { icons = { ft = "", diff --git a/.config/vscode/settings.json b/.config/vscode/settings.json index eb8c8cd..e8af495 100644 --- a/.config/vscode/settings.json +++ b/.config/vscode/settings.json @@ -30,13 +30,6 @@ "gitProjectManager.openInNewWindow": false, "gitProjectManager.storeRepositoriesBetweenSessions": false, "go.gopath": "~/.local/share/go", - "go.lintFlags": [ - "--fast", - "--enable-all", - "--disable", - "cyclop,depguard,dupl,dupword,errname,exhaustruct,forbidigo,forcetypeassert,funlen,gochecknoglobals,gochecknoinits,gocognit,gocyclo,godot,gofumpt,lll,mnd,nestif,nlreturn,paralleltest,varnamelen,wrapcheck,wsl", - ], - "go.lintTool": "golangci-lint", "go.toolsManagement.autoUpdate": true, "godotTools.editorPath.godot4": "/usr/bin/godot", "godotTools.lsp.serverPort": 6005, diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 89e8607..15b6f73 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,7 +1,8 @@ { "layer": "top", - "position": "bottom", - "modules-left": ["cpu", "custom/gpu", "memory", "disk", "custom/processes", "custom/tcp", "custom/udp"], + "position": "top", + "modules-left": ["cpu", "custom/gpu", "memory", "disk"], + "modules-center": ["hyprland/workspaces"], "modules-right": ["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 eef95ce..eab87ff 100644 --- a/.config/waybar/modules.jsonc +++ b/.config/waybar/modules.jsonc @@ -1,27 +1,37 @@ { "cpu": { "interval": 2, - "format": "[CPU] {usage}%", - "on-click": "$TERMINAL -e btop", + "format": "{icon} {usage}%", + "format-icons": ["󰾆 ", "󰾅 ", "󰓅 "], + "on-click": "$TERMINAL -- btop", }, "custom/gpu": { "interval": 2, - "format": "[GPU] {}%", + "format": " {}%", "exec": "nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits", "return-type": "", - "on-click": "$TERMINAL -e nvtop", + "on-click": "$TERMINAL -- nvtop", }, "memory": { "interval": 2, - "format": "[MEM] {used} G", - "on-click": "$TERMINAL -e btop", + "format": " {used} G", + "on-click": "$TERMINAL -- btop", }, "disk": { "interval": 30, - "format": "[SSD] {specific_used:0.0f} G", + "format": "󰋊 {specific_used:0.0f} G", "path": "/", "unit": "GiB", - "on-click": "$TERMINAL -e dua i /", + "on-click": "$TERMINAL -- dua i /", + }, + "custom/pacman": { + "format": " {}", + "interval": 30, + "exec": "checkupdates | wc -l", + "exec-if": "exit 0", + "on-click": "$TERMINAL -- sudo pacman -Syu", + "signal": 8, + "tooltip": false, }, "custom/processes": { "interval": 2, @@ -29,7 +39,7 @@ "exec": "ps --ppid 2 -p 2 --deselect --no-headers | wc -l", "return-type": "", "tooltip-format": "Number of running processes", - "on-click": "$TERMINAL -e btop", + "on-click": "$TERMINAL -- btop", }, "custom/tcp": { "interval": 2, @@ -37,7 +47,7 @@ "exec": "lsof -tPniTCP | wc -l", "return-type": "", "tooltip-format": "Number of processes with TCP connections", - "on-click": "$TERMINAL -e bandwhich", + "on-click": "$TERMINAL -- bandwhich", }, "custom/udp": { "interval": 2, @@ -45,18 +55,38 @@ "exec": "lsof -tPniUDP | wc -l", "return-type": "", "tooltip-format": "Number of processes with UDP connections", - "on-click": "$TERMINAL -e bandwhich", + "on-click": "$TERMINAL -- bandwhich", + }, + "hyprland/workspaces": { + "format": "{icon}", + "persistent-workspaces": { + "*": 9 + }, + "format-icons": { + "default": " ", + "empty": " ", + "active": " ", + "urgent": " ", + }, + "sort-by-number": true, + "on-click": "activate", }, "wireplumber": { - "format": "[VOL] {volume}%", - "format-muted": "", + "format": "{icon} {volume}%", + "format-muted": " ", + "format-icons": [" ", " ", " "], "scroll-step": 5, "on-click": "easyeffects", }, "clock": { "interval": 60, - "format": "[CLK] {:%H:%M}", - "tooltip-format": "{:%A, %Y-%m-%d}", + "format": " {:%H:%M}", + "tooltip-format": "{calendar}", + "calendar": { + "format": { + "today": "{}" + } + }, "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 18f9c88..24ff5f0 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,18 +1,31 @@ * { + all: unset; font-family: "UbuntuMono Nerd Font"; font-size: 15px; padding: 0; margin: 0; } -#waybar { - background: transparent; - /* background: rgba(38, 41, 44, 0.5); */ +.modules-left, .modules-center, .modules-right { + background: rgba(38, 41, 44, 0.5); + border: 1px #4f4f4f solid; + border-radius: 3px; + margin: 8px; + margin-bottom: 0; } -#cpu, #custom-gpu, #memory, #disk, #custom-processes, #custom-tcp, #custom-udp, #wireplumber, #clock { - color: rgba(255, 255, 255, 0.6); +#cpu, #custom-gpu, #memory, #disk, #custom-processes, #custom-tcp, #custom-udp, #custom-pacman, #wireplumber, #clock { + color: rgba(255, 255, 255, 0.75); border-radius: 3px; padding: 4px 8px; margin-left: 4px; +} + +#workspaces button { + color: rgba(255, 255, 255, 0.2); + padding: 4px; +} + +#workspaces button.active { + color: rgba(255, 255, 255, 0.75); } \ No newline at end of file