feat(zsh): various fixes
This commit is contained in:
		@@ -1 +1,2 @@
 | 
				
			|||||||
export PATH="/usr/local/bin:/opt/homebrew/bin:$Home/neovim/bin:${PATH}"
 | 
					export PATH="/usr/local/bin:/opt/homebrew/bin:$HOME/neovim/bin:$HOME/bin:${PATH}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,3 +37,11 @@ command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
 | 
				
			|||||||
# poetry
 | 
					# poetry
 | 
				
			||||||
export POETRY_HOME="$XDG_DATA_HOME/poetry"
 | 
					export POETRY_HOME="$XDG_DATA_HOME/poetry"
 | 
				
			||||||
command -v poetry >/dev/null || export PATH="$POETRY_HOME/bin:$PATH"
 | 
					command -v poetry >/dev/null || export PATH="$POETRY_HOME/bin:$PATH"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# gnupg
 | 
				
			||||||
 | 
					export GPG_TTY=$TTY
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# aflabs
 | 
				
			||||||
 | 
					export USER_UID=$(id -u)
 | 
				
			||||||
 | 
					export USER_GID=$(id -g)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,9 +39,6 @@ eval "$(pyenv virtualenv-init -)"
 | 
				
			|||||||
# ggman
 | 
					# ggman
 | 
				
			||||||
eval "$(ggman shellrc)"
 | 
					eval "$(ggman shellrc)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# gpg
 | 
					 | 
				
			||||||
export GPG_TTY=$(tty)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# custom functions and aliases
 | 
					# custom functions and aliases
 | 
				
			||||||
source "$ZDOTDIR/aliases.zsh"
 | 
					source "$ZDOTDIR/aliases.zsh"
 | 
				
			||||||
source "$ZDOTDIR/scripts.zsh"
 | 
					source "$ZDOTDIR/scripts.zsh"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,8 +1,9 @@
 | 
				
			|||||||
alias s="ssh"
 | 
					alias s="ssh"
 | 
				
			||||||
alias z="exec zsh"
 | 
					alias z="exec zsh"
 | 
				
			||||||
alias t="tmux a || tmux new-session -s janezicmatej -c ~"
 | 
					alias t="tmux a || tmux new-session -s $(whoami) -c ~"
 | 
				
			||||||
alias n=nvim_ve
 | 
					alias n=nvim_ve
 | 
				
			||||||
# alias vim=nvim_ve
 | 
					# alias vim=nvim_ve
 | 
				
			||||||
 | 
					alias ssh-hosts="grep -P \"^Host ([^*]+)$\" $HOME/.ssh/config | sed 's/Host //'"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# navigation
 | 
					# navigation
 | 
				
			||||||
alias cdgit="cd $GGROOT"
 | 
					alias cdgit="cd $GGROOT"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,7 +53,7 @@ function pyinit {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  DIRNAME=$(basename "$PWD")
 | 
					  DIRNAME=$(basename "$PWD")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if [[ $(pyenv versions | grep "$DIRNAME") ]]; then
 | 
					  if [[ $(pyenv versions | grep -E "/${DIRNAME}$") ]]; then
 | 
				
			||||||
    echo "found existing version with this name, setting..."
 | 
					    echo "found existing version with this name, setting..."
 | 
				
			||||||
    pyenv local "$DIRNAME"
 | 
					    pyenv local "$DIRNAME"
 | 
				
			||||||
    return
 | 
					    return
 | 
				
			||||||
@@ -101,7 +101,7 @@ function get_dump {
 | 
				
			|||||||
    return
 | 
					    return
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  selected=$(ssh "$1" docker ps --filter image=postgres:* --format "{{.Names}}" | fzf)
 | 
					  selected=$(ssh "$1" docker ps --format "{{.Names}}" | fzf)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if [[ -z $selected ]]; then
 | 
					  if [[ -z $selected ]]; then
 | 
				
			||||||
    return
 | 
					    return
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user