Merge branch 'master' of urbainvaes.com:public/dotfiles

6 files changed, 21 insertions, 6 deletions

diff --git a/Xresources/.Xresources/nord b/Xresources/.Xresources/nord
index d57da03..7f1e6b6 100644
--- a/Xresources/.Xresources/nord
+++ b/Xresources/.Xresources/nord
@@ -1,4 +1,4 @@
-#include "/home/urbain/.Xresources/base"
+#include "base"
 
 URxvt.borderColor: #2E3440
 
diff --git a/Xresources/.Xresources/seoul256.dark b/Xresources/.Xresources/seoul256.dark
index 30ad561..2cb451b 100644
--- a/Xresources/.Xresources/seoul256.dark
+++ b/Xresources/.Xresources/seoul256.dark
@@ -1,4 +1,4 @@
-#include "/home/urbain/.Xresources/base"
+#include "base"
 
 URxvt.borderColor: #3a3a3a
 
diff --git a/Xresources/.Xresources/solarized.dark b/Xresources/.Xresources/solarized.dark
index 57a97ed..8940b45 100644
--- a/Xresources/.Xresources/solarized.dark
+++ b/Xresources/.Xresources/solarized.dark
@@ -1,4 +1,4 @@
-#include "/home/urbain/.Xresources/base"
+#include "base"
 
 URxvt.borderColor: #002b36
 
diff --git a/Xresources/.Xresources/solarized.light b/Xresources/.Xresources/solarized.light
index eb0ee6b..b47144c 100644
--- a/Xresources/.Xresources/solarized.light
+++ b/Xresources/.Xresources/solarized.light
@@ -1,4 +1,4 @@
-#include "/home/urbain/.Xresources/base"
+#include "base"
 
 URxvt.borderColor: #000000
 
diff --git a/Xresources/.Xresources/transparent b/Xresources/.Xresources/transparent
index 5f72f38..2778707 100644
--- a/Xresources/.Xresources/transparent
+++ b/Xresources/.Xresources/transparent
@@ -1,5 +1,5 @@
-#include "/home/urbain/.Xresources/base"
+#include "nord"
 
 ! True transparency
 URxvt.transparent: true
-URxvt.shading: 10
+URxvt.shading: 40
diff --git a/vim/.vimrc b/vim/.vimrc
index 20c0688..fdfbc2a 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -16,6 +16,7 @@ Plug 'PotatoesMaster/i3-vim-syntax'
 Plug 'SirVer/ultisnips'
 Plug 'airblade/vim-gitgutter'
 Plug 'AndrewRadev/splitjoin.vim'
+Plug 'arcticicestudio/nord-vim'
 Plug 'beloglazov/vim-online-thesaurus'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'critiqjo/lldb.nvim'
@@ -159,6 +160,13 @@ nnoremap gm :Neomake!<cr>
 if &runtimepath =~ 'neomake'
     call neomake#configure#automake('w')
 endif
+
+let g:neomake_gcc_args=[
+            \ '-Wall',
+            \ '-Wextra',
+            \ '-Wpedantic',
+            \ '-I.', '-I..', '-I../..'
+            \ ]
 " }}}
 "" Plugin configurations {{{
 
@@ -335,6 +343,10 @@ nnoremap <silent> ]b :BufSurfForward<cr>
 nnoremap <silent> [B :BufSurfBack<cr>:bd! #<cr>
 nnoremap <silent> ]B :BufSurfForward<cr>:bd! #<cr>
 
+" Alternate file
+nnoremap <bs> <c-^>
+
+" Source current file
 nnoremap ,s :source %<cr>
 
 " }}}
@@ -356,6 +368,8 @@ function! MyColo(colorscheme)
         call SaveColo("dark","solarized","solarized")
     elseif a:colorscheme == "seoul"
         call SaveColo("dark","seoul256","deus")
+    elseif a:colorscheme == "nord"
+        call SaveColo("dark","nord","nord")
     endif
 endfunction
 if filereadable($HOME."/.local/colors.vim")
@@ -365,6 +379,7 @@ nnoremap ,c :call MyColo("")<Left><Left>
 nnoremap ,cl :call MyColo("solarized-light")<cr>
 nnoremap ,cd :call MyColo("solarized-dark")<cr>
 nnoremap ,cs :call MyColo("seoul")<cr>
+nnoremap ,cn :call MyColo("nord")<cr>
 " }}}
 "" Autocommands {{{
 augroup vimrc