Skip to content

Commit 3be10cd

Browse files
committed
update zshrc
- remove: Fig integration - was conflicting with vim-tmux-navigation - ref: withfig/fig#460 - possible solution here: christoomey/vim-tmux-navigator#295 (comment) - will come back to this later... - set: a default editor - add: some aliases
1 parent 533d67a commit 3be10cd

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

commons/dev-environment/.zshrc

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Fig pre block. Keep at the top of this file.
2-
[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
31
# If you come from bash you might have to change your $PATH.
42
# export PATH=$HOME/bin:/usr/local/bin:$PATH
53

@@ -99,11 +97,11 @@ source $ZSH/oh-my-zsh.sh
9997
# export LANG=en_US.UTF-8
10098

10199
# Preferred editor for local and remote sessions
102-
# if [[ -n $SSH_CONNECTION ]]; then
103-
# export EDITOR='vim'
104-
# else
105-
# export EDITOR='mvim'
106-
# fi
100+
if [[ -n $SSH_CONNECTION ]]; then
101+
export EDITOR='vim'
102+
else
103+
export EDITOR='nvim'
104+
fi
107105

108106
# Compilation flags
109107
# export ARCHFLAGS="-arch x86_64"
@@ -117,8 +115,9 @@ source $ZSH/oh-my-zsh.sh
117115
# alias zshconfig="mate ~/.zshrc"
118116
# alias ohmyzsh="mate ~/.oh-my-zsh"
119117
alias zshconfig="nvim ~/.zshrc"
120-
alias tmuxconfig="nvim ~/.tmux.conf"
121-
alias vimconfig="nvim ~/.vimrc"
118+
alias tmuxconfig="nvim ~/.config/tmux/tmux.conf"
119+
alias powerlineconfig="cd ~/.config/tmux-powerline; nvim ."
120+
alias vimconfig="vim ~/.vimrc"
122121
alias nvimconfig="cd ~/.config/nvim; nvim ."
123122

124123
alias projects="cd ~/workspace/projects/; ls"
@@ -177,6 +176,3 @@ alias prototypes="cd ~/workspace/prototypes/; ls"
177176

178177
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
179178
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
180-
181-
# Fig post block. Keep at the bottom of this file.
182-
[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"

0 commit comments

Comments
 (0)