diff --git a/lib/nixos/home-manager/modules/espanso/matches.nix b/lib/nixos/home-manager/modules/espanso/matches.nix index 57d643af..122bbb7b 100644 --- a/lib/nixos/home-manager/modules/espanso/matches.nix +++ b/lib/nixos/home-manager/modules/espanso/matches.nix @@ -38,6 +38,10 @@ trigger = ":gt"; replace = "Great, thanks!"; } + { + trigger = ":guest"; + replace = "If you'd like to be a guest on ${baseUrl}/podcast and talk about ..., I'd love to have you on the show."; + } { trigger = ":lh"; replace = "http://localhost"; diff --git a/lib/shared/modules/zsh/abbreviations.zsh b/lib/shared/modules/zsh/abbreviations.zsh index 79299e4e..0868794f 100644 --- a/lib/shared/modules/zsh/abbreviations.zsh +++ b/lib/shared/modules/zsh/abbreviations.zsh @@ -1,21 +1,34 @@ -abbr dea="direnv allow" -abbr dee="direnv edit" +abbr c="clear" abbr cs="create-script" abbr daily="run create-daily next" -abbr switch="run nixos nixedo switch" +abbr rst="rst2pdf" abbr sz="source ~/.config/zsh/.zshrc" +abbr ti="timer" +abbr v="nvim" abbr evl="export-video-list" abbr vv="cat ~/Documents/videos.json" abbr g="git" abbr ga="git add" +abbr gb="git blame" +abbr gan="git add -N" abbr gap="git add -p" abbr gc="git commit" +abbr gca="git commit --amend" +abbr gcm="git commit -m" +abbr gd="git diff" +abbr gf="git fetch" +abbr gfa="git fetch --all" +abbr gl="git log" +abbr glo="git log --oneline" +abbr gls="git log --stat" abbr gpl="git pull" abbr gps="git push" abbr gri="git rebase -i" abbr gs="git status" +abbr gsh="git show" +abbr gst="git status" # tmux abbr ta="tmux attach" @@ -45,15 +58,30 @@ abbr dkcb="docker compose build" abbr dkcu="docker compose up" abbr dkclean="docker ps -q -a -f status=exited | xargs -r docker rm && docker images -q -f dangling=true | xargs -r docker rmi" +# Nix and direnv. +abbr dea="direnv allow" +abbr dee="direnv edit" +abbr nxf="nix flake" +abbr nxfc="nix flake check" +abbr nxfs="nix flake show" +abbr nxfu="nix flake update" +abbr nxr="nix run nixpkgs#%" +abbr nxs="nix shell nixpkgs#%" + # run scripts. abbr r="run" abbr rc="run composer" abbr rd="run drush" -abbr rdcr="run drush cr" -abbr rdup="run drush updb -y" abbr rdce="run drush config:export -y" abbr rdci="run drush config:import -y" +abbr rdcr="run drush cache:rebuild" +abbr rdscr="run drush php:script" abbr rduli="run drush uli" +abbr rdup="run drush updatedb -y" + +abbr clh="curl localhost:%" +abbr clh3="curl localhost:3000%" +abbr clh8="curl localhost:8000%" abbr -g A1="| awk '{print $1}'" abbr -g C="| xclip -sel clip" @@ -65,9 +93,5 @@ abbr -g Gi="| grep -i" abbr -g H2="| head -n 20" abbr -g H="| head" abbr -g L="| less" -abbr -g V="| vim -" +abbr -g V="| nvim -" abbr -g X="| xargs -I1" - -abbr clh="curl localhost:%" -abbr clh3="curl localhost:3000%" -abbr clh8="curl localhost:8000%" diff --git a/lib/shared/modules/zsh/aliases.nix b/lib/shared/modules/zsh/aliases.nix index c7f58135..d77a62d6 100644 --- a/lib/shared/modules/zsh/aliases.nix +++ b/lib/shared/modules/zsh/aliases.nix @@ -1,4 +1,5 @@ { + "$" = ""; "-" = "cd -"; ".." = "cd .."; "..." = "cd ../.."; @@ -8,6 +9,6 @@ s = "secrets"; secrets = ''doppler --project "$(whoami)" run''; tag = "tag-release"; - wt = "git worktree"; vss = "LC_ALL=C sort --unique $REPOS/opdavies.nvim/spell/en.utf-8.add --output $REPOS/opdavies.nvim/spell/en.utf-8.add"; + wt = "git worktree"; }