diff --git a/bash/bashrc b/bash/bashrc index 82173e1..ff04e20 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -39,3 +39,8 @@ set_bash_prompt(){ } ## Done, now just set the PS1 prompt :) PROMPT_COMMAND=set_bash_prompt + +## +if hash zsh 2>/dev/null; then + zsh +fi diff --git a/install.sh b/install.sh index ba7df22..59cc637 100644 --- a/install.sh +++ b/install.sh @@ -23,7 +23,6 @@ command_exists () { # Shows warning if required modules are missing system_verify () { - if ! command_exists $1; then printf "${YELLOW_BOLD}Warning:" printf "${PLAIN_BOLD} $1 is not installed\n" diff --git a/vim/plugged/ale b/vim/plugged/ale index 9b5c090..1773a49 160000 --- a/vim/plugged/ale +++ b/vim/plugged/ale @@ -1 +1 @@ -Subproject commit 9b5c09047361f3ec2cf18afbb6d1e03047a59778 +Subproject commit 1773a496ad39fdd3d904679955b39357f3f38442 diff --git a/vim/plugged/deoplete.nvim b/vim/plugged/deoplete.nvim index 2e3f5b5..27af4ab 160000 --- a/vim/plugged/deoplete.nvim +++ b/vim/plugged/deoplete.nvim @@ -1 +1 @@ -Subproject commit 2e3f5b5c24152d9aa4a0299ce6d1b7a6b76327eb +Subproject commit 27af4ab2de157f80c8a8391aebb60061318814ea diff --git a/vim/plugged/nerdtree b/vim/plugged/nerdtree index 1b19089..3a9d533 160000 --- a/vim/plugged/nerdtree +++ b/vim/plugged/nerdtree @@ -1 +1 @@ -Subproject commit 1b19089917cc3e0a81d3294fead2424c419d545c +Subproject commit 3a9d533f3de86a43b69f6c47d3394c0d866fdb08 diff --git a/vim/plugged/vim-airline b/vim/plugged/vim-airline index 6def2f0..c01977d 160000 --- a/vim/plugged/vim-airline +++ b/vim/plugged/vim-airline @@ -1 +1 @@ -Subproject commit 6def2f0a8278410e6a908c491fd428b870d6516e +Subproject commit c01977d027de854c6a85ed5c57915a7e8848f4b9 diff --git a/vim/plugged/vim-gitgutter b/vim/plugged/vim-gitgutter index ff9d134..2e3cd54 160000 --- a/vim/plugged/vim-gitgutter +++ b/vim/plugged/vim-gitgutter @@ -1 +1 @@ -Subproject commit ff9d134f0c69e25d391138036051b2c5e6bac864 +Subproject commit 2e3cd54ed696500bb3722226f2103d4b279272c0 diff --git a/vim/plugged/vim-go b/vim/plugged/vim-go index 007d9bc..cb4c622 160000 --- a/vim/plugged/vim-go +++ b/vim/plugged/vim-go @@ -1 +1 @@ -Subproject commit 007d9bc7786d703dc778de7b69895b8c1907dde7 +Subproject commit cb4c622c97a39652151748c4dec70a46e93a9117 diff --git a/vim/plugged/vim-smoothie b/vim/plugged/vim-smoothie index f83a157..10fd0aa 160000 --- a/vim/plugged/vim-smoothie +++ b/vim/plugged/vim-smoothie @@ -1 +1 @@ -Subproject commit f83a157552a3bf393a7c034df1d21e3555123a4c +Subproject commit 10fd0aa57d176718bc2c570f121ab523c4429a25 diff --git a/vim/plugged/vim-visual-multi b/vim/plugged/vim-visual-multi index 4ca5978..3ea06b6 160000 --- a/vim/plugged/vim-visual-multi +++ b/vim/plugged/vim-visual-multi @@ -1 +1 @@ -Subproject commit 4ca5978e327a8bc021ffd28fd2328ca8ce353305 +Subproject commit 3ea06b623d2234d75a33fed787b9a07a64fff9b2 diff --git a/vim/plugged/vimtex b/vim/plugged/vimtex index 7a25a6b..3e76c81 160000 --- a/vim/plugged/vimtex +++ b/vim/plugged/vimtex @@ -1 +1 @@ -Subproject commit 7a25a6b7f8c51eabe5d4d47951c73fde7d2ece72 +Subproject commit 3e76c81f329cb13b563b9092fb0e5097151bb08b diff --git a/zsh/aliases/tmux-aliases.zsh b/zsh/aliases/tmux-aliases.zsh index e688cbc..a8cf070 100644 --- a/zsh/aliases/tmux-aliases.zsh +++ b/zsh/aliases/tmux-aliases.zsh @@ -79,10 +79,13 @@ function _zsh_tmux_plugin_run() { fi } -# Use the completions for tmux for our function -compdef _tmux _zsh_tmux_plugin_run -# Alias tmux to our wrapper function. -alias tmux=_zsh_tmux_plugin_run +if hash compdef 2>/dev/null; then + # Use the completions for tmux for our function + compdef _tmux _zsh_tmux_plugin_run + # Alias tmux to our wrapper function. + alias tmux=_zsh_tmux_plugin_run +fi + # Autostart if not already in tmux and enabled. if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" ]]; then diff --git a/zsh/p10k.zsh b/zsh/p10k.zsh index 076c776..4dbdc31 100644 --- a/zsh/p10k.zsh +++ b/zsh/p10k.zsh @@ -1564,7 +1564,7 @@ # - verbose: Enable instant prompt and print a warning when detecting console output during # zsh initialization. Choose this if you've never tried instant prompt, haven't # seen the warning, or if you are unsure what this all means. - typeset -g POWERLEVEL9K_INSTANT_PROMPT=verbose + typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload