diff options
| -rw-r--r-- | Browser/vimb/config | 16 | ||||
| -rw-r--r-- | Editor/vimrc | 118 | ||||
| -rw-r--r-- | Shell/README.md | 1 |
3 files changed, 67 insertions, 68 deletions
diff --git a/Browser/vimb/config b/Browser/vimb/config index 16317d4..3fa7ab2 100644 --- a/Browser/vimb/config +++ b/Browser/vimb/config @@ -28,11 +28,11 @@ nmap ) <C-N> nmap S :set scripts=false<CR> r :shellcmd mpv --no-terminal "%s"<CR> :set scripts=true<CR> -set status-color-bg=#201405 -set status-color-fg=#b3d184 -set status-ssl-color-bg=#201405 -set status-ssl-color-fg=#b3d184 -set completion-bg-active=#201405 -set completion-bg-normal=#201405 -set completion-fg-active=#6faf63 -set completion-fg-normal=#b3d184 +set status-color-bg=#201b19 +set status-color-fg=#c3c5c8 +set status-ssl-color-bg=#201b19 +set status-ssl-color-fg=#c3c5c8 +set completion-bg-active=#201b19 +set completion-bg-normal=#201b19 +set completion-fg-active=#a09c9b +set completion-fg-normal=#c3c5c8 diff --git a/Editor/vimrc b/Editor/vimrc index 2dee78d..6cfe291 100644 --- a/Editor/vimrc +++ b/Editor/vimrc @@ -1,38 +1,38 @@ set nocompatible " be iMproved, required filetype off " required -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() - -Plugin 'scrooloose/syntastic' - -Plugin 'SirVer/ultisnips' -Plugin 'honza/vim-snippets' - -Plugin 'tpope/vim-surround' +"set rtp+=~/.vim/bundle/Vundle.vim +"call vundle#begin() +" +"Plugin 'scrooloose/syntastic' +" +"Plugin 'SirVer/ultisnips' +"Plugin 'honza/vim-snippets' +" +"Plugin 'tpope/vim-surround' -call vundle#end() " required +"call vundle#end() " required filetype plugin indent on " required -"Syntatic settings -let g:syntastic_enable_perl_checker = 1 -let g:syntastic_perl_checkers = ['perl'] -set statusline+=%#warningmsg# -set statusline+=%{SyntasticStatuslineFlag()} -set statusline+=%* - -let g:syntastic_always_populate_loc_list = 1 -let g:syntastic_auto_loc_list = 1 -let g:syntastic_check_on_open = 1 -let g:syntastic_check_on_wq = 0 - - -" Ultisnips -let g:UltiSnipsExpandTrigger="<leader>c" -let g:UltiSnipsJumpForwardTrigger="<c-b>" -let g:UltiSnipsJumpBackwardTrigger="<c-z>" +""Syntatic settings +"let g:syntastic_enable_perl_checker = 1 +"let g:syntastic_perl_checkers = ['perl'] +"set statusline+=%#warningmsg# +"set statusline+=%{SyntasticStatuslineFlag()} +"set statusline+=%* +" +"let g:syntastic_always_populate_loc_list = 1 +"let g:syntastic_auto_loc_list = 1 +"let g:syntastic_check_on_open = 1 +"let g:syntastic_check_on_wq = 0 +" +" +"" Ultisnips +"let g:UltiSnipsExpandTrigger="<leader>c" +"let g:UltiSnipsJumpForwardTrigger="<c-b>" +"let g:UltiSnipsJumpBackwardTrigger="<c-z>" "General @@ -96,7 +96,7 @@ set isfname+=32 "Set tab to two spaces set expandtab set shiftwidth=2 -set softtabstop=2 +"set softtabstop=2 "Make tab into another escape @@ -121,39 +121,37 @@ set mouse= nnoremap <Leader>o :CtrlP<CR> nnoremap <Leader>w :w<CR> - " " YouCompleteMe options " -let g:ycm_register_as_syntastic_checker = 1 "default 1 -let g:Show_diagnostics_ui = 1 "default 1 - -"will put icons in Vim's gutter on lines that have a diagnostic set. -"Turning this off will also turn off the YcmErrorLine and YcmWarningLine -"highlighting -let g:ycm_enable_diagnostic_signs = 1 -let g:ycm_enable_diagnostic_highlighting = 0 -let g:ycm_always_populate_location_list = 1 "default 0 -let g:ycm_open_loclist_on_ycm_diags = 1 "default 1 - - -let g:ycm_complete_in_strings = 1 "default 1 -let g:ycm_collect_identifiers_from_tags_files = 0 "default 0 -let g:ycm_path_to_python_interpreter = '' "default '' - - -let g:ycm_server_use_vim_stdout = 0 "default 0 (logging to console) -let g:ycm_server_log_level = 'info' "default info - - -let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py' "where to search for .ycm_extra_conf.py if not found -let g:ycm_confirm_extra_conf = 0 - - -let g:ycm_goto_buffer_command = 'same-buffer' "[ 'same-buffer', 'horizontal-split', 'vertical-split', 'new-tab' ] -let g:ycm_filetype_whitelist = { '*': 1 } -let g:ycm_key_invoke_completion = '<C-Space>' - - -nnoremap <leader>r :YcmForceCompileAndDiagnostics <CR> +" let g:ycm_register_as_syntastic_checker = 1 "default 1 +" let g:Show_diagnostics_ui = 1 "default 1 +" +" "will put icons in Vim's gutter on lines that have a diagnostic set. +" "Turning this off will also turn off the YcmErrorLine and YcmWarningLine +" "highlighting +" let g:ycm_enable_diagnostic_signs = 1 +" let g:ycm_enable_diagnostic_highlighting = 0 +" let g:ycm_always_populate_location_list = 1 "default 0 +" let g:ycm_open_loclist_on_ycm_diags = 1 "default 1 +" +" +" let g:ycm_complete_in_strings = 1 "default 1 +" let g:ycm_collect_identifiers_from_tags_files = 0 "default 0 +" let g:ycm_path_to_python_interpreter = '' "default '' +" +" +" let g:ycm_server_use_vim_stdout = 0 "default 0 (logging to console) +" let g:ycm_server_log_level = 'info' "default info +" +" +" let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py' "where to search for .ycm_extra_conf.py if not found +" let g:ycm_confirm_extra_conf = 0 +" +" +" let g:ycm_goto_buffer_command = 'same-buffer' "[ 'same-buffer', 'horizontal-split', 'vertical-split', 'new-tab' ] +" let g:ycm_filetype_whitelist = { '*': 1 } +" let g:ycm_key_invoke_completion = '<C-Space>' +" +" diff --git a/Shell/README.md b/Shell/README.md index 614b3e7..955d0d8 100644 --- a/Shell/README.md +++ b/Shell/README.md @@ -1,4 +1,5 @@ ``` +ln -s ~/dotfiles/Shell/fish ~/.config/fish ln -s ~/dotfiles/Shell/bash_aliases ~/.bash_aliases ln -s ~/dotfiles/Shell/bashrc ~/.bashrc ln -s ~/dotfiles/Shell/zshrc ~/.zshrc |