From f2cc7ea607f613f0cfdc6841d21f759a3ad22907 Mon Sep 17 00:00:00 2001 From: "Mariano Z." Date: Mon, 29 Sep 2025 12:07:29 -0300 Subject: [PATCH] dev: automated commit - 2025-09-29 12:07:29 --- config/.config/gtk-3.0/settings.ini | 9 +-- waybar/.config/waybar/common.jsonc | 66 +++++++--------------- waybar/.config/waybar/config.jsonc | 85 +++++++++++++++++++++++++++-- waybar/.config/waybar/style.css | 2 + zsh/.config/zsh/.zprofile | 2 - zsh/.config/zsh/completions.zsh | 5 +- zsh/.config/zsh/functions.zsh | 19 ++++++- 7 files changed, 127 insertions(+), 61 deletions(-) diff --git a/config/.config/gtk-3.0/settings.ini b/config/.config/gtk-3.0/settings.ini index 8ceac44..f9f7d1e 100644 --- a/config/.config/gtk-3.0/settings.ini +++ b/config/.config/gtk-3.0/settings.ini @@ -1,8 +1,8 @@ [Settings] gtk-theme-name=rose-pine-gtk-theme-unstable-latest-Dark gtk-icon-theme-name=Papirus -gtk-font-name=Adwaita Sans 11 -gtk-cursor-theme-name=Bibata-Original-Ice +gtk-font-name=SF Pro Text 11 +gtk-cursor-theme-name=Bibata-Original-Classic gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR @@ -12,5 +12,6 @@ gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull -gtk-xft-rgba=none +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb +gtk-application-prefer-dark-theme=0 diff --git a/waybar/.config/waybar/common.jsonc b/waybar/.config/waybar/common.jsonc index a2aff4b..f4fb77f 100644 --- a/waybar/.config/waybar/common.jsonc +++ b/waybar/.config/waybar/common.jsonc @@ -78,51 +78,27 @@ "scroll-step": 0.2, "min-length": 6 }, - "battery": { - "states": { - "good": 95, - "warning": 30, - "critical": 20 - }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{time} {icon}", - "format-icons": [ - "󰂎", - "󰁺", - "󰁻", - "󰁼", - "󰁽", - "󰁾", - "󰁿", - "󰂀", - "󰂁", - "󰂂", - "󰁹" - ] - }, - "pulseaudio": { - "format": "{icon} {volume}%", - "tooltip": false, - "format-muted": " Muted", - "on-click": "wpctl set-mute @DEFAULT_SINK@ toggle", - "on-click-right": "pavucontrol", - "scroll-step": 0.5, - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": [ - "", - "", - " " - ] - } - }, + // "pulseaudio": { + // "format": "{icon} {volume}%", + // "tooltip": false, + // "format-muted": " Muted", + // "on-click": "wpctl set-mute @DEFAULT_SINK@ toggle", + // "on-click-right": "pavucontrol", + // "scroll-step": 0.5, + // "format-icons": { + // "headphone": "", + // "hands-free": "", + // "headset": "", + // "phone": "", + // "portable": "", + // "car": "", + // "default": [ + // "", + // "", + // " " + // ] + // } + // }, // "pulseaudio#microphone": { // "format": "{format_source}", // "format-source": " {volume}%", diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc index 66b7b94..2c0dde5 100644 --- a/waybar/.config/waybar/config.jsonc +++ b/waybar/.config/waybar/config.jsonc @@ -44,7 +44,7 @@ "modules-right": [ "custom/wf-recorder", "custom/randwall", - "pulseaudio", + // "pulseaudio", // "custom/vpn", "custom/notification", "tray", @@ -76,16 +76,89 @@ // "custom/microphone", "custom/randwall", "pulseaudio", - // "custom/vpn", - "custom/notification", "backlight", "battery", - "tray", - "clock" + // "tray", + // "clock", + "group/tray-expander" ], "output": [ "eDP-1" - ] + ], + "group/tray-expander": { + "orientation": "inherit", + "drawer": { + "transition-duration": 600, + "children-class": "tray-group-item" + }, + "modules": [ + "custom/expand-icon", + "tray", + "custom/notification", + ] + }, + "custom/expand-icon": { + "format": " ", + "tooltip": false + }, + "tray": { + "spacing": 12 + }, + "pulseaudio": { + "format": "{icon}", + "on-click": "$TERMINAL --class=Wiremix -e wiremix", + "on-click-right": "pamixer -t", + "tooltip-format": "Playing at {volume}%", + "scroll-step": 5, + "format-muted": "", + "format-icons": { + "default": [ + "", + "", + "" + ] + } + }, + "battery": { + "format": "{capacity}% {icon}", + "format-discharging": "{icon}", + "format-charging": "{icon}", + "format-plugged": "", + "format-icons": { + "charging": [ + "󰢜", + "󰂆", + "󰂇", + "󰂈", + "󰢝", + "󰂉", + "󰢞", + "󰂊", + "󰂋", + "󰂅" + ], + "default": [ + "󰁺", + "󰁻", + "󰁼", + "󰁽", + "󰁾", + "󰁿", + "󰂀", + "󰂁", + "󰂂", + "󰁹" + ] + }, + "format-full": "󰂅", + "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%", + "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%", + "interval": 5, + "states": { + "warning": 20, + "critical": 10 + } + } // "custom/vpn": { // "format": "{}", // "return-type": "json", diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css index 0c29a45..b8ed5c4 100644 --- a/waybar/.config/waybar/style.css +++ b/waybar/.config/waybar/style.css @@ -141,9 +141,11 @@ tooltip { 0% { opacity: 1; } + 50% { opacity: 0.7; } + 100% { opacity: 1; } diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile index 714bfb9..6cfc0cc 100644 --- a/zsh/.config/zsh/.zprofile +++ b/zsh/.config/zsh/.zprofile @@ -9,8 +9,6 @@ export ZDOTDIR=${ZDOTDIR:-~/.config/zsh} # Auto-start Sway on first virtual terminal if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then - #exec niri exec sway - # exec niri fi diff --git a/zsh/.config/zsh/completions.zsh b/zsh/.config/zsh/completions.zsh index 47698e8..46f31c9 100644 --- a/zsh/.config/zsh/completions.zsh +++ b/zsh/.config/zsh/completions.zsh @@ -32,6 +32,7 @@ if command -v bombadil &> /dev/null; then _lazy_load_completion bombadil "bombad if command -v rop &> /dev/null; then eval "$(rop completion zsh)"; fi if command -v goq &> /dev/null; then eval "$(goq completion zsh)"; fi if command -v drop &> /dev/null; then eval "$(drop completion zsh)"; fi +if command -v mora &> /dev/null; then eval "$(mora completion zsh)"; fi # Custom completion for kf function using kubectx contexts _kf_completion() { @@ -60,7 +61,7 @@ _yay_completion() { return 0 } -# For zsh: + _yay_zsh_completion() { local -a opts opts=( @@ -72,11 +73,13 @@ _yay_zsh_completion() { '-Q:List installed' '-Si:Package info' '-Sc:Clean cache' + '-p:Open nix-shell with packages' 'help:Show help' 'install:Install to user env' 'remove:Remove from user env' 'list:List installed packages' 'clean:Clean nix store' + 'shell:Start nix-shell with packages' ) _describe 'yay commands' opts } diff --git a/zsh/.config/zsh/functions.zsh b/zsh/.config/zsh/functions.zsh index 24edf87..d0af570 100644 --- a/zsh/.config/zsh/functions.zsh +++ b/zsh/.config/zsh/functions.zsh @@ -732,6 +732,7 @@ yay() { echo "Searching for '$2'..." nix search nixpkgs "$2" 2>/dev/null || nix-env -qaP | grep -i "$2" ;; + # Install package to user environment install|"-S") [ -z "$2" ] && { echo "Usage: yay install "; return 1; } @@ -752,6 +753,17 @@ yay() { nix-env -q ;; + # nix-shell quick run + shell|"-p") + shift + if [ $# -eq 0 ]; then + echo "Usage: yay shell [pkg2 ...]" + return 1 + fi + echo "Starting nix-shell with: $*" + nix-shell -p "$@" + ;; + # Clean up clean|"-Sc") echo "Cleaning nix store..." @@ -770,9 +782,10 @@ Commands: yay search Search packages yay install Install package (user) yay remove Remove package - yay list List installed packages - yay clean Clean package cache - yay help Show this help + yay list List installed packages + yay shell Start nix-shell with packages + yay clean Clean package cache + yay help Show this help Note: For system packages, edit ~/.config/nixos/configuration.nix EOF