summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tmux/.tmux.conf5
-rw-r--r--zsh/.zshrc33
2 files changed, 6 insertions, 32 deletions
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index bb603a9..eac0eb5 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,4 +1,4 @@
-set -g default-terminal xterm-256color
+set -g default-terminal "screen-256color"
set -g status on
set -g mouse on
@@ -23,3 +23,6 @@ bind C-p previous-window
bind-key -n C-S-Left swap-window -t -1
bind-key -n C-S-Right swap-window -t +1
+
+set -g status-bg colour18
+set -g status-fg colour2
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 8fb638c..d809354 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,5 +1,5 @@
-# Write tmp file if it doesn't exist
-[[ ! -f ~/.zsh/tmp ]] && echo "export COLORSCHEME=dark" > ~/.zsh/tmp
+export PATH="${PATH}:$HOME/bin"
+export EDITOR=/usr/bin/nvim
# Source configuration files
source "$HOME/.zsh/plugins"
@@ -12,23 +12,6 @@ bindkey -a 'j' history-beginning-search-forward
bindkey '^P' history-beginning-search-backward
bindkey '^N' history-beginning-search-forward
-# Paths of executables
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/bin/core_perl:$HOME/bin"
-
-# Editor
-export EDITOR=/usr/bin/nvim
-
-# Fix tmux colors
-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
-
# Export GPG-agent related
if [[ -f "${HOME}/.gpg-agent-info" ]]; then
source ${HOME}/.gpg-agent-info
@@ -36,16 +19,4 @@ if [[ -f "${HOME}/.gpg-agent-info" ]]; then
export SSH_AUTH_SOCK
fi
-
-# Tmux colors fix
-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
-
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh