diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 20bdc42..f745d56 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -20,6 +20,8 @@ Plug 'lifepillar/vim-mucomplete' Plug 'pangloss/vim-javascript' Plug 'mxw/vim-jsx' +Plug 'spolu/dwm.vim' + " Defines the sneak motion Plug 'justinmk/vim-sneak' @@ -48,8 +50,9 @@ set linebreak set laststatus=2 set noshowmode -" CtrlP ignored files +" CtrlP let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|target\|git' +let g:ctrlp_show_hidden = 1 " when running at every change you may want to disable quickfix let g:prettier#quickfix_enabled = 0 @@ -73,9 +76,22 @@ let g:ale_sign_warning = "⚠" "A.L.E Rust Settings "Various settings for Rust let g:ale_linters = {'rust': ['rls']} -let b:ale_fixers = {'javascript': ['prettier', 'eslint'], 'rust': ['rustfmt']} +let b:ale_fixers = {'javascript': ['prettier', 'eslint'], 'rust': ['rustfmt'], 'php': ['php_cs_fixer']} + +let g:ale_fixers = { +\ '*': ['remove_trailing_lines', 'trim_whitespace'], +\ 'javascript': ['prettier', 'eslint'], +\ 'rust': ['rustfmt'], +\ 'php': ['php_cs_fixer'] +\} + let g:ale_rust_rls_executable = '/home/omar/.cargo/bin/rls' let g:ale_rust_rls_toolchain = 'stable' +let g:ale_fix_on_save = 0 + +" NerdTree + +let NERDTreeShowHidden=1 " Colorscheme " colorscheme onedark @@ -121,3 +137,10 @@ nnoremap f :ALEFix nnoremap k gk nnoremap j gj + +" NerdTree bindings +nnoremap n :NERDTreeFocus +" nnoremap :NERDTree +nnoremap :NERDTreeToggle +nnoremap :NERDTreeFind + diff --git a/.zshrc b/.zshrc index b8d583a..7d8cea4 100644 --- a/.zshrc +++ b/.zshrc @@ -11,6 +11,9 @@ export PATH=$PATH:~/sources/scripts/ # Add cargo export PATH=$PATH:~/.cargo/bin +# Add brew +export PATH=/opt/homebrew/bin:$PATH + # LLVM export PATH="/usr/local/opt/llvm/bin:$PATH" export LDFLAGS="-L/usr/local/opt/llvm/lib" @@ -160,6 +163,7 @@ checkout() { alias vim="nvim" alias note='vim ~/data/notes/$(date "+%y-%m-%d").md' +alias vimrc="vim ~/.config/nvim/init.vim" neofetch if command -v pyenv 1>/dev/null 2>&1; then @@ -171,9 +175,11 @@ autoload bashcompinit && bashcompinit # Start X if necessary if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then exec startx; fi +# NVM + 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 +[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # This loads nvm +[ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. export PATH="$PATH:$HOME/.rvm/bin"