ginit.vim

@@ -1,9 +0,0 @@
-if exists(':GuiFont')
-  if platform#is_windows()
-    GuiFont Consolas:h9
-  else
-    GuiFont Source\ Code\ Pro:h9
-  endif
-endif
-
-colorscheme fresh

init.vim

@@ -1 +1 @@
-runtime vimrc
+vimrc

plugin/mappings.vim

@@ -64,31 +64,24 @@ nnoremap k gk
 nnoremap <leader>w :w!<CR>
 
 " Switch panes in a tmux aware way
-if !has('win32')
-  nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
-  nnoremap <silent> <C-j> :TmuxNavigateDown<CR>
-  nnoremap <silent> <C-k> :TmuxNavigateUp<CR>
-  nnoremap <silent> <C-l> :TmuxNavigateRight<CR>
-  nnoremap <silent> <C-w>h :TmuxNavigateLeft<CR>
-  nnoremap <silent> <C-w>j :TmuxNavigateDown<CR>
-  nnoremap <silent> <C-w>k :TmuxNavigateUp<CR>
-  nnoremap <silent> <C-w>l :TmuxNavigateRight<CR>
-  if has('nvim')
-    tnoremap <silent> <C-w>h <C-\><C-n>:TmuxNavigateLeft<CR>
-    tnoremap <silent> <C-w>j <C-\><C-n>:TmuxNavigateDown<CR>
-    tnoremap <silent> <C-w>k <C-\><C-n>:TmuxNavigateUp<CR>
-    tnoremap <silent> <C-w>l <C-\><C-n>:TmuxNavigateRight<CR>
-  else
-    tnoremap <silent> <C-w>h <C-w>N:TmuxNavigateLeft<CR>
-    tnoremap <silent> <C-w>j <C-w>N:TmuxNavigateDown<CR>
-    tnoremap <silent> <C-w>k <C-w>N:TmuxNavigateUp<CR>
-    tnoremap <silent> <C-w>l <C-w>N:TmuxNavigateRight<CR>
-  endif
+nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
+nnoremap <silent> <C-j> :TmuxNavigateDown<CR>
+nnoremap <silent> <C-k> :TmuxNavigateUp<CR>
+nnoremap <silent> <C-l> :TmuxNavigateRight<CR>
+nnoremap <silent> <C-w>h :TmuxNavigateLeft<CR>
+nnoremap <silent> <C-w>j :TmuxNavigateDown<CR>
+nnoremap <silent> <C-w>k :TmuxNavigateUp<CR>
+nnoremap <silent> <C-w>l :TmuxNavigateRight<CR>
+if has('nvim')
+  tnoremap <silent> <C-w>h <C-\><C-n>:TmuxNavigateLeft<CR>
+  tnoremap <silent> <C-w>j <C-\><C-n>:TmuxNavigateDown<CR>
+  tnoremap <silent> <C-w>k <C-\><C-n>:TmuxNavigateUp<CR>
+  tnoremap <silent> <C-w>l <C-\><C-n>:TmuxNavigateRight<CR>
 else
-  nnoremap <silent> <C-h> <C-w>h
-  nnoremap <silent> <C-j> <C-w>j
-  nnoremap <silent> <C-k> <C-w>k
-  nnoremap <silent> <C-l> <C-w>l
+  tnoremap <silent> <C-w>h <C-w>N:TmuxNavigateLeft<CR>
+  tnoremap <silent> <C-w>j <C-w>N:TmuxNavigateDown<CR>
+  tnoremap <silent> <C-w>k <C-w>N:TmuxNavigateUp<CR>
+  tnoremap <silent> <C-w>l <C-w>N:TmuxNavigateRight<CR>
 endif
 
 " Quick tabs

plugin/statusline.vim

@@ -17,7 +17,7 @@ let g:statusline#dark_grey    = {'fg': ['244', '#808080'], 'bg': ['233', '#12121
 function! s:hi(group, color) abort
   execute 'highlight '.a:group
         \.' ctermfg='.a:color['fg'][0].' ctermbg='.a:color['bg'][0]
-        \.' guifg='.a:color['fg'][1].' guibg='.a:color['bg'][1]
+        \.' guifg='.a:color['fg'][1].' guibg='.a:color['fg'][1]
 endfunction
 
 " StatusLineLight is shows the mode and cursor information, it is dynamically