Push dotfiles as of november 2021

.gitconfig

@@ -2,7 +2,33 @@
 	email = [email protected]
 	name = Romain Bertrand
 [core]
+	; pager = diff-so-fancy | less --tabs=4 -RFX
 	pager = cat
 	editor = vim
 [fetch]
 	prune = true
+[color]
+	ui = true
+[color "diff-highlight"]
+	oldNormal = red bold
+	oldHighlight = red bold 52
+	newNormal = green bold
+	newHighlight = green bold 22
+[color "diff"]
+	meta = 11
+	frag = magenta bold
+	commit = yellow bold
+	old = red bold
+	new = green bold
+	whitespace = red reverse
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[init]
+	defaultBranch = master
+[pull]
+	rebase = true
+[rebase]
+	autoStash = true

.tmux.conf

@@ -1,10 +1,9 @@
 # mostly stolen from : https://github.com/chrishunt/dot-files/blob/master/.tmux.conf
 
-
 set-option -g default-terminal screen-256color
 set-option -g history-limit 5000
 setw -g mode-keys vi
-#setw -g mode-mouse off
+# set mouse off
 
 # decrease command delay (increases vim responsiveness)
 set -sg escape-time 1
@@ -52,4 +51,7 @@ unbind r
 bind r source-file ~/.tmux.conf \; display "Reloaded!"
 
 # fedora: dnf install tmux-powerline
-source "/usr/share/tmux/powerline.conf"
+#source "/usr/share/tmux/powerline.conf"
+
+set -g @tmux_power_theme 'sky'
+run-shell "/Users/romain/.tmux/tmux-power/tmux-power.tmux"

.zshrc

@@ -1,17 +1,37 @@
 ZSH=$HOME/.oh-my-zsh
-ZSH_THEME="avit"
-plugins=(asdf git bundler gem themes)
+autoload -U promptinit; promptinit
+prompt pure
+# ZSH_THEME="avit"
+#plugins=(asdf git bundler gem themes)
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+plugins=(git bundler gem rbenv nvm)
 source $ZSH/oh-my-zsh.sh
 
-export EDITOR=vim
+export EDITOR=nvim
 export TERM=xterm-256color
-export PATH="/usr/local/bin:$HOME/bin:$PATH"
+export PATH="/usr/local/bin:/usr/local/sbin:$HOME/bin:$HOME/bin/elasticsearch-6.8.18/bin:/Applications/Postgres.app/Contents/Versions/latest/bin:$PATH"
 
 # magical line to fix the weird colors with `ls` (like black background of dirs)
 #eval $(dircolors -p | perl -pe 's/^((CAP|S[ET]|O[TR]|M|E)\w+).*/$1 00/' | dircolors -)
 
+# TODO: make a version with fallback to ls
+alias ls="exa -hgbH --git --group-directories-first"
+alias la="exa -lahgbH --git --group-directories-first"
+
+alias tmx="tmuxinator"
 alias vim="nvim"
 alias vimrc="vim ~/.config/nvim/init.vim"
+alias zshrc="vim ~/.zshrc"
 alias gfp="git fetch -p --all"
 alias gpr="git pull --rebase"
 alias tiga="tig --all"
+alias ag="rg"
+alias rc="bundle exec rails console"
+alias rs="bundle exec rails server"
+alias rt="bundle exec rails test"
+alias rr="bundle exec rails routes"
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion