WIP

dkarter · Jan 6, 2020 · e1174d5 · e1174d5
1 parent 69736a7
commit e1174d5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 34 deletions.
diff --git a/gitconfig b/gitconfig
@@ -32,7 +32,7 @@
   whitespace = warn
   pager = diff-so-fancy | less --tabs=4 -RFX
 [merge]
-  ff = only
+  ; ff = only
   summary = true
 [merge "bundlelock"]
   name = lock Gemfile

diff --git a/tmux.conf b/tmux.conf
@@ -38,10 +38,10 @@
 
 # shortcuts for iterating on tmux config
   bind-key r source-file ~/.tmux.conf \; display-message '~/.tmux.conf reloaded'
-  bind-key M split-window -h 'vim ~/.tmux.conf'
+  bind-key M split -h 'vim ~/.tmux.conf'
 
 # htop for monitoring system processes
-  bind t split-window -h 'htop'
+  bind t split -h 'htop'
 
 # Appearance
 # ==============================================================
@@ -83,7 +83,7 @@
 
   # splitting and creating new windows
     bind-key - split-window -v  -c '#{pane_current_path}'
-    bind-key \ split-window -h  -c '#{pane_current_path}'
+    bind-key \\ split-window -h  -c '#{pane_current_path}'
     bind-key c new-window -c '#{pane_current_path}'
 
 # # Easily swap a pane (targeted by pane number) with the current pane

diff --git a/vimrc b/vimrc
@@ -1,11 +1,17 @@
-"  ▄█    █▄   ▄█    ▄▄▄▄███▄▄▄▄
-" ███    ███ ███  ▄██▀▀▀███▀▀▀██▄
-" ███    ███ ███▌ ███   ███   ███
-" ███    ███ ███▌ ███   ███   ███
-" ███    ███ ███▌ ███   ███   ███
-" ███    ███ ███  ███   ███   ███
-" ███    ███ ███  ███   ███   ███
-"  ▀██████▀  █▀    ▀█   ███   █▀
+"
+"  ███▄    █ ▓█████  ▒█████   ██▒   █▓ ██▓ ███▄ ▄███▓
+"  ██ ▀█   █ ▓█   ▀ ▒██▒  ██▒▓██░   █▒▓██▒▓██▒▀█▀ ██▒
+" ▓██  ▀█ ██▒▒███   ▒██░  ██▒ ▓██  █▒░▒██▒▓██    ▓██░
+" ▓██▒  ▐▌██▒▒▓█  ▄ ▒██   ██░  ▒██ █░░░██░▒██    ▒██
+" ▒██░   ▓██░░▒████▒░ ████▓▒░   ▒▀█░  ░██░▒██▒   ░██▒
+" ░ ▒░   ▒ ▒ ░░ ▒░ ░░ ▒░▒░▒░    ░ ▐░  ░▓  ░ ▒░   ░  ░
+" ░ ░░   ░ ▒░ ░ ░  ░  ░ ▒ ▒░    ░ ░░   ▒ ░░  ░      ░
+"    ░   ░ ░    ░   ░ ░ ░ ▒       ░░   ▒ ░░      ░
+"          ░    ░  ░    ░ ░        ░   ░         ░
+"                                 ░
+"
+"         - Dorian's NeoVim Configuration -
+
 
 " General settings {{{
  scriptencoding utf-16      " allow emojis in vimrc
@@ -46,6 +52,7 @@
    set shiftround        " Round indent to multiple of 'shiftwidth'
    set termguicolors     " enable true colors
    set hidden            " enable hidden unsaved buffers
+   set foldcolumn=2      " display gutter markings for folds
 
    if !has('nvim')             " does not work on neovim
      set emoji                 " treat emojis 😄  as full width characters
@@ -249,8 +256,8 @@ map <leader>gst :Gist<cr>
 " ====================================
 " GitGutter:
 " ====================================
-nnoremap <silent> + :GitGutterNextHunk<cr>
-nnoremap <silent> _ :GitGutterPrevHunk<cr>
+" nnoremap <silent> + :GitGutterNextHunk<cr>
+" nnoremap <silent> _ :GitGutterPrevHunk<cr>
 
 " ====================================
 " Vim Scriptease:
@@ -418,8 +425,9 @@ imap <c-x><c-l> <plug>(fzf-complete-line)
 " ======================================
 
 " Files + devicons
-function! Fzf_dev()
-  let l:fzf_files_options = '--preview "rougify {2..-1} | head -'.&lines.'"'
+function! FzfIcons()
+  " let l:fzf_files_options = '--preview "rougify {2..-1} | head -'.&lines.'"'
+  let l:fzf_files_options = '--preview "echo {} |  cut -f2 -d \" \" | xargs bat --color \"always\" --line-range 0:100"'
 
   function! s:files()
     let l:files = split(system($FZF_DEFAULT_COMMAND), '\n')
@@ -446,14 +454,13 @@ function! Fzf_dev()
                \ 'ctrl-v': 'vertical split',
                \ 'ctrl-t': 'tabe'
                \ }, a:item[0], 'e')
-    execute 'silent ' . l:cmd . ' ' . l:file_path
+    execute 'silent ' . l:cmd . ' "' . l:file_path . '"'
   endfunction
 
   call fzf#run({
         \ 'source': <sid>files(),
         \ 'sink':   function('s:edit_file'),
-        \ 'options': '-m --expect=ctrl-t,ctrl-v,ctrl-x '.
-        \            l:fzf_files_options,
+        \ 'options': '-m --expect=ctrl-t,ctrl-v,ctrl-x ' . l:fzf_files_options,
         \ 'down':    '40%' })
 endfunction
 
@@ -1036,7 +1043,7 @@ augroup END
     map <leader>fsl ggO# frozen_string_literal: true<esc>jO<esc>
 
   " remove highlighting on escape
-    map <silent> <esc> :nohlsearch<cr>
+    nnoremap <silent> <esc> :nohlsearch<cr>
 
   " sort selected lines
     vmap gs :sort<CR>

diff --git a/vimrc.bundles b/vimrc.bundles
@@ -45,7 +45,6 @@ endif
           \ 'coc-github',
           \ 'coc-gitignore',
           \ 'coc-gocode',
-          \ 'coc-highlight',
           \ 'coc-html',
           \ 'coc-json',
           \ 'coc-neosnippet',
@@ -63,18 +62,10 @@ endif
           \ 'coc-yaml',
           \ 'coc-yank',
           \ ]
-    Plug 'neoclide/coc.nvim', {'tag': '*', 'do': { -> coc#util#install()}}
+    Plug 'neoclide/coc.nvim', {'branch': 'release'}
   endif
 " }}}
 
-" Deoplete: {{{
-  Plug 'racer-rust/vim-racer'
-  " For func argument completion
-  Plug 'Shougo/neosnippet'
-  Plug 'Shougo/neosnippet-snippets'
-
-" }}}
-
 " Neovim: {{{
   if has('nvim')
     " abstraction on top of neovim terminal
@@ -98,7 +89,9 @@ endif
   Plug 'lambdalisue/gina.vim'
 
   " Visual git gutter
-  Plug 'airblade/vim-gitgutter'
+  " Plug 'airblade/vim-gitgutter'
+
+  Plug 'mhinz/vim-signify'
 
   " Gitv - for browsing a file's history in git
   Plug 'gregsexton/gitv'
@@ -130,9 +123,6 @@ endif
 
   " pulls info on hex packages (requires mattn/webapi-vim)
   Plug 'lucidstack/hex.vim', { 'for': 'elixir'}
-
-  " shortcuts for the Phoenix framework
-  Plug 'c-brenn/phoenix.vim'
 " }}}
 
 " Ruby: {{{
@@ -224,6 +214,8 @@ endif
 
   " highlight file icons with different colors
   Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
+
+  Plug 'justinmk/vim-dirvish'
 " }}}
 
 " HTML: {{{