~andrewzah/dotfiles

8c03f11a0c8b3060be37d46de61c60e5f9002f90 — Andrew Zah 1 year, 7 months ago a38f506 debian-x220
update
5 files changed, 28 insertions(+), 15 deletions(-)

M .gitconfig
M .zshrc
M config/nvim/init.vim
M zsh/aliases.zsh
M zsh/path-exports-options.zsh
M .gitconfig => .gitconfig +1 -1
@@ 62,7 62,7 @@
[diff]
    indentHeuristic = on
[log]
  date = relative
	date = iso
[color]
    ui = true
[color "branch"]

M .zshrc => .zshrc +0 -9
@@ 1,5 1,3 @@
export ZSH=$HOME/.oh-my-zsh

local zsh_files=$HOME/.dotfiles/zsh
source $zsh_files/aliases.zsh
source $zsh_files/config.zsh


@@ 11,11 9,4 @@ if [ -f $zsh_files/secret-exports.zsh ]; then
  source $zsh_files/secret-exports.zsh
fi

ZSH_THEME="zah"
source $ZSH/oh-my-zsh.sh

plugins=(gitfast)

PATH=$(printf "%s" "$PATH" | awk -v RS=':' '!a[$1]++ { if (NR > 1) printf RS; printf $1 }')

[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

M config/nvim/init.vim => config/nvim/init.vim +11 -1
@@ 6,9 6,13 @@ end

call plug#begin('~/.vim/plugged')

""" Syntaxes
Plug 'vim-scripts/django.vim'

""" Vim Behavior/Functionality
Plug 'bkad/CamelCaseMotion'
Plug 'alok/notational-fzf-vim'
Plug 'bhurlow/vim-parinfer', {'for': 'clojure' }
Plug 'bkad/CamelCaseMotion'
Plug 'chrisbra/NrrwRgn', { 'on': ['<plug>(nrrwrgn#NrrwRgn)'] }
Plug 'godlygeek/tabular'
Plug 'junegunn/fzf'


@@ 131,6 135,9 @@ let g:clojure_conceal_extras = 1
" Rainbow brackets/parens
let g:rainbow_active = 1

" notational fzf vim
let g:nv_search_paths = ['~/Sync/thoughts', '~/Sync/thoughts/programming', '~/Sync/thoughts/korean']

let g:fzf_tags_command = 'ctags --extra=+f -R .git/tags'

" gruvbox coloring for fzf


@@ 241,6 248,9 @@ vnoremap <C-c> "+y
nnoremap <silent> <Leader><Leader> V
vnoremap <Leader><Leader> <Esc>

" notational fzf vim
nnoremap <silent> <Leader>e :NV<CR>

" When pressing <leader>cd switch to the directory of the open buffer
nnoremap <Leader>cd :lcd %:p:h<CR>:pwd<CR>


M zsh/aliases.zsh => zsh/aliases.zsh +2 -2
@@ 21,8 21,8 @@ alias dcd='docker-compose down'
alias dcb='docker-compose build'

# local system
alias cdr='~/Work/repos'
alias cda='~/Work/repos/cyber/cyber-server/api-server'
alias cdr='~/Work'
alias cda='~/Work/afml'

alias cdp='~/Programming'
alias cdw='~/Website'

M zsh/path-exports-options.zsh => zsh/path-exports-options.zsh +14 -2
@@ 18,8 18,20 @@ export GOROOT=/usr/local/go
export GOPATH=$HOME/go
export PATH=$GOROOT/bin:$GOPATH/bin:$PATH

# anaconda
export PATH=/home/andrew/anaconda3/bin:$PATH
# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
#__conda_setup="$('/home/andrew/.miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
#if [ $? -eq 0 ]; then
    #eval "$__conda_setup"
#else
    #if [ -f "/home/andrew/.miniconda3/etc/profile.d/conda.sh" ]; then
        #. "/home/andrew/.miniconda3/etc/profile.d/conda.sh"
    #else
        #export PATH="/home/andrew/.miniconda3/bin:$PATH"
    #fi
#fi
#unset __conda_setup
# <<< conda initialize <<<

# nix
# source ~/.nix-profile/etc/profile.d/nix.sh