From 136ac9fba06cd34b57ed69ed3d88e4be5d6545a0 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Sat, 14 Feb 2026 17:28:30 -0500 Subject: [PATCH] fix(waybar): icon spacing --- config/nvim/init.lua | 4 +++- config/nvim/lua/plugins/nvim.lua | 27 ----------------------- home/modules/ui.nix | 8 +++++-- scripts/ctl | 12 +++++------ scripts/hypr | 37 +++++++++++++++++++------------- 5 files changed, 37 insertions(+), 51 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 43fcb98..91c28ce 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -58,4 +58,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -require('lazy').setup('plugins') +require('lazy').setup('plugins', { + change_detection = { enabled = false }, +}) diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index d049c20..67ffe9c 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -118,33 +118,6 @@ return { { 'i', mode = { 'x', 'o' } }, }, }, - { - 'iamcco/markdown-preview.nvim', - build = 'pnpm up && cd app && pnpm install', - ft = { 'markdown' }, - config = function() - vim.cmd([[ - function OpenMarkdownPreview(url) - exec "silent !$BROWSER -n --args " . a:url - endfunction - ]]) - vim.g.mkdp_auto_close = 0 - vim.g.mkdp_browserfunc = 'OpenMarkdownPreview' - vim.api.nvim_create_autocmd('FileType', { - pattern = 'markdown', - callback = function(opts) - bmap( - { 'n', 'm', vim.cmd.MarkdownPreviewToggle }, - { buffer = opts.buf } - ) - end, - group = vim.api.nvim_create_augroup( - 'AMarkdownKeybind', - { clear = true } - ), - }) - end, - }, { enabled = false, 'lervag/vimtex', diff --git a/home/modules/ui.nix b/home/modules/ui.nix index e710876..32c9feb 100644 --- a/home/modules/ui.nix +++ b/home/modules/ui.nix @@ -124,8 +124,8 @@ in }; pulseaudio = { - format = "{icon} {volume}%"; - format-muted = "󰖁 muted"; + format = "{icon} {volume}%"; + format-muted = "󰖁 muted"; format-icons = { default = [ "󰕿" @@ -269,6 +269,10 @@ in foreground = c.red; frame_color = c.red; }; + hypr = { + appname = "hypr"; + icon_position = "off"; + }; }; }; xdg.configFile."waybar/themes/midnight.css".text = mkWaybarTheme config.palettes.midnight; diff --git a/scripts/ctl b/scripts/ctl index 2ca221e..32a57e9 100755 --- a/scripts/ctl +++ b/scripts/ctl @@ -16,7 +16,7 @@ screenshot) file="$dir/$(openssl rand -hex 10)-$(date +'%Y-%m-%d_%H-%M-%S').png" if [ "${XDG_SESSION_TYPE:-}" = "wayland" ]; then require grim slurp wl-copy - grim -g "$(slurp)" "$file" && wl-copy <"$file" + grim -g "$(slurp)" "$file" && wl-copy < "$file" else require maim xclip maim -s "$file" && xclip -selection clipboard -t image/png -i "$file" & @@ -33,13 +33,13 @@ ocr) region="$(slurp)" [ -n "$region" ] || exit 0 grim -g "$region" "$file" && - tesseract -l eng "$file" - 2>/dev/null | wl-copy + tesseract -l eng "$file" - 2>/dev/null | wl-copy ) /dev/null 2>&1 & else require maim xclip ( maim -s "$file" && - tesseract -l eng "$file" - 2>/dev/null | xclip -selection clipboard -in + tesseract -l eng "$file" - 2>/dev/null | xclip -selection clipboard -in ) /dev/null 2>&1 & fi ;; @@ -104,9 +104,9 @@ power) require fuzzel lock="󰌾 Lock" suspend="󰒲 Suspend" - logout="󰍃 Logout" - reboot="󰜉 Reboot" - shutdown="󰐥 Shutdown" + logout="󰍃 Logout" + reboot="󰜉 Reboot" + shutdown="󰐥 Shutdown" chosen="$(printf '%s\n' "$lock" "$suspend" "$logout" "$reboot" "$shutdown" | fuzzel --dmenu --hide-prompt --lines=5 --width=20 --no-icons)" case "$chosen" in "$lock") hyprlock ;; diff --git a/scripts/hypr b/scripts/hypr index 3240735..9a535af 100755 --- a/scripts/hypr +++ b/scripts/hypr @@ -49,21 +49,18 @@ exit) brightness) require brightnessctl notify-send BRIGHT_STEP=5 - max_brightness="$(brightnessctl max)" case "$1" in - up) - brightnessctl set "$BRIGHT_STEP"%+ - notify-send -t 2500 -r 5555 "brightness $(brightnessctl get | awk -v max="$max_brightness" '{printf "%d%%", $1*100/max}')" - ;; - down) - brightnessctl set "$BRIGHT_STEP"%- - notify-send -t 2500 -r 5555 "brightness $(brightnessctl get | awk -v max="$max_brightness" '{printf "%d%%", $1*100/max}')" - ;; - *) - echo "Invalid subcommand: $1" >&2 - exit 1 - ;; + up) brightnessctl set "$BRIGHT_STEP"%+ ;; + down) brightnessctl set "$BRIGHT_STEP"%- ;; + *) echo "Invalid subcommand: $1" >&2; exit 1 ;; esac + pct=$(awk -v cur="$(brightnessctl get)" -v max="$(brightnessctl max)" 'BEGIN { printf "%d", cur * 100 / max }') + filled=$((pct / 5)) + empty=$((20 - filled)) + bar="" + i=0; while [ "$i" -lt "$filled" ]; do bar="${bar}━"; i=$((i + 1)); done + i=0; while [ "$i" -lt "$empty" ]; do bar="${bar}─"; i=$((i + 1)); done + notify-send -a hypr -t 2500 -r 5555 "☼ $bar" ;; volume) require wpctl notify-send @@ -88,11 +85,21 @@ volume) esac vol=$(get_vol) + filled=$((vol / 5)) + empty=$((20 - filled)) + bar="" + i=0; while [ "$i" -lt "$filled" ]; do bar="${bar}━"; i=$((i + 1)); done + i=0; while [ "$i" -lt "$empty" ]; do bar="${bar}─"; i=$((i + 1)); done if wpctl get-volume "$SINK" | grep -q MUTED; then - notify-send -t 2500 -r 5556 "volume: ${vol}% (muted)" + icon="󰖁" + elif [ "$vol" -le 33 ]; then + icon="󰕿" + elif [ "$vol" -le 66 ]; then + icon="󰖀" else - notify-send -t 2500 -r 5556 "volume: ${vol}%" + icon="󰕾" fi + notify-send -a hypr -t 2500 -r 5556 "$icon $bar" ;; pull) require hyprctl jq fuzzel