summaryrefslogtreecommitdiff
path: root/zshrc
diff options
context:
space:
mode:
Diffstat (limited to 'zshrc')
-rw-r--r--zshrc27
1 files changed, 16 insertions, 11 deletions
diff --git a/zshrc b/zshrc
index 9cff83b..05c3ef5 100644
--- a/zshrc
+++ b/zshrc
@@ -10,8 +10,8 @@ ENABLE_CORRECTION="true"
# Dots for completion
COMPLETION_WAITING_DOTS="true"
-# Plugins
-plugins=(vi-mode git ubuntu tmux)
+# Plugins (add tmux?)
+plugins=(vi-mode git ubuntu)
# Source oh-my-zsh
source $ZSH/oh-my-zsh.sh
@@ -64,7 +64,7 @@ alias purge='sudo apt-get purge'
alias push='git push origin master'
alias pushs='git push --recurse-submodules=check'
alias remove='sudo apt-get autoremove'
-alias tmux="TERM=screen-256color-bce tmux"
+# alias tmux="TERM=screen-256color-bce tmux"
alias update='sudo apt-get update'
alias upgrade='sudo apt-get upgrade'
alias v='vim'
@@ -95,8 +95,6 @@ bindkey '^N' history-beginning-search-forward
# Crontab jobs
crontab ~/.crontab
-TERM=xterm-256color
-# TERM=rxvt-unicode-256color
fancy-ctrl-z () {
if [[ $#BUFFER -eq 0 ]]; then
@@ -122,12 +120,19 @@ fshow() {
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# Set programmer dvorak
-xrdb ~/.Xresources
-# setxkbmap -layout us -variant dvp
+# xrdb ~/.Xresources
+
+TERM=xterm-256color
+
+if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
+ case $(tmux showenv TERM 2>/dev/null) in
+ *256color) ;&
+ TERM=fbterm)
+ TERM=screen-256color ;;
+ *)
+ TERM=screen
+ esac
+fi
# Load external scripts
source ~/github/fzf-marks/fzf-marks.zsh
-source ~/github/z/z.sh
-source ~/github/fzf-extras/fzf-extras.sh
-source ~/github/fzf-extras/fzf-extras.zsh
-