Skip to content

Commit

Permalink
screenfetch too slow, add completions for some commands
Browse files Browse the repository at this point in the history
  • Loading branch information
karlmutch committed Jan 1, 2022
1 parent 693b6ca commit 0613a2f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 22 deletions.
2 changes: 1 addition & 1 deletion tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -233,5 +233,5 @@ if-shell "[ -f ~/.tmux.conf.local ]" 'source ~/.tmux.conf.local'
run '~/.tmux/plugins/tpm/tpm'

# Fig Tmux Integration: Enabled
source-file ~/.fig/tmux
if-shell "[ -f ~/.fig/tmux ]" 'source-file ~/.fig/tmux'
# End of Fig Tmux Integration
2 changes: 1 addition & 1 deletion zsh.rc/99-title
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# screenfetch informational title when logging in
if hash screenfetch 2>/dev/null; then
screenfetch
# screenfetch
fi

#!/usr/bin/env zsh
Expand Down
45 changes: 25 additions & 20 deletions zshrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#### FIG ENV VARIABLES ####
# Please make sure this block is at the start of this file.
[ -s ~/.fig/shell/pre.sh ] && source ~/.fig/shell/pre.sh
Expand Down Expand Up @@ -177,7 +176,6 @@ zstyle ':completion:*' rehash true
# You may need to manually set your language environment
# export LANG=en_US.UTF-8


LOCALRC=~/.zsh.rc.local
GLOBALRC=~/.zsh.rc

Expand Down Expand Up @@ -209,10 +207,6 @@ done

source $ZSH/oh-my-zsh.sh

# source <(fly completion --shell zsh) || true
source <(kubectl completion zsh) || true
source <(eksctl completion zsh) || true

export EDITOR='vim'
# else
# export EDITOR='mvim'
Expand Down Expand Up @@ -256,31 +250,42 @@ if [[ "$UbuntuWindows" == "1" ]] ; then
fi

if [[ "$UbuntuLinux" == "1" ]] ; then
type kubectl
type kubectl > /dev/null
if [[ $? -eq 0 ]] ; then
shell_type=${SHELL##*/}
source <(kubectl completion $shell_type)
fi
fi

if [[ "$UbuntuLinux" == "1" ]] ; then
type fly > /dev/null
if [[ $? -eq 0 ]] ; then
shell_type=${SHELL##*/}
source <(fly completion --shell $shell_type)
fi
fi

if [[ "$UbuntuLinux" == "1" ]] ; then
type eksctl > /dev/null
if [[ $? -eq 0 ]] ; then
shell_type=${SHELL##*/}
source <(eksctl completion $shell_type)
fi
fi

if [[ "$UbuntuLinux" == "1" ]] ; then
type nerdctl > /dev/null
if [[ $? -eq 0 ]] ; then
shell_type=${SHELL##*/}
source <(nerdctl completion $shell_type)
fi
fi

eval "$(direnv hook zsh)"

# Remove an oh-my-zsh alias to allow the go lang based grv git client to be used
unalias grv

# added by travis gem
[ -f /home/kmutch/.travis/travis.sh ] && source /home/kmutch/.travis/travis.sh

# tmux support now done using the oh-my-zsh tmux plugin
#
#if [[ -n $TMUX_PANE ]]; then
#else
# if [[ "$OSX" != "1" ]]; then
# tmux new-session -s base \; new-window "tmux set-option -ga terminal-overrides \",$TERM:Tc\"; tmux detach"
# tmux attach -t base
# fi
#fi

# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/home/kmutch/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
Expand Down

0 comments on commit 0613a2f

Please sign in to comment.