Skip to content

Commit

Permalink
update zshrc
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
saifazmi committed Feb 11, 2024
1 parent 533d67a commit 3be10cd
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions commons/dev-environment/.zshrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Fig pre block. Keep at the top of this file.
[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH

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

# Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim'
# else
# export EDITOR='mvim'
# fi
if [[ -n $SSH_CONNECTION ]]; then
export EDITOR='vim'
else
export EDITOR='nvim'
fi

# Compilation flags
# export ARCHFLAGS="-arch x86_64"
Expand All @@ -117,8 +115,9 @@ source $ZSH/oh-my-zsh.sh
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
alias zshconfig="nvim ~/.zshrc"
alias tmuxconfig="nvim ~/.tmux.conf"
alias vimconfig="nvim ~/.vimrc"
alias tmuxconfig="nvim ~/.config/tmux/tmux.conf"
alias powerlineconfig="cd ~/.config/tmux-powerline; nvim ."
alias vimconfig="vim ~/.vimrc"
alias nvimconfig="cd ~/.config/nvim; nvim ."

alias projects="cd ~/workspace/projects/; ls"
Expand Down Expand Up @@ -177,6 +176,3 @@ alias prototypes="cd ~/workspace/prototypes/; ls"

# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

# Fig post block. Keep at the bottom of this file.
[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"

0 comments on commit 3be10cd

Please sign in to comment.