Add various changes

4 files changed, 80 insertions, 139 deletions

diff --git a/i3/config b/i3/config
index 7429767..0fbdc53 100644
--- a/i3/config
+++ b/i3/config
@@ -108,14 +108,12 @@ bindsym $mod+Shift+2 move container to workspace number 8
 bindsym $mod+Shift+plus move container to workspace number 9
 bindsym $mod+Shift+bracketright move container to workspace number 10
 
-# Keybindings for create and move
-bindsym $mod+n exec $HOME/bin/workspace n
-bindsym $mod+Shift+n exec $HOME/bin/workspace m
-
 # reload the configuration file
 bindsym $mod+Shift+c reload
+
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
+
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
@@ -148,7 +146,7 @@ bindsym $mod+r mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-        status_command $HOME/bin/mystatus
+    status_command $HOME/bin/mystatus
 }
 
 # Workspaces
@@ -160,18 +158,6 @@ bindsym $mod+period workspace next
 bindsym $mod+b exec --no-startup-id qutebrowser
 bindsym $mod+i exec $HOME/bin/vimin
 
-# Configuration
-# bindsym F1 exec $HOME/.xinitrc
-
-# Font
-# font xft:Droid Sans Mono 10
-
-# Init script
-# exec --no-startup-id $HOME/.xinitrc
-
-# Media control
-exec --no-startup-id gnome-settings-daemon
-
 # Pulse Audio controls
 bindsym XF86AudioRaiseVolume exec amixer -D pulse sset Master 5%+
 bindsym XF86AudioLowerVolume exec amixer -D pulse sset Master 5%-
@@ -181,11 +167,15 @@ bindsym XF86AudioMute exec amixer -D pulse sset Master 0%
 bindsym XF86MonBrightnessUp exec light -A 10
 bindsym XF86MonBrightnessDown exec light -U 10
 
-# Disable touchpad
-bindsym XF86AudioPlay exec $HOME/bin/touchpad
-
-# font pango:DejaVu Sans Mono 10
+# Change wallpaper
 bindsym F1 exec --no-startup-id feh --bg-fill --randomize /usr/share/backgrounds
+
+# Custom scripts
+bindsym XF86AudioPlay exec $HOME/bin/touchpad
+bindsym $mod+n exec $HOME/bin/workspace n
+bindsym $mod+Shift+n exec $HOME/bin/workspace m
 bindsym $mod+semicolon exec --no-startup-id $HOME/bin/run
 bindsym $mod+z exec --no-startup-id $HOME/bin/tmux_attach
 bindsym $mod+e exec --no-startup-id $HOME/bin/rename_workspace
+
+for_window [class="^.*"] border pixel 1
diff --git a/tmux.conf b/tmux.conf
index 227c9cd..5096b4c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,7 +1,5 @@
-# set -g default-terminal "screen-256color"
-set -g default-terminal screen
-if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" 'set -g default-terminal screen-256color'
-
+set -g default-terminal xterm-256color
+set -g status off
 set -g mouse on
 
 unbind C-b
@@ -14,17 +12,6 @@ bind r source-file ~/.tmux.conf
 set -s escape-time 0
 set-option -g allow-rename off
 
-set -g @tpm_plugins '           \
-  tmux-plugins/tpm              \
-  tmux-plugins/tmux-sensible    \
-  tmux-plugins/tmux-resurrect   \
-'
-
-set -g @resurrect-strategy-vim 'session'
-set -g @resurrect-save 'S'
-set -g @resurrect-restore 'R'
-set -g status off
-
 is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
 bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
 bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
@@ -36,5 +23,3 @@ bind C-p previous-window
 
 bind-key -n C-S-Left swap-window -t -1
 bind-key -n C-S-Right swap-window -t +1
-
-run-shell '~/.tmux/plugins/tpm/tpm'
diff --git a/vim/vimrc b/vim/vimrc
index 8017f28..d2059d1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -5,6 +5,23 @@ Plug 'altercation/vim-colors-solarized'
 Plug 'beloglazov/vim-online-thesaurus'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'ctrlpvim/ctrlp.vim'
+let g:ctrlp_by_filename = 1
+let g:ctrlp_cmd = 'CtrlP'
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_open_new_file = 't'
+let g:ctrlp_show_hidden = 1
+let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
+let g:ctrlp_working_path_mode = 'r'
+let g:ctrlp_prompt_mappings = {
+    \ 'PrtSelectMove("j")':   ['<c-n>'],
+    \ 'PrtSelectMove("k")':   ['<c-p>'],
+    \ 'PrtHistory(-1)':       ['<c-j>'],
+    \ 'PrtHistory(1)':        ['<c-k>'],}
+
+Plug 'embear/vim-localvimrc'
+let g:localvimrc_ask = 0
+let g:localvimrc_sandbox = 0
+
 Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
 Plug 'jamessan/vim-gnupg'
@@ -15,13 +32,40 @@ Plug 'junegunn/vim-pseudocl'
 Plug 'junegunn/vim-oblique'
 Plug 'justinmk/vim-sneak'
 Plug 'klen/python-mode'
+let g:pymode_rope=0
+
 Plug 'ledger/vim-ledger'
 Plug 'lervag/vimtex'
+let g:vimtex_fold_enabled=0
+let g:vimtex_view_method='zathura'
+let g:vimtex_latexmk_continuous=1
+let g:vimtex_quickfix_mode=0
+let g:vimtex_latexmk_build_dir='build'
+let g:vimtex_latexmk_progname='nvr'
+
 Plug 'majutsushi/tagbar'
+let g:tagbar_width = 30
+let g:tagbar_show_linenumbers=1
+let g:tagbar_autofocus=1
+
 Plug 'mileszs/ack.vim', { 'on' : 'Ack' }
 Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' }
 Plug 'scrooloose/syntastic'
+let g:syntastic_cpp_compiler = "g++"
+let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
+let g:syntastic_error_symbol = "✗"
+let g:syntastic_warning_symbol = "W"
+
 Plug 'SirVer/ultisnips'
+let g:UltiSnipsEditSplit="horizontal"
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
+let g:UltiSnipsListSnippets="<c-l>"
+let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
+let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
+let g:UltiSnipsUsePythonVersion=3
+
 Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
 Plug 'terryma/vim-multiple-cursors'
 Plug 'tomasr/molokai'
@@ -39,27 +83,17 @@ Plug 'tpope/vim-unimpaired'
 Plug 'tpope/vim-vinegar'
 Plug 'troydm/zoomwintab.vim'
 Plug 'Valloric/YouCompleteMe', { 'do' : 'python2 install.py --clang-completer' }
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-Plug 'vim-scripts/gmsh.vim'
-Plug 'holomorph/vim-freefem'
-call plug#end()
-
-let g:vimtex_fold_enabled=0
-let g:vimtex_view_method='zathura'
-let g:vimtex_latexmk_continuous=1
-let g:vimtex_quickfix_mode=0
-let g:vimtex_latexmk_build_dir='build'
-
-let g:UltiSnipsEditSplit="horizontal"
-let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
-let g:UltiSnipsJumpForwardTrigger="<tab>"
-let g:UltiSnipsListSnippets="<c-l>"
-let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
-let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
-let g:UltiSnipsUsePythonVersion=3
+let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
+let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
+let g:ycm_add_preview_to_completeopt = 0
+let g:ycm_confirm_extra_conf = 0
+let g:ycm_auto_trigger = 1
+if !exists('g:ycm_semantic_triggers')
+    let g:ycm_semantic_triggers = {}
+endif
+let g:ycm_semantic_triggers.tex = ['re!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*' ]
 
+Plug 'vim-airline/vim-airline'
 let g:airline_left_sep=''
 let g:airline_right_sep=''
 let g:airline_section_c = '%f%m'
@@ -69,56 +103,16 @@ let g:airline_theme='solarized'
 let g:airline#extensions#tabline#enabled = 0
 let g:airline_exclude_preview = 0
 
-let g:ctrlp_by_filename = 1
-let g:ctrlp_cmd = 'CtrlP'
-let g:ctrlp_map = '<c-p>'
-let g:ctrlp_open_new_file = 't'
-let g:ctrlp_show_hidden = 1
-let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
-let g:ctrlp_working_path_mode = 'r'
-let g:ctrlp_prompt_mappings = {
-    \ 'PrtSelectMove("j")':   ['<c-n>'],
-    \ 'PrtSelectMove("k")':   ['<c-p>'],
-    \ 'PrtHistory(-1)':       ['<c-j>'],
-    \ 'PrtHistory(1)':        ['<c-k>'],}
-
-let g:gitgutter_max_signs=1000
-let g:pymode_rope=0
-
-let g:syntastic_cpp_compiler = "g++"
-let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
-let g:syntastic_error_symbol = "✗"
-let g:syntastic_warning_symbol = "W"
-
-let g:tagbar_width = 30
-let g:tagbar_show_linenumbers=1
-let g:tagbar_autofocus=1
+Plug 'vim-airline/vim-airline-themes'
+Plug 'vim-scripts/gmsh.vim'
+Plug 'holomorph/vim-freefem'
+call plug#end()
 
 let g:tex_conceal= 'adgm'
 let g:tex_flavor='latex'
 let g:tex_fast="1"
-
-let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
-            \ '\.fls$','\.bbl$','\.blg$',
-            \ '\.out$', '\.log$','\.aux$','\.sty$',
-            \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$']
-
-let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
-let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
-let g:ycm_add_preview_to_completeopt = 0
-let g:ycm_confirm_extra_conf = 0
-let g:ycm_auto_trigger = 1
-if !exists('g:ycm_semantic_triggers')
-    let g:ycm_semantic_triggers = {}
-endif
-let g:ycm_semantic_triggers.tex = ['re!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*' ]
-
-let g:calendar_google_calendar = 1
-let g:calendar_google_task = 1
-
 let g:tabprefix = ""
 
-
 "" Vim options
 
 " Tabs and indent
@@ -176,7 +170,9 @@ set lazyredraw
 set hidden
 
 " mutt
-au BufRead /tmp/mutt-* set tw=72
+au BufNewFile,Bufread /tmp/mutt-* setlocal tw=72
+au BufNewFile,BufRead *.edp setlocal makeprg=FreeFem++\ %
+au BufNewFile,BufRead *.geo setlocal makeprg=gmsh\ %
 
 " Colorscheme
 if $COLORSCHEME=="light"
@@ -203,18 +199,6 @@ set t_ZR=
 let mapleader = " "
 let maplocalleader = "\\"
 
-" New pages
-nnoremap <Leader>pe :tabedit
-nnoremap <Leader>pn :tabnew<cr>
-nnoremap <Leader>po :tabonly<cr>
-
-" Plugin Management
-nnoremap <Leader>pi :PlugInstall<cr>
-nnoremap <Leader>pu :PlugUpdate<cr>
-nnoremap <Leader>pc :PlugClean<cr>
-nnoremap <Leader>pd :PlugDiff<cr>
-nnoremap <Leader>ps :PlugStatus<cr>
-
 " Toggles
 nnoremap cop :set paste!<cr>
 nnoremap cof :set foldenable!<cr>
@@ -223,20 +207,11 @@ nnoremap cpn :NERDTreeToggle<cr>
 nnoremap cpt :TagbarToggle<cr>
 nnoremap cpu :GundoToggle<cr>
 
-" Sourcing
-nnoremap <Leader>sv :source ~/.vimrc<cr>
-nnoremap <Leader>sc :source %<cr>
-
 " File edits
 nnoremap <Leader>es :UltiSnipsEdit<cr>
-nnoremap <Leader>em :e ~/dotfiles/.mutt/muttrc<cr>
-nnoremap <Leader>ev :e ~/dotfiles/.vim/vimrc<cr>
-nnoremap <Leader>ez :e ~/dotfiles/.zsh/zshrc<cr>
-nnoremap <Leader>et :e ~/dotfiles/.tmux.conf<cr>
 
 " Formatting
 nnoremap <Leader>fw :%s/\s\+$//<cr>
-nnoremap <Leader>fi zzmxgg=G'x
 
 " Navigation
 nnoremap (( :BufSurfBack<CR>
@@ -244,7 +219,6 @@ nnoremap )) :BufSurfForward<CR>
 nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>
 nnoremap <Return> o<Esc>
-nnoremap <s-Return> O<Esc>
 
 " Git
 nnoremap <Leader>gs :Gstatus<cr>
@@ -257,6 +231,7 @@ nnoremap <tab> <C-^>
 nnoremap Q :bd!<cr>
 nnoremap <Leader>w :w<cr>
 nnoremap <Leader>q :q!<cr>
+nnoremap <Leader>m :Make!<cr>
 nnoremap <LocalLeader>h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp,<CR>
 nnoremap J mzJ`z
 nnoremap Y y$
@@ -268,14 +243,5 @@ if has("nvim")
     tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
     nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
     inoremap <C-_> <Esc>:b term<cr>i
+    nmap <BS> <C-W>h
 endif
-
-"" Restore cursor position
-augroup vimrc
-    au!
-    autocmd BufWritePost *vimrc source %
-    autocmd BufReadPost *
-                \ if line("'\"") > 1 && line("'\"") <= line("$") |
-                \   exe "normal! g`\"" |
-                \ endif
-augroup END
diff --git a/zsh/alias b/zsh/alias
index 2341ac6..7b07159 100644
--- a/zsh/alias
+++ b/zsh/alias
@@ -8,15 +8,15 @@ alias notes='vim ~/dotfiles/.notes'
 
 # Programs
 alias a='vifm . .'
+alias e='nvim'
 alias ff='FreeFem++'
 alias g='git'
 alias l='ledger'
-alias el='vim ~/dotfiles/ledger/perso.ledger'
+alias el='nvim ~/dotfiles/ledger/perso.ledger'
 alias m='cd ~/.mutt/attachments && mutt && cd -'
 alias n='newsbeuter'
-alias v='vim'
-alias vims="vim -S Session.vim"
-alias vimtex='vim -S Session.vim --servername SYNC'
+alias v='nvim'
+alias vims="nvim -S Session.vim"
 
 # Build
 alias mc='make clean'