M .config/git/config => .config/git/config +5 -1
@@ 1,5 1,5 @@
[user]
- email = mr@mrls.xyz
+ email = contact@mauromorales.com
name = Mauro Morales
[core]
editor = nvim
@@ 19,6 19,8 @@
# list files which have changed since REVIEW_BASE
# (REVIEW_BASE defaults to 'master' in my zshrc)
files = !git diff --name-only $(git merge-base HEAD $REVIEW_BASE)
+ # untracked files
+ uf = !git ls-files --others --exclude-standard
# Same as above, but with a diff stat instead of just names
# (better for interactive use)
stat = !git diff --stat $(git merge-base HEAD $REVIEW_BASE)
@@ 32,3 34,5 @@
# git reviewone foo.js bar.js
reviewone = !nvim -p +\"tabdo Gdiff $REVIEW_BASE\" +\"let g:gitgutter_diff_base = '$REVIEW_BASE'\"
what = !hub-pr-what
+ # List the files that changed between two branches
+ lc = !git diff --name-only $REVIEW_BASE...$(git branch --show-current)
M .config/nvim/init.vim => .config/nvim/init.vim +36 -28
@@ 1,8 1,9 @@
" Plugins
-call plug#begin('~/.vim/plugged')
-Plug 'dracula/vim', { 'as': 'dracula' }
-Plug 'endel/vim-github-colorscheme'
-Plug 'fatih/molokai'
+call plug#begin('~/.config/nvim/plugged')
+Plug 'NLKNguyen/papercolor-theme'
+Plug 'rakr/vim-one'
+Plug 'nanotech/jellybeans.vim'
+Plug 'olivertaylor/vacme'
" IDE like functionality
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
@@ 14,19 15,24 @@ Plug '907th/vim-auto-save'
Plug 'w0rp/ale'
Plug 'tpope/vim-surround'
Plug 'tpope/vim-eunuch'
+Plug 'tpope/vim-dadbod'
Plug 'AndrewRadev/splitjoin.vim'
Plug 'tpope/gem-browse'
-Plug 'tpope/vim-rake'
-Plug 'tpope/vim-bundler'
Plug 'matze/vim-move'
Plug 'easymotion/vim-easymotion'
Plug 'mhinz/vim-signify'
Plug 'ruanyl/vim-gh-line'
+Plug 'Shougo/neosnippet.vim'
+Plug 'Shougo/neosnippet-snippets'
+Plug 'tpope/vim-commentary'
+Plug 'sheerun/vim-polyglot'
"Plug 'ctrlpvim/ctrlp.vim'
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'junegunn/fzf.vim'
Plug 'gabesoft/vim-ags'
" Ruby plugins
+Plug 'tpope/vim-bundler'
+Plug 'tpope/vim-rake'
Plug 'fishbullet/deoplete-ruby', { 'for': 'ruby' }
Plug 'vim-scripts/Specky', { 'for': 'ruby' }
Plug 'vim-ruby/vim-ruby', { 'for': ['ruby', 'haml', 'eruby'] }
@@ 39,8 45,6 @@ Plug 'fatih/vim-go'
Plug 'zchee/deoplete-go', { 'do': ':make' }
" JS plugins
Plug 'pangloss/vim-javascript', { 'for': 'javascript' }
-" Elixir plugins
-Plug 'elixir-editors/vim-elixir', { 'for': 'elixir' }
" Misc plugins
Plug 'hashivim/vim-terraform'
Plug 'juliosueiras/vim-terraform-completion'
@@ 48,6 52,7 @@ Plug 'juliosueiras/vim-terraform-completion'
Plug 'elzr/vim-json'
Plug 'vim-pandoc/vim-pandoc'
Plug 'vim-pandoc/vim-pandoc-syntax'
+Plug 'diepm/vim-rest-console'
call plug#end()
" Vim config
@@ 65,8 70,8 @@ set visualbell
set ttyfast
set ruler
set backspace=indent,eol,start
-set nonumber
-set norelativenumber
+set number
+set relativenumber
set laststatus=2
set history=1000
set undofile
@@ 88,16 93,28 @@ set diffopt+=vertical
set cursorline
set clipboard=unnamedplus
+" highlight DiffAdd cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
+" highlight DiffDelete cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
+" highlight DiffChange cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
+" highlight DiffText cterm=bold ctermfg=10 ctermbg=88 gui=none guifg=bg guibg=Red
+
nnoremap <leader>ev <C-w><C-v><C-l>:e $MYVIMRC<cr>
nnoremap <leader>sv :source $MYVIMRC<cr>
nnoremap <leader>cfp :let @* = expand("%")<cr>
-nnoremap <leader>of :GFiles<cr>
+nnoremap <leader>of :Files<cr>
+nnoremap <leader>ogf :GFiles<cr>
+
+let g:neosnippet#snippets_directory='~/.config/nvim/plugged/neosnippet-snippets'
+let g:deoplete#enable_at_startup = 1
+imap <C-k> <Plug>(neosnippet_expand_or_jump)
+smap <C-k> <Plug>(neosnippet_expand_or_jump)
+xmap <C-k> <Plug>(neosnippet_expand_target)
+set t_Co=256
set background=dark
-colorscheme dracula
-" set number
+colorscheme PaperColor
" set noshowmode
au VimResized * :wincmd =
autocmd Filetype gitcommit setlocal spell textwidth=72
@@ 146,6 163,7 @@ let g:deoplete#sources#go#sort_class = ['package', 'func', 'type', 'var', 'const
let g:go_gocode_autobuild = 1
nnoremap <leader>nt :NERDTreeToggle<CR>
+nnoremap <leader>nf :NERDTreeFind<CR>
nnoremap <leader>tt :TagbarToggle<CR>
nnoremap <Leader>ct :!ripper-tags -R --exclude=vendor --exclude=node_modules<CR>
nnoremap <Leader>ag :Ags
@@ 180,6 198,7 @@ let g:lightline.active = { 'right': [
\ [ 'fileformat', 'fileencoding', 'filetype' ]
\ ] }
+let g:ale_linters = {}
let g:ale_fixers = {}
let g:ale_fix_on_save = 1
@@ 192,6 211,7 @@ let g:gitgutter_realtime = 0
let g:gitgutter_eager = 0
" Ruby Config
+let g:ale_linters.ruby = ['rubocop', 'reek']
let g:ale_fixers.ruby = ['rubocop']
augroup filetype_ruby
autocmd!
@@ 238,6 258,9 @@ let g:javascript_plugin_flow = 1
let g:ale_fixers.javascript = ['eslint']
"let g:ctrlp_custom_ignore = '/node_modules\|/DS_Store\|/git'
+" SQL Config
+let g:ale_linters.sql = ['sqlfmt']
+let g:ale_fixers.sql = ['sqlfmt']
" Misc Config
@@ 271,18 294,3 @@ augroup pandocHighlight
autocmd FileType pandoc hi link markdownHighlight Mark
autocmd FileType pandoc hi Mark ctermbg=186 ctermfg=235
augroup END
-
-func! WordProcessorMode()
- setlocal formatoptions=1
- setlocal noexpandtab
- map j gj
- map k gk
- setlocal spell spelllang=es
- set complete+=s
- set formatprg=par
- setlocal wrap
- setlocal linebreak
-endfu
-com! WP call WordProcessorMode()
-
-set runtimepath+=/home/mauro/src/sr.ht/mrls/vim-asturias/
M .tmux.conf => .tmux.conf +15 -9
@@ 50,7 50,12 @@ bind -r L resize-pane -R 5
set-option -g mouse on
bind -n WheelUpPane copy-mode
-# Set the default terminal mode to 256color mode
+# Use this script to get colors
+# #!/usr/bin/env bash
+# for i in {0..255} ; do
+# printf "\x1b[38;5;${i}mcolour${i}\n"
+# done
+# Set the default terminal mode to 256color mode
set -g default-terminal "screen-256color"
# enable activity alerts
@@ 58,14 63,14 @@ setw -g monitor-activity on
set -g visual-activity on
# set the status line's colors
-set -g status-fg black
-set -g status-bg green
+set -g status-fg colour7
+set -g status-bg colour12
# set the color of the window list
##setw -g window-status-style fg=cyan,bg=default,bold
# set colors for the active window
-setw -g window-status-current-style fg=green,bg=black
+setw -g window-status-current-style fg=colour7,bg=colour69
# pane colors
##set -g pane-border-style fg=cyan,bg=white
@@ 75,12 80,12 @@ setw -g window-status-current-style fg=green,bg=black
##set -g message-style fg=black,bg=white
# Status line left side
-set -g status-left-length 40
-set -g status-left "#[bg=black,fg=green]Session: #S #I #P "
+# set -g status-left-length 40
+# set -g status-left "#[bg=colour7,fg=black]Session: #S #I #P "
# Status line right side
# 15% | 28 Nov 18:15
-set -g status-right "#[bg=black,fg=green]#{battery_icon}#{battery_percentage} | %d %b %R"
+# set -g status-right "#[bg=colour7,fg=black]#{battery_icon}#{battery_percentage} | %d %b %R"
# Update the status bar every sixty seconds
set -g status-interval 60
@@ 111,12 116,13 @@ bind P pipe-pane -o "cat >>~/#W.log" \; display "Toggled logging to ~/#W.log"
##set -g @resurrect-capture-pane-contents 'on'
# List of plugins
+set -g @plugin 'jimeh/tmux-themepack'
+set -g @plugin 'tmux-plugins/tmux-open'
##set -g @plugin 'tmux-plugins/tpm'
##set -g @plugin 'tmux-plugins/tmux-sensible'
##set -g @plugin 'tmux-plugins/tmux-resurrect'
##set -g @plugin 'tmux-plugins/tmux-battery'
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-##run '~/.tmux/plugins/tpm/tpm'
+run '~/.tmux/plugins/tpm/tpm'
#run-shell ~/clone/path/resurrect.tmux
-