Browse Source

dev: automated commit - 2026-03-10 21:48:49

Mariano Z. 2 weeks ago
parent
commit
97ea95adcf

+ 12 - 10
config/.config/env

@@ -1,17 +1,20 @@
-export EDITOR="nvim"
-
-# Basic environment variables
-export TERMINAL="alacritty"
-export LANG=en_US.UTF-8
-
-export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-
-# XDG Base Directory Spec
+# XDG Base Directory Spec (must come first)
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
 export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
 
+# GPG configuration (must come before SSH_AUTH_SOCK)
+export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
+
+# SSH via GPG agent
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+
+# Basic environment variables
+export EDITOR="nvim"
+export TERMINAL="alacritty"
+export LANG=en_US.UTF-8
+
 # Program-specific XDG configurations
 export W3M_DIR=$XDG_DATA_HOME/w3m
 export RANDFILE=$XDG_CACHE_HOME/.rnd
@@ -31,7 +34,6 @@ export JAVA_HOME="/usr/lib/jvm/default"
 # export AWS_CONFIG_FILE="${XDG_CONFIG_HOME}/aws/config"
 export CARGO_HOME="${XDG_DATA_HOME}/cargo"
 export HISTFILE="${XDG_DATA_HOME}/bash/history"
-export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
 export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
 export _JAVA_OPTIONS="-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java"
 export _JAVA_OPTIONS="-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java"

+ 2 - 1
niri/.config/niri/config.d/binds.kdl

@@ -7,6 +7,7 @@ binds {
     Mod+U { spawn-sh "~/.local/bin/nscratch -id 'uy.com.mzunino' -s 'alacritty --class=uy.com.mzunino'"; }
     Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
     Mod+N { spawn-sh "~/.local/bin/niri-launch-or-focus --class sdm-connect alacritty -e /home/mzunino/.local/share/go/bin/sdm-tui "; }
+    Mod+Shift+k { spawn-sh "~/.local/bin/niri-launch-or-focus --class k9s alacritty -e k9s "; }
     Mod+E { spawn-sh "~/.local/bin/niri-launch-or-focus thunar"; }
     Mod+Shift+N { spawn-sh "~/.local/bin/dotedit"; }
     Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
@@ -48,7 +49,7 @@ binds {
     Mod+Shift+Right { move-column-right; }
     Mod+Shift+H     { move-column-left; }
     Mod+Shift+J     { move-window-down; }
-    Mod+Shift+K     { move-window-up; }
+    // Mod+Shift+K     { move-window-up; }
     Mod+Shift+L     { move-column-right; }
 
     Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }

+ 2 - 0
zsh/.config/zsh/.zshrc

@@ -19,3 +19,5 @@ else
         zsh-defer _refresh_compinit
     fi
 fi
+
+if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi

+ 1 - 0
zsh/.config/zsh/alias.zsh

@@ -43,6 +43,7 @@ alias g='git'
 alias gho="gh browse"
 alias gh-clone='gc'
 alias task='go-task'
+alias j='just'
 alias sdu='sdm-ui fzf'
 
 

+ 5 - 0
zsh/.config/zsh/completions/external.zsh

@@ -42,6 +42,11 @@ if which drop >/dev/null 2>&1; then
     eval "$(drop completion zsh)"
 fi
 
+if which just >/dev/null 2>&1; then
+    eval "$(just --completions zsh)"
+    compdef _just j
+fi
+
 _lazy_load() {
   local cmd="$1"
   local loader="$2"

+ 7 - 2
zsh/.config/zsh/init.zsh

@@ -1,6 +1,10 @@
 PLUGIN_DIR="$HOME/.local/share/zsh/plugins"
 mkdir -p "$PLUGIN_DIR"
 
+# GPG agent for SSH authentication (smartcard)
+export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1 || true
+
 plugins=(
   "blimmer/zsh-aws-vault"
   "romkatv/zsh-defer"
@@ -78,7 +82,7 @@ source "$ZDOTDIR/opts.zsh"
 
 source "$ZDOTDIR/tmux.zsh"
 
-zsh-defer _batch_defer "$ZDOTDIR/alias.zsh" "$ZDOTDIR/keymap.zsh" "$ZDOTDIR/path.zsh" "$ZDOTDIR/pnpm.zsh" "$ZDOTDIR/mise.zsh"
+zsh-defer _batch_defer "$ZDOTDIR/alias.zsh" "$ZDOTDIR/path.zsh" "$ZDOTDIR/pnpm.zsh" "$ZDOTDIR/mise.zsh"
 
 local func_files=("$ZDOTDIR/functions"/*.zsh)
 zsh-defer _batch_defer "${func_files[@]}" "$ZDOTDIR/completions/external.zsh"
@@ -88,7 +92,8 @@ zsh-defer _batch_defer \
     "$PLUGIN_DIR/fzf-tab/fzf-tab.plugin.zsh" \
     "$PLUGIN_DIR/fzf/shell/completion.zsh" \
     "$PLUGIN_DIR/fzf/shell/key-bindings.zsh" \
-    "$PLUGIN_DIR/vim/vim.plugin.zsh"
+    "$PLUGIN_DIR/vim/vim.plugin.zsh" \
+    "$ZDOTDIR/keymap.zsh"
 
 _compile_zsh_files() {
     (

+ 17 - 0
zsh/.config/zsh/keymap.zsh

@@ -57,6 +57,23 @@ zle -N edit-command-line
 bindkey -M vicmd "v" edit-command-line
 
 # ===== Additional Useful Bindings =====
+function fzf-dev-repos-widget() {
+  local dir
+  dir=$(fd -d 2 -t d . ~/Dev | fzf --reverse --height 40% --min-height 20)
+  if [[ -z "$dir" ]]; then
+    zle redisplay
+    return 0
+  fi
+  zle push-line
+  BUFFER="builtin cd -- ${(q)dir:a}"
+  zle accept-line
+  zle reset-prompt
+}
+
+zle -N fzf-dev-repos-widget
+bindkey -M emacs '^T' fzf-dev-repos-widget
+bindkey -M vicmd '^T' fzf-dev-repos-widget
+bindkey -M viins '^T' fzf-dev-repos-widget
 
 # Ctrl+Space to accept autosuggestion
 bindkey '^ ' autosuggest-accept