dev: automated commit - 2025-09-22 09:56:48

git/.config/git/config

@@ -1,7 +1,7 @@
 [user]
 	email = marianoz@posteo.net
 	name = Mariano Z.
-	signingkey = 13D35660EC8E8AA03D4370A83FA93CB876C8FFAA
+	signingkey = E54F23DDA33256B4BC82B7184C73BAD25156DACE
 
 [core]
 	autocrlf = input

local-bin/.local/bin/code.sh

@@ -1,12 +1,12 @@
-#!/bin/bash
-MODULE_URL="mzunino.com.uy/go/code"
+#!/usr/bin/env bash
+MODULE_URL="github.com/marianozunino/code/v2"
 BINARY_NAME="code"
 TARGET_DIR="$HOME/.local/bin"
 BINARY_PATH="$TARGET_DIR/$BINARY_NAME"
 
 if [ ! -x "$BINARY_PATH" ]; then
 	notify-send "📦 Installing $BINARY_NAME" "Installing from $MODULE_URL..."
-	GO111MODULE=on GOBIN="$TARGET_DIR" go install "$MODULE_URL@master" || {
+	GO111MODULE=on GOBIN="$TARGET_DIR" go install "$MODULE_URL@v2.0.2" || {
 		notify-send -u critical "Installation Failed" "Failed to install $BINARY_NAME from $MODULE_URL"
 		exit 1
 	}

local-bin/.local/bin/dbeaver-backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # DBeaver Profile Backup Script
 # This script creates a backup of DBeaver profiles and configurations

local-bin/.local/bin/dbeaver-restore.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # DBeaver Profile Restore Script
 # This script restores a DBeaver backup created with the backup script
 

local-bin/.local/bin/fix-git.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 OLD_URL=$(git remote get-url origin)
 if [[ $OLD_URL == "https://github.com"* ]]; then

local-bin/.local/bin/font-manager

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # ~/.local/bin/font-manager
 # This script extracts font archives and rebuilds font cache
 # Enhanced version with better integration and error handling

local-bin/.local/bin/goq.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 MODULE_URL="github.com/marianozunino/goq"
 BINARY_NAME="goq"
 TARGET_DIR="$HOME/.local/bin"

local-bin/.local/bin/leapp.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 REPO="noovolari/leapp"
 BINARY_NAME="leapp"
 TARGET_DIR="$HOME/.local/bin"

local-bin/.local/bin/lock.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 swaylock -f \
 	--screenshots \
 	--clock \

local-bin/.local/bin/maintenance.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Make sure we're running as root or with sudo
 if [ "$(id -u)" -ne 0 ]; then

local-bin/.local/bin/nosql.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 BINARY_NAME="nosql"
 TARGET_DIR="$HOME/.local/bin"
 BINARY_PATH="$TARGET_DIR/$BINARY_NAME"

local-bin/.local/bin/openlens.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 REPO="MuhammedKalkan/OpenLens"
 BINARY_NAME="openlens"
 TARGET_DIR="$HOME/.local/bin"

local-bin/.local/bin/randwall

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Kill any existing swaybg or feh instances
 pkill swaybg

local-bin/.local/bin/redis.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 REPO="qishibo/AnotherRedisDesktopManager"
 BINARY_NAME="redis"
 TARGET_DIR="$HOME/.local/bin"

local-bin/.local/bin/rop.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 MODULE_URL="github.com/marianozunino/rop"
 BINARY_NAME="rop"
 TARGET_DIR="$HOME/.local/bin"

local-bin/.local/bin/screenshot-upload

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 file=/tmp/$(date "+%Y%m%d-%H%M%S")_screenshot.png
 
 grim -g "$(slurp)" "$file" &&

local-bin/.local/bin/sdm-ui.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 MODULE_URL="github.com/marianozunino/sdm-ui"
 BINARY_NAME="sdm-ui"
 TARGET_DIR="$HOME/.local/bin"

local-bin/.local/bin/sm.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 BINARY_NAME="sm"
 TARGET_DIR="$HOME/.local/bin"
 BINARY_PATH="$TARGET_DIR/$BINARY_NAME"

local-bin/.local/bin/waybar.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CONFIG_FILES="$HOME/.config/waybar/config.jsonc $HOME/.config/waybar/style.css"
 

sway/.config/sway/config

@@ -1,5 +1,6 @@
 # Include system defaults
-include /etc/sway/config.d/*
+# include /etc/sway/config.d/*
+exec systemd-cat --identifier=sway dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 # Include custom configuration modules
 include ~/.config/sway/config.d/variables

sway/.config/sway/config.d/appearance

@@ -15,13 +15,13 @@ gaps outer 5
 xwayland enable
 
 # SwayFX Settings
-smart_corner_radius on
-corner_radius 10
-
-default_dim_inactive 0.05
-blur enable
-blur_passes 1
-blur_radius 1
-layer_effects "waybar" "blur enable"; shadows enable
-shadows on
-shadow_blur_radius 20
+# smart_corner_radius on
+# corner_radius 10
+# 
+# default_dim_inactive 0.05
+# blur enable
+# blur_passes 1
+# blur_radius 1
+# layer_effects "waybar" "blur enable"; shadows enable
+# shadows on
+# shadow_blur_radius 20

sway/.config/sway/config.d/autostart

@@ -1,28 +1,28 @@
 # vim: ft=swayconfig
 # System Services
 exec {
-    /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
+    # /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
     blueman-applet
     nm-applet
     swaync
     wlsunset -l -34.9 -L -56.2 -t 4500 -g 0.9
     easyeffects --gapplication-service
 }
-
-# User Interface
+#
+# # User Interface
 exec {
     ~/.local/bin/randwall
     ~/.local/bin/waybar.sh
 }
-
+#
 # Applications
 exec {
     $term --class="uy.com.mzunino"
     slack
     davmail
-    betterbird
-    zen-browser
-    obsidian
-    localsend
+    thunderbird
+    zen
+    # obsidian
+    localsend_app
     vesktop
 }

sway/.config/sway/config.d/keybindings

@@ -16,7 +16,7 @@ bindgesture swipe:down workspace prev
 bindsym {
     $mod+Return   exec $term
     $mod+d        exec rofi -show combi -combi-modi "window,drun" -modi combi
-    $mod+t        exec ~/.local/bin/code.sh -s ~/.local/bin/fuzzel.lua
+    $mod+t        exec ~/.local/bin/code.sh -s ~/.local/bin/rofi.yaml
     $mod+shift+t  exec ~/.local/bin/present
     $mod+n        exec ~/.local/bin/sdm-ui.sh dmenu
     $mod+o        exec ~/.local/bin/launch-or-focus obsidian "cd /home/forbi/Documents/Vault && $term --class obsidian nvim"

tmux/.config/tmux/tmux.conf

@@ -15,6 +15,7 @@ setw -g aggressive-resize on               # Only resize screen if smaller scree
 set -g history-limit 10000                 # Store 10k lines of history
 set-option -g allow-rename off             # Disable automatic window renaming
 set-option -s set-clipboard on             # Enable clipboard support
+setw -g mode-keys vi                       # Use vi keys in copy mode
 
 
 # Key Bindings
@@ -35,6 +36,25 @@ bind -r J resize-pane -D 5
 bind -r K resize-pane -U 5
 bind -r L resize-pane -R 5
 
+# Vim-like copy mode navigation
+bind-key -T copy-mode-vi h send-keys -X cursor-left
+bind-key -T copy-mode-vi j send-keys -X cursor-down
+bind-key -T copy-mode-vi k send-keys -X cursor-up
+bind-key -T copy-mode-vi l send-keys -X cursor-right
+bind-key -T copy-mode-vi w send-keys -X next-word
+bind-key -T copy-mode-vi b send-keys -X previous-word
+bind-key -T copy-mode-vi 0 send-keys -X start-of-line
+bind-key -T copy-mode-vi $ send-keys -X end-of-line
+bind-key -T copy-mode-vi G send-keys -X history-bottom
+bind-key -T copy-mode-vi g send-keys -X history-top
+bind-key -T copy-mode-vi / command-prompt -T search -I "#{pane_current_path}" "send -X search-forward \"%%\""
+bind-key -T copy-mode-vi ? command-prompt -T search -I "#{pane_current_path}" "send -X search-backward \"%%\""
+bind-key -T copy-mode-vi n send-keys -X search-again
+bind-key -T copy-mode-vi N send-keys -X search-reverse
+bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
+bind-key -T copy-mode-vi Escape send-keys -X cancel
+
 # Move pane to a different window
 bind-key m choose-window -F "#{window_index}: #{window_name}" "join-pane -h -t %%"
 bind-key M choose-window -F "#{window_index}: #{window_name}" "join-pane -v -t %%"
@@ -85,7 +105,7 @@ set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(🔍),}"
 set -g @catppuccin_window_default_text "#W"
 
 # Determine status modules based on hostname
-run-shell "if [ $(hostname) = 't14' ]; then \
+run-shell "if [ $(hostname) = 'fw' ]; then \
     tmux set -g @catppuccin_status_modules_right 'date_time battery session'; \
   else \
     tmux set -g @catppuccin_status_modules_right 'date_time session'; \

waybar/.config/waybar/common.jsonc

@@ -123,16 +123,16 @@
 			]
 		}
 	},
-	"pulseaudio#microphone": {
-		"format": "{format_source}",
-		"format-source": " {volume}%",
-		"format-source-muted": "  Muted",
-		"on-click": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
-		"on-click-right": "pavucontrol",
-		"on-scroll-up": "wpctl set-volume -l 1 @DEFAULT_SOURCE@ 5%+",
-		"on-scroll-down": "wpctl set-volume -l 1 @DEFAULT_SOURCE@ 5%-",
-		"scroll-step": 5
-	},
+	// "pulseaudio#microphone": {
+	// 	"format": "{format_source}",
+	// 	"format-source": " {volume}%",
+	// 	"format-source-muted": "  Muted",
+	// 	"on-click": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
+	// 	"on-click-right": "pavucontrol",
+	// 	"on-scroll-up": "wpctl set-volume -l 1 @DEFAULT_SOURCE@ 5%+",
+	// 	"on-scroll-down": "wpctl set-volume -l 1 @DEFAULT_SOURCE@ 5%-",
+	// 	"scroll-step": 5
+	// },
 	"temperature": {
 		"thermal-zone": 1,
 		"format": " {temperatureC}°C",

waybar/.config/waybar/config.jsonc

@@ -45,21 +45,21 @@
       "custom/wf-recorder",
       "custom/randwall",
       "pulseaudio",
-      "custom/vpn",
+      // "custom/vpn",
       "custom/notification",
       "tray",
       "clock"
     ],
     "output": [
       "HDMI-A-1"
-    ],
-    "custom/vpn": {
-      "format": "{}",
-      "return-type": "json",
-      "interval": 1,
-      "exec": "/home/forbi/.local/bin/vpn",
-      "on-click": "/home/forbi/.local/bin/vpn toggle"
-    }
+    ]
+    // "custom/vpn": {
+    //   "format": "{}",
+    //   "return-type": "json",
+    //   "interval": 1,
+    //   "exec": "/home/forbi/.local/bin/vpn",
+    //   "on-click": "/home/forbi/.local/bin/vpn toggle"
+    // }
   },
   {
     "include": [
@@ -73,10 +73,10 @@
       "custom/playerlabel"
     ],
     "modules-right": [
-      "custom/microphone",
+      // "custom/microphone",
       "custom/randwall",
       "pulseaudio",
-      "custom/vpn",
+      // "custom/vpn",
       "custom/notification",
       "backlight",
       "battery",
@@ -85,20 +85,20 @@
     ],
     "output": [
       "eDP-1"
-    ],
-    "custom/vpn": {
-      "format": "{}",
-      "return-type": "json",
-      "interval": 1,
-      "exec": "/home/forbi/.local/bin/vpn",
-      "on-click": "/home/forbi/.local/bin/vpn toggle"
-    },
-    "custom/microphone": {
-      "format": "{}",
-      "return-type": "json",
-      "exec": "~/.config/waybar/scripts/mic-status.sh --monitor",
-      "restart-interval": 1,
-      "on-click": "pavucontrol -t 4"
-    }
+    ]
+    // "custom/vpn": {
+    //   "format": "{}",
+    //   "return-type": "json",
+    //   "interval": 1,
+    //   "exec": "/home/forbi/.local/bin/vpn",
+    //   "on-click": "/home/forbi/.local/bin/vpn toggle"
+    // }
+    // "custom/microphone": {
+    //   "format": "{}",
+    //   "return-type": "json",
+    //   "exec": "~/.config/waybar/scripts/mic-status.sh --monitor",
+    //   "restart-interval": 1,
+    //   "on-click": "pavucontrol -t 4"
+    // }
   }
 ]

waybar/.config/waybar/style.css

@@ -25,7 +25,7 @@ tooltip {
 #workspaces button {
     color: #fff;
     border-radius: 10px;
-    padding: 0px;
+    padding: 5px;
     margin: 4px 4px;
 }
 

zsh/.config/zsh/.zprofile

@@ -11,5 +11,6 @@ export ZDOTDIR=${ZDOTDIR:-~/.config/zsh}
 if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
     #exec niri
     exec sway
+    # exec niri
 fi
 

zsh/.config/zsh/alias.zsh

@@ -1,6 +1,6 @@
 # Package management
 alias fly='flyctl'
-alias yay="paru --bottomup"
+# alias yay="paru --bottomup"
 alias yeet="sudo pacman -Rns"
 alias orphan="doas pacman -Rns (pacman -Qtdq)"
 
@@ -44,7 +44,6 @@ alias gho="gh browse"
 alias gh-clone='gc'
 alias task='go-task'
 alias sdu='sdm-ui fzf'
-alias fd='/bin/fd'
 
 
 # Tmux
@@ -58,6 +57,8 @@ alias doomconf="vim ~/.config/gzdoom/gzdoom.ini"
 alias pluginconf="vim ~/.config/nvim/plugins.vim"
 alias i3conf="vim ~/.config/i3/config"
 alias cssh="vim ~/.ssh/config"
+alias sm="sublime_merge"
+alias nv = "nix run github:vic/nix-versions --";
 
 function vimwhich {
   nvim $(which $1)

zsh/.config/zsh/completions.zsh

@@ -46,3 +46,45 @@ _kf_completion() {
 
 # Register the completion
 compdef _kf_completion kf
+
+
+_yay_completion() {
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    opts="-Syyu -Syu -Ss -S -R -Q -Si -Sc help install remove list clean"
+
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    return 0
+}
+
+# For zsh:
+_yay_zsh_completion() {
+    local -a opts
+    opts=(
+        '-Syyu:Update system'
+        '-Syu:Update system'
+        '-Ss:Search packages'
+        '-S:Install system-wide'
+        '-R:Remove package'
+        '-Q:List installed'
+        '-Si:Package info'
+        '-Sc:Clean cache'
+        'help:Show help'
+        'install:Install to user env'
+        'remove:Remove from user env'
+        'list:List installed packages'
+        'clean:Clean nix store'
+    )
+    _describe 'yay commands' opts
+}
+
+# Enable completion based on shell
+if [[ -n "${BASH_VERSION:-}" ]]; then
+    complete -F _yay_completion yay
+elif [[ -n "${ZSH_VERSION:-}" ]]; then
+    compdef _yay_zsh_completion yay
+fi
+

zsh/.config/zsh/functions.zsh

@@ -174,15 +174,6 @@ function git-clean() {
   fi
 }
 
-# Open Sublime Merge
-function sm {
-  if [[ ! -f /opt/sublime_merge/sublime_merge ]]; then
-    echo "Error: Sublime Merge not found at /opt/sublime_merge/sublime_merge" >&2
-    return 1
-  fi
-  /opt/sublime_merge/sublime_merge "$@"
-}
-
 # Quick access to Neovim config
 function vimrc {
   if [[ -z "$XDG_CONFIG_HOME" ]]; then
@@ -199,6 +190,22 @@ function vimrc {
   cd "$original_dir"
 }
 
+
+function nixrc {
+  if [[ -z "$XDG_CONFIG_HOME" ]]; then
+    echo "Error: XDG_CONFIG_HOME not set" >&2
+    return 1
+  fi
+
+  local original_dir=$(pwd)
+  cd "$XDG_CONFIG_HOME/nixos" || {
+    echo "Error: Cannot access $XDG_CONFIG_HOME/nixos" >&2
+    return 1
+  }
+  nvim
+  cd "$original_dir"
+}
+
 # Quick access to Zsh config
 function zshrc {
   if [[ -z "$XDG_CONFIG_HOME" ]]; then
@@ -712,4 +719,87 @@ abcdefghijklmnopqrstuvwxyz
 }
 
 
+yay() {
+    case "$1" in
+        # System update
+        update|"-Syu")
+            echo "Updating NixOS system..."
+              nh os switch ~/.config/nixos --update
+            ;;
 
+        # Search packages
+        search|"-Ss")
+            [ -z "$2" ] && { echo "Usage: yay search <package>"; return 1; }
+            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 <package>"; return 1; }
+            echo "Installing $2..."
+            nix-env -iA nixpkgs.$2
+            ;;
+
+        # Remove package
+        remove|"-R")
+            [ -z "$2" ] && { echo "Usage: yay remove <package>"; return 1; }
+            echo "Removing $2..."
+            nix-env -e "$2"
+            ;;
+
+        # List installed packages
+        list|"-Q")
+            echo "Installed packages:"
+            nix-env -q
+            ;;
+
+        # Clean up
+        clean|"-Sc")
+            echo "Cleaning nix store..."
+            nix-collect-garbage
+            sudo nix-collect-garbage -d
+            ;;
+
+        # Help
+        help|"-h")
+            bat -Pp << 'EOF'
+yay - Simple NixOS package manager wrapper
+
+Commands:
+  yay                    Rebuild system
+  yay update             Update system
+  yay search <pkg>       Search packages
+  yay install <pkg>      Install package (user)
+  yay remove <pkg>       Remove package
+  yay list              List installed packages
+  yay clean             Clean package cache
+  yay help              Show this help
+
+Note: For system packages, edit ~/.config/nixos/configuration.nix
+EOF
+            ;;
+
+        # Default: rebuild system
+        "")
+            echo "Rebuilding NixOS system..."
+              nh os switch ~/.config/nixos
+            ;;
+
+        # Try to install unknown commands
+        *)
+            if [[ ! "$1" =~ ^- ]]; then
+                echo "Installing '$1'..."
+                nix-env -iA nixpkgs.$1
+            else
+                echo "Unknown option: $1"
+                echo "Run 'yay help' for available commands"
+                return 1
+            fi
+            ;;
+    esac
+}
+
+function nas() {
+  rclone mount --vfs-cache-mode writes --dir-cache-time 5s --no-check-certificate --allow-other nas: /home/mzunino/nas
+}

zsh/.config/zsh/init.zsh

@@ -76,7 +76,7 @@ source "$PLUGIN_DIR/minimal/minimal.zsh"
 # Source config files
 source "$ZDOTDIR/opts.zsh"
 source "$ZDOTDIR/rose-pine.sh"
-source "$ZDOTDIR/maintenance.zsh"
+#source "$ZDOTDIR/maintenance.zsh"
 
 # Defer loading
 zsh-defer source "$PLUGIN_DIR/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"

zsh/.config/zsh/keymap.zsh

@@ -73,3 +73,19 @@ bindkey "^[[H" beginning-of-line
 bindkey "^[[F" end-of-line
 bindkey "^[[1~" beginning-of-line
 bindkey "^[[4~" end-of-line
+
+# Function to open NixOS config directory
+function edit-nixos-config() {
+    # Store current directory
+    local original_dir="$PWD"
+
+    # Build the command that will cd, run nvim, then cd back
+    BUFFER="cd ~/.config/nixos && nvim . && cd '$original_dir'"
+    zle accept-line
+}
+zle -N edit-nixos-config
+
+# Bind Ctrl+X then C in both insert and command modes
+bindkey -M viins '^xc' edit-nixos-config
+bindkey -M vicmd '^xc' edit-nixos-config
+