From 19285a539dfb6fa8f4324ce24898b0111863ce65 Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Sun, 24 Mar 2024 11:17:47 -0400 Subject: [PATCH] adds: gen alias and env exports, removes some unused scripts --- scripts/scripts/--help | 2 -- scripts/scripts/-h | 2 -- zsh/config/.zshenv | 2 ++ zsh/config/.zshrc | 6 ++++-- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100755 scripts/scripts/--help delete mode 100755 scripts/scripts/-h diff --git a/scripts/scripts/--help b/scripts/scripts/--help deleted file mode 100755 index 6ef54a9..0000000 --- a/scripts/scripts/--help +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/zsh - diff --git a/scripts/scripts/-h b/scripts/scripts/-h deleted file mode 100755 index 6ef54a9..0000000 --- a/scripts/scripts/-h +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/zsh - diff --git a/zsh/config/.zshenv b/zsh/config/.zshenv index f235a57..70278f3 100755 --- a/zsh/config/.zshenv +++ b/zsh/config/.zshenv @@ -32,6 +32,7 @@ export REPOS="$BUCKET/Repos" export GHREPOS="$REPOS/github.com/$GITUSER" export HHEREPOS="$REPOS/github.com/hhe-dev" export LOCAL_REPOS="$REPOS/local" +export LOCAL_ENV="$XDG_DATA_HOME/zsh/env.zsh" export HCP_NOTES="$HHEREPOS/hcp-notes" export HXZET="$BUCKET/Repos/github.com/hvac-hx/hx-zets" export HAAS="$BUCKET/Repos/github.com/haas" @@ -48,6 +49,7 @@ export ZETDIR="$GHREPOS/zets" export MYZSHRC="$ZDOTDIR/.zshrc" export NAP_CONFIG="$HOME/.config/nap/config.yaml" export SKELETONDIR="$DOTFILES/skeleton" +export ANSIBLE_GEN_DIR="$GHREPOS/ansible/ansible-gen-playbook" # NPM export NPM_CONFIG_CACHE="$HOME/.local/npm" diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc index 06571a4..e079394 100755 --- a/zsh/config/.zshrc +++ b/zsh/config/.zshrc @@ -146,6 +146,7 @@ alias ga='git add' alias gcb='git checkout -b' alias gco='git checkout' alias gcm='git commit -a -m' +alias gen='just --justfile "$ANSIBLE_GEN_DIR/justfile"' alias gp='git push' alias gs='git status' alias hn='hugo new' @@ -159,6 +160,7 @@ alias tls='tmux list-sessions' alias temp='cd $(mktemp -d)' alias vi='nvim' alias newxf='~/.local/scripts/newx --function' +alias nlnv='nvim "$LOCAL_ENV"' alias nvim='unset VIMINIT && unset MYVIMRC && nvim' alias nvim-mhoush='NVIM_APPNAME=m-housh && nvim' alias nvim-kickstart='NVIM_APPNAME=kickstart nvim' @@ -169,7 +171,7 @@ alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts" # TODO: The .zshrc-local is a legacy location and should be removed once my machines are # use the new location in XDG_DATA_HOME. # HACK: These need to stay here, otherwise environment overrides do not work properly -# I tried sourcing them in the the `.zshenv` files, but didn't work. +# I tried sourcing them in the the `.zshenv` files, but did not work. _source_if "$ZDOTDIR/.zshrc-local" -_source_if "$XDG_DATA_HOME/zsh/env.zsh" +_source_if "$LOCAL_ENV"