diff --git a/.gitmodules b/.gitmodules index acb13477..f7cfdb86 100644 --- 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 index 32351fcc..6677cdf5 100644 --- 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 index 949c3955..f4b0e89e 100644 --- a/config/ideavimrc +++ b/config/ideavimrc @@ -31,46 +31,26 @@ nnoremap ]c :action VcsShowNextChangeMarker nnoremap gcc :action CommentByLineComment vnoremap gc :action VimVisualSwapSelections:action CommentByLineComment -" Show intention actions (alt-enter in Idea) -nnoremap ji :action ShowIntentionActions +" Navigation +nnoremap j] :action GotoImplementation -" Generate +" Refactoring +nnoremap ji :action ShowIntentionActions nnoremap jg :action Generate - -" Refactor element name nnoremap jr :action RenameElement - -" Refactor element signature nnoremap js :action ChangeSignature - -" Refactor element type nnoremap jt :action ChangeTypeSignature -" Menus {{{ - - " New element - nnoremap n :action NewElement - - " Search everywhere - nnoremap / :action SearchEverywhere - - " Tags (Intellij Go to symbol) - nnoremap t :action GotoSymbol - - " Buffer tags (Intellij File structure popup) - nnoremap o :action FileStructurePopup - - " Files (Intellij Go to file) - nnoremap f :action GotoFile - - " Actions (Intellij Go to action) - nnoremap a :action GotoAction - - " History (Intellij Recent files) - nnoremap h :action RecentFiles - - " Buffers (Intellij Switcher) - nnoremap b :action Switcher +" Menus +nnoremap / :action SearchEverywhere +nnoremap T :action GotoSymbol +nnoremap t :action FileStructurePopup +nnoremap F :action GotoFile +nnoremap f :action GotoClass +nnoremap a :action GotoAction +nnoremap h :action RecentFiles +nnoremap b :action Switcher +nnoremap n :action NewElement " }}} diff --git a/config/khdrc b/config/khdrc index 729a5657..46994c40 100644 --- 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 index ad602533..f557d238 100644 --- 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 index 5ac44a1b..1cd437ce 100644 --- 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 gs :Gstatus nnoremap gd :Gdiff nnoremap gc :Gcommit @@ -389,18 +397,23 @@ nnoremap gp :Git push nnoremap gw :Gwrite nnoremap gr :Gremove - autocmd VimRc BufReadPost fugitive://* set bufhidden=delete - - " Completion - if has('nvim') && has('python3') - call deoplete#enable() - endif " Neomake - autocmd VimRc BufWritePost * Neomake + nmap mf :Neomake + nmap mF :Neomake! set statusline+=\ %#ErrorMsg#%{neomake#statusline#LoclistStatus('loc:\ ')} set statusline+=\ %#ErrorMsg#%{neomake#statusline#QflistStatus('qf:\ ')} + " Vim Test + let test#strategy = 'make' + nmap mt :TestFile + nmap mT :TestSuite + nmap mtt :TestNearest + + " Quickfix and location list + nmap oc :copen + nmap ol :lopen + " 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(, 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(, 0) + + " Menus nmap / :Find - - " Help tags (fzf.vim Helptags) - nmap ? :Helptags - - " Tags (fzf.vim Tags) - nmap t :Tags - - " Buffer tags (fzf.vim BTags) - nmap o :BTags - - " Files (fzf.vim Files or GFiles) - nmap f :call VFiles() - - " Actions (fzf.vim Commands) + nmap T :Tags + nmap t :BTags + nmap F :Files + nmap f :GFiles nmap a :Commands - - " Snippets (fzf.vim Snippets) - nmap s :Snippets - - " Commits (fzf.vim Commits) - nmap c :Commits - - " History (fzf.vim History) nmap h :History - - " Buffers (fzf.vim Buffers) nmap b :Buffers - - " Windows (fzf.vim Windows) nmap w :Windows + nmap s :Snippets + nmap c :Commits + nmap ? :Helptags " }}} " }}} diff --git a/lib/firefox/firefox.css b/lib/firefox/firefox.css index fae12b23..b1c4b313 100644 --- 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 new file mode 100644 index 00000000..c31eeabf --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/lib/macos/bar.widget/background.coffee b/lib/macos/bar.widget/background.coffee index e4c64032..05ceadf1 100644 --- 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; } """ @@ -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 index 873d84aa..95e31eee 100644 --- a/lib/macos/bar.widget/focused-window.coffee +++ b/lib/macos/bar.widget/focused-window.coffee @@ -6,7 +6,7 @@ render: (output) -> """
diff --git a/lib/vim/vim-dirvish b/lib/vim/vim-dirvish new file mode 160000 index 00000000..80c0e6dc --- /dev/null +++ b/lib/vim/vim-dirvish @@ -0,0 +1 @@ +Subproject commit 80c0e6dce274971bdc6fcdea048ae97099b28a6f diff --git a/lib/vim/vim-fugitive b/lib/vim/vim-fugitive index b754bc20..444ba9fd 160000 --- a/lib/vim/vim-fugitive +++ b/lib/vim/vim-fugitive @@ -1 +1 @@ -Subproject commit b754bc2031f21a532c083dd0d072ba373bbe3a37 +Subproject commit 444ba9fda5d05aa14c7e8664fa4a66a59c62a550 diff --git a/lib/vim/vim-polyglot b/lib/vim/vim-polyglot new file mode 160000 index 00000000..fbeb019a --- /dev/null +++ b/lib/vim/vim-polyglot @@ -0,0 +1 @@ +Subproject commit fbeb019a8516939bd904983ddc341e65c2ea19cb diff --git a/lib/vim/vim-test b/lib/vim/vim-test new file mode 160000 index 00000000..453db3d6 --- /dev/null +++ b/lib/vim/vim-test @@ -0,0 +1 @@ +Subproject commit 453db3d6dce641f91c66731aad971530729ca172 diff --git a/lib/vim/vim-vinegar b/lib/vim/vim-vinegar deleted file mode 160000 index bd7f7b79..00000000 --- a/lib/vim/vim-vinegar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd7f7b7929260072864462c04dde3b9f4c5e0d23