Updates

Signed-off-by: Tomas Slusny <[email protected]>
deathbeam · Feb 5, 2017 · d714e0c · d714e0c
1 parent 7355689
commit d714e0c
Show file tree

Hide file tree

Showing 15 changed files with 154 additions and 120 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -64,9 +64,6 @@
 [submodule "lib/vim/vim-surround"]
 	path = lib/vim/vim-surround
 	url = https://github.com/tpope/vim-surround
-[submodule "lib/vim/vim-vinegar"]
-	path = lib/vim/vim-vinegar
-	url = https://github.com/tpope/vim-vinegar
 [submodule "lib/vim/vim-unimpaired"]
 	path = lib/vim/vim-unimpaired
 	url = https://github.com/tpope/vim-unimpaired
@@ -107,3 +104,12 @@
 [submodule "lib/irssi/irssi-colors-solarized"]
 	path = lib/irssi/irssi-colors-solarized
 	url = https://github.com/huyz/irssi-colors-solarized
+[submodule "lib/vim/vim-test"]
+	path = lib/vim/vim-test
+	url = https://github.com/janko-m/vim-test
+[submodule "lib/vim/vim-dirvish"]
+	path = lib/vim/vim-dirvish
+	url = https://github.com/justinmk/vim-dirvish
+[submodule "lib/vim/vim-polyglot"]
+	path = lib/vim/vim-polyglot
+	url = https://github.com/sheerun/vim-polyglot
diff --git a/README.md b/README.md
@@ -116,9 +116,9 @@ git clone https://github.com/ervandew/supertab.git $DOTHOME/usr/vim/supertab
  * [fzf.vim](https://github.com/junegunn/fzf.vim): fzf :heart: vim
  * [neomake](https://github.com/neomake/neomake): Asynchronous linting and make framework for Neovim/Vim
  * [pathogen.vim](https://github.com/tpope/vim-pathogen): Manage your runtimepath
- * [supertab](https://github.com/ervandew/supertab): Perform all your vim insert mode completions with Tab
  * [ultisnips](https://github.com/SirVer/ultisnips): The ultimate snippet solution for Vim
  * [vim-commentary](https://github.com/tpope/vim-commentary): comment stuff out
+ * [vim-dirvish](https://github.com/justinmk/vim-dirvish): Directory viewer for Vim ⚡️
  * [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
  * [vim-gutentags](https://github.com/ludovicchabant/vim-gutentags): A Vim plugin that manages your tag files
  * [vim-javacomplete2](https://github.com/artur-shaik/vim-javacomplete2): Updated javacomplete plugin for vim
@@ -127,8 +127,8 @@ git clone https://github.com/ervandew/supertab.git $DOTHOME/usr/vim/supertab
  * [vim-rooter](https://github.com/airblade/vim-rooter): Changes Vim working directory to project root (identified by presence of known directory or file)
  * [vim-snippets](https://github.com/honza/vim-snippets): contains snippets files for various programming languages
  * [vim-surround](https://github.com/tpope/vim-surround): quoting/parenthesizing made simple
+ * [vim-test](https://github.com/janko-m/vim-test): Run your tests at the speed of thought
  * [vim-unimpaired](https://github.com/tpope/vim-unimpaired): pairs of handy bracket mappings
- * [vim-vinegar](https://github.com/tpope/vim-vinegar): combine with netrw to create a delicious salad dressing
  * [vim-wiki](https://github.com/vimwiki/vimwiki): Personal Wiki for Vim
 
 ### Tmux

diff --git a/config/ideavimrc b/config/ideavimrc
@@ -31,46 +31,26 @@ nnoremap ]c :action VcsShowNextChangeMarker<cr>
 nnoremap gcc :action CommentByLineComment<cr>
 vnoremap gc :<bs><bs><bs><bs><bs>action VimVisualSwapSelections<cr>:action CommentByLineComment<CR>
 
-" Show intention actions (alt-enter in Idea)
-nnoremap <space>ji :action ShowIntentionActions<cr>
+" Navigation
+nnoremap <space>j] :action GotoImplementation<cr>
 
-" Generate
+" Refactoring
+nnoremap <space>ji :action ShowIntentionActions<cr>
 nnoremap <space>jg :action Generate<cr>
-
-" Refactor element name
 nnoremap <space>jr :action RenameElement<cr>
-
-" Refactor element signature
 nnoremap <space>js :action ChangeSignature<cr>
-
-" Refactor element type
 nnoremap <space>jt :action ChangeTypeSignature<cr>
 
-" Menus {{{
-
-  " New element
-  nnoremap <space>n :action NewElement<cr>
-
-  " Search everywhere
-  nnoremap <space>/ :action SearchEverywhere<cr>
-
-  " Tags (Intellij Go to symbol)
-  nnoremap <space>t :action GotoSymbol<cr>
-
-  " Buffer tags (Intellij File structure popup)
-  nnoremap <space>o :action FileStructurePopup<cr>
-
-  " Files (Intellij Go to file)
-  nnoremap <space>f :action GotoFile<cr>
-
-  " Actions (Intellij Go to action)
-  nnoremap <space>a :action GotoAction<cr>
-
-  " History (Intellij Recent files)
-  nnoremap <space>h :action RecentFiles<cr>
-
-  " Buffers (Intellij Switcher)
-  nnoremap <space>b :action Switcher<cr>
+" Menus
+nnoremap <space>/ :action SearchEverywhere<cr>
+nnoremap <space>T :action GotoSymbol<cr>
+nnoremap <space>t :action FileStructurePopup<cr>
+nnoremap <space>F :action GotoFile<cr>
+nnoremap <space>f :action GotoClass<cr>
+nnoremap <space>a :action GotoAction<cr>
+nnoremap <space>h :action RecentFiles<cr>
+nnoremap <space>b :action Switcher<cr>
+nnoremap <space>n :action NewElement<cr>
 
 " }}}
 
diff --git a/config/khdrc b/config/khdrc
@@ -2,13 +2,13 @@
 khd kwm on
 
 # set color of default mode
-khd mode default color 0xFFA3BE8C
+khd mode default color 0xFF268BD2
 
 # Enable the resize mode
 khd mode resize prefix on
 khd mode resize timeout 1
 khd mode resize restore default
-khd mode resize color 0xFF96B5B5
+khd mode resize color 0xFF2AA198
 
 # Launch terminal
 cmd + alt + ctrl - return          :    open -na /Applications/iTerm.app

diff --git a/config/kwmrc b/config/kwmrc
@@ -43,11 +43,11 @@ kwmc config spawn right
 # Enable border for focused window
 kwmc config border focused on
 kwmc config border focused size 2
-kwmc config border focused color 0xFFA3BE8C
+kwmc config border focused color 0xFF268BD2
 kwmc config border focused radius 0
 
 # Enable border for marked window
 kwmc config border marked on
 kwmc config border marked size 2
-kwmc config border marked color 0xFF2B303B
+kwmc config border marked color 0xFF073642
 kwmc config border marked radius 0
diff --git a/config/vimrc b/config/vimrc
@@ -165,9 +165,11 @@
   " Cursor line (it is slowing Vim a bit, but too useful)
   set cursorline
 
-  " Show tabs and trailing spaces
-  set list listchars=tab:→\ ,trail:·
+  " Disable text wrap
+  set nowrap
 
+  " Show tabs, trailing spaces and newline breaks
+  set list listchars=tab:→\ ,trail:·
   set showbreak=↲
 
   " Automatically rebalance windows on vim resize
@@ -380,7 +382,13 @@
   let g:EditorConfig_core_mode = 'external_command' " Speed up editorconfig plugin
   let g:EditorConfig_exclude_patterns = ['fugitive://.*'] " Fix EditorConfig for fugitive
 
+  " Completion
+  if has('nvim') && has('python3')
+    call deoplete#enable()
+  endif
+
   " Fugitive
+  autocmd VimRc BufReadPost fugitive://* set bufhidden=delete
   nnoremap <silent> <leader>gs :Gstatus<CR>
   nnoremap <silent> <leader>gd :Gdiff<CR>
   nnoremap <silent> <leader>gc :Gcommit<CR>
@@ -389,18 +397,23 @@
   nnoremap <silent> <leader>gp :Git push<CR>
   nnoremap <silent> <leader>gw :Gwrite<CR>
   nnoremap <silent> <leader>gr :Gremove<CR>
-  autocmd VimRc BufReadPost fugitive://* set bufhidden=delete
-
-  " Completion
-  if has('nvim') && has('python3')
-    call deoplete#enable()
-  endif
 
   " Neomake
-  autocmd VimRc BufWritePost * Neomake
+  nmap <silent> <leader>mf :Neomake<CR>
+  nmap <silent> <leader>mF :Neomake!<CR>
   set statusline+=\ %#ErrorMsg#%{neomake#statusline#LoclistStatus('loc:\ ')}
   set statusline+=\ %#ErrorMsg#%{neomake#statusline#QflistStatus('qf:\ ')}
 
+  " Vim Test
+  let test#strategy = 'make'
+  nmap <silent> <leader>mt :TestFile<CR>
+  nmap <silent> <leader>mT :TestSuite<CR>
+  nmap <silent> <leader>mtt :TestNearest<CR>
+
+  " Quickfix and location list
+  nmap <silent> <leader>oc  :copen<CR>
+  nmap <silent> <leader>ol  :lopen<CR>
+
   " Java
   autocmd VimRc FileType java :call EnableJava()
   function! EnableJava()
@@ -424,73 +437,45 @@
           \\%-G%.%#
   endfunction
 
-  " rg command suffix, [options]
-  function! VRg_raw(command_suffix, ...)
-    return call('fzf#vim#grep', extend(['rg --no-heading --column --color always '.a:command_suffix, 1], a:000))
-  endfunction
-
-  " query, [[ag options], options]
-  function! VRg(query, ...)
-    let query = empty(a:query) ? '^.' : a:query
-    let args = copy(a:000)
-    let ag_opts = len(args) > 1 ? remove(args, 0) : ''
-    let command = ag_opts . ' ' . "'".substitute(query, "'", "'\\\\''", 'g')."'"
-    return call('VRg_raw', insert(args, command, 0))
-  endfunction
-
-  " Try to use ripgrep, otherwise fallback to ag
-  function! VFind(query, ...)
-    let args = insert(copy(a:000), a:query, 0)
-    if executable('rg')
-      return call('VRg', args)
-    endif
-
-    return call('fzf#vim#ag', args)
-  endfunction
-  command! -bang -nargs=* Find call VFind(<q-args>, <bang>0)
-
-  " If this is Git repo, list git files only, otherwise list all
-  function! VFiles()
-    if !empty(glob('.git'))
-      execute 'GFiles'
-    else
-      execute 'Files'
-    endif
-  endfunction
-
-  " Menus {{{
-    " Search everywhere (fzf.vim Ag)
+  " FZF {{{
+    " rg command suffix, [options]
+    function! VRg_raw(command_suffix, ...)
+      return call('fzf#vim#grep', extend(['rg --no-heading --column --color always '.a:command_suffix, 1], a:000))
+    endfunction
+
+    " query, [[ag options], options]
+    function! VRg(query, ...)
+      let query = empty(a:query) ? '^.' : a:query
+      let args = copy(a:000)
+      let ag_opts = len(args) > 1 ? remove(args, 0) : ''
+      let command = ag_opts . ' ' . "'".substitute(query, "'", "'\\\\''", 'g')."'"
+      return call('VRg_raw', insert(args, command, 0))
+    endfunction
+
+    " Try to use ripgrep, otherwise fallback to ag
+    function! VFind(query, ...)
+      let args = insert(copy(a:000), a:query, 0)
+      if executable('rg')
+        return call('VRg', args)
+      endif
+
+      return call('fzf#vim#ag', args)
+    endfunction
+    command! -bang -nargs=* Find call VFind(<q-args>, <bang>0)
+
+    " Menus
     nmap <leader>/ :Find<cr>
-
-    " Help tags (fzf.vim Helptags)
-    nmap <leader>? :Helptags<cr>
-
-    " Tags (fzf.vim Tags)
-    nmap <leader>t :Tags<cr>
-
-    " Buffer tags (fzf.vim BTags)
-    nmap <leader>o :BTags<cr>
-
-    " Files (fzf.vim Files or GFiles)
-    nmap <leader>f :call VFiles()<cr>
-
-    " Actions (fzf.vim Commands)
+    nmap <leader>T :Tags<cr>
+    nmap <leader>t :BTags<cr>
+    nmap <leader>F :Files<cr>
+    nmap <leader>f :GFiles<cr>
     nmap <leader>a :Commands<cr>
-
-    " Snippets (fzf.vim Snippets)
-    nmap <leader>s :Snippets<cr>
-
-    " Commits (fzf.vim Commits)
-    nmap <leader>c :Commits<cr>
-
-    " History (fzf.vim History)
     nmap <leader>h :History<cr>
-
-    " Buffers (fzf.vim Buffers)
     nmap <leader>b :Buffers<cr>
-
-    " Windows (fzf.vim Windows)
     nmap <leader>w :Windows<cr>
+    nmap <leader>s :Snippets<cr>
+    nmap <leader>c :Commits<cr>
+    nmap <leader>? :Helptags<cr>
   " }}}
 
 " }}}

diff --git a/lib/firefox/firefox.css b/lib/firefox/firefox.css
@@ -10,7 +10,7 @@
     --bg-low: #002b36;
     --fg-low: #839496;
     --tab-height: 25px;
-    --tab-fonts: "Terminus (TTF)", "Inconsolata", monospace;
+    --tab-fonts: "Terminus (TTF)", "Terminus", "Inconsolata", monospace;
     --tab-font-size: 12pt;
     --tab-text-align: left; /* left | center | right */
     --tab-triangle-correction: -1px;

diff --git a/lib/macos/alfred/Solarized Dark.alfredappearance b/lib/macos/alfred/Solarized Dark.alfredappearance
@@ -0,0 +1,61 @@
+{
+  "alfredtheme" : {
+    "result" : {
+      "textSpacing" : 1,
+      "subtext" : {
+        "size" : 12,
+        "colorSelected" : "#EEE8D5FF",
+        "font" : "Terminus",
+        "color" : "#839396FF"
+      },
+      "shortcut" : {
+        "size" : 14,
+        "colorSelected" : "#EEE8D5FF",
+        "font" : "Terminus",
+        "color" : "#93A1A1FF"
+      },
+      "backgroundSelected" : "#268BD2FF",
+      "text" : {
+        "size" : 14,
+        "colorSelected" : "#EEE8D5FF",
+        "font" : "Terminus",
+        "color" : "#93A1A1FF"
+      },
+      "iconPaddingHorizontal" : 1,
+      "paddingVertical" : 1,
+      "iconSize" : 26
+    },
+    "search" : {
+      "paddingVertical" : 0,
+      "background" : "#073641FF",
+      "spacing" : 0,
+      "text" : {
+        "size" : 14,
+        "colorSelected" : "#000000FF",
+        "font" : "Terminus",
+        "color" : "#93A1A1FF"
+      },
+      "backgroundSelected" : "#D8D8DBFF"
+    },
+    "window" : {
+      "color" : "#073641FF",
+      "paddingHorizontal" : 0,
+      "width" : 559,
+      "borderPadding" : 0,
+      "borderColor" : "#0000007F",
+      "blur" : 0,
+      "roundness" : 0,
+      "paddingVertical" : 0
+    },
+    "credit" : "deathbeam",
+    "separator" : {
+      "color" : "#CBCBCBF3",
+      "thickness" : 0
+    },
+    "scrollbar" : {
+      "color" : "#358188FF",
+      "thickness" : 0
+    },
+    "name" : "Solarized Dark"
+  }
+}
diff --git a/lib/macos/bar.widget/background.coffee b/lib/macos/bar.widget/background.coffee
@@ -7,7 +7,7 @@ render: (output) ->
   html, body {
     font-family: "Terminus", system, -apple-system;
     font-size: 12px;
-    color: #dfe1e8;
+    color: #93a1a1;
   }
   </style>
   """
@@ -18,5 +18,5 @@ style: """
   height: 25px
   width: 100%
   z-index: -1
-  background: #2b303b;
+  background: #073642;
 """
diff --git a/lib/macos/bar.widget/focused-window.coffee b/lib/macos/bar.widget/focused-window.coffee
@@ -6,7 +6,7 @@ render: (output) ->
   """
   <style>
   .active {
-    color: #a3be8c;
+    color: #268bd2;
   </style>
   <div class="foc">
     <span></span>