commit f1f25976bfe0dfdaa9948ae45347d5874d5a0161
parent 1615ce1afee95658b66b4904e7f79dcc3aa5532a
Author: Ashymad <szymon.mikulicz@posteo.net>
Date: Mon, 11 Mar 2019 18:40:27 +0100
Merge remote-tracking branch 'origin/master' into notwobug
Diffstat:
3 files changed, 117 insertions(+), 116 deletions(-)
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -1,3 +1,7 @@
[user]
email = szymon.mikulicz@posteo.net
- name = Ashymad
+ name = Szymon Mikulicz
+[github]
+ user = Ashymad
+[core]
+ editor = nvim
diff --git a/julia/.juliarc.jl b/julia/.juliarc.jl
@@ -1 +0,0 @@
-push!(LOAD_PATH, "/home/shyman/.juliamodules/");
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -1,195 +1,193 @@
" Install vim-plug if not isntalled
if empty(glob('~/.local/share/nvim/site/autoload/plug.vim'))
- silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs
- \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
- autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+ silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs
+ \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+ autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
call plug#begin('~/.local/share/nvim/plugged')
-" Visuals
Plug 'joshdick/onedark.vim'
Plug 'itchyny/lightline.vim'
-" Filesystem
Plug 'scrooloose/nerdtree'
-Plug 'ctrlpvim/ctrlp.vim'
-" Python
Plug 'vim-scripts/indentpython.vim'
Plug 'Vimjas/vim-python-pep8-indent'
-" Julia
Plug 'JuliaEditorSupport/julia-vim'
-" LaTeX
Plug 'lervag/vimtex'
-" Rust
Plug 'rust-lang/rust.vim'
+Plug 'racer-rust/vim-racer'
-" C#
Plug 'OmniSharp/omnisharp-vim'
-" R
Plug 'jalvesaq/Nvim-R'
-" Completion
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-Plug 'autozimu/LanguageClient-neovim', {
- \ 'branch': 'next',
- \ 'do': 'bash install.sh',
- \ }
-
-Plug 'junegunn/fzf'
+Plug 'Shougo/neosnippet.vim'
+Plug 'Shougo/neosnippet-snippets'
-Plug 'ervandew/supertab'
-
-" UltiSnips
+Plug 'autozimu/LanguageClient-neovim', {
+ \ 'branch': 'next',
+ \ 'do': 'bash install.sh',
+ \ }
-Plug 'SirVer/ultisnips'
+Plug '/usr/share/vim/vimfiles/plugin/fzf.vim'
+Plug 'junegunn/fzf.vim'
-" Mail
Plug 'paretje/deoplete-notmuch', {'for': 'mail'}
-" Git
Plug 'tpope/vim-fugitive'
-" Camel/Snake case movement
-Plug 'bkad/CamelCaseMotion'
+Plug 'chaoren/vim-wordmotion'
call plug#end()
-" Enable CamelCaseMotion
-call camelcasemotion#CreateMotionMappings('<leader>')
-
" Deoplete
inoremap <expr><C-h> deoplete#smart_close_popup()."\<C-h>"
inoremap <expr><BS> deoplete#smart_close_popup()."\<C-h>"
-" supertab
-
-let g:SuperTabDefaultCompletionType = "<c-n>"
-
+function! s:check_back_space() abort "{{{
+ let col = col('.') - 1
+ return !col || getline('.')[col - 1] =~ '\s'
+endfunction"}}}
+imap <silent><expr> <TAB>
+ \ pumvisible() ? "\<C-n>" :
+ \ <SID>check_back_space() ? "\<TAB>" :
+ \ neosnippet#expandable_or_jumpable() ?
+ \ "\<Plug>(neosnippet_expand_or_jump)" :
+ \ deoplete#manual_complete()
+let g:deoplete#enable_at_startup = 1
-let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpForwardTrigger="<c-b>"
-let g:UltiSnipsJumpBackwardTrigger="<c-z>"
-
-"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
-"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
-"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
-if (empty($TMUX))
- if (has("nvim"))
- "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
- let $NVIM_TUI_ENABLE_TRUE_COLOR=1
- endif
- "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
- "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
- " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
- if (has("termguicolors"))
- set termguicolors
- endif
+" Neosnipet
+" Note: It must be "imap" and "smap". It uses <Plug> mappings.
+imap <C-j> <Plug>(neosnippet_expand_or_jump)
+smap <C-j> <Plug>(neosnippet_expand_or_jump)
+xmap <C-j> <Plug>(neosnippet_expand_target)
+
+" SuperTab like snippets behavior.
+" Note: It must be "imap" and "smap". It uses <Plug> mappings.
+"imap <expr><TAB>
+" \ pumvisible() ? "\<C-n>" :
+" \ neosnippet#expandable_or_jumpable() ?
+" \ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
+" smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+" \ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
+
+" For conceal markers.
+if has('conceal')
+ set conceallevel=2 concealcursor=niv
endif
-" Disable latexBox in polyglot
-let g:polyglot_disabled = ['latex']
-
+" lightline
let g:lightline = {
- \ 'colorscheme': 'onedark',
- \ }
-
-filetype plugin on
-
-autocmd Filetype python call SetPythonOptions()
-function SetPythonOptions()
- setlocal tabstop=4
- setlocal softtabstop=4
- setlocal shiftwidth=4
- setlocal textwidth=79
- setlocal expandtab
- setlocal autoindent
- setlocal fileformat=unix
-endfunction
-
-autocmd Filetype tex call SetTeXOptions()
-function SetTeXOptions()
- setlocal sw=2
- setlocal textwidth=79
- setlocal iskeyword+=:
- setlocal spell! spelllang=pl
-endfunction
+ \ 'colorscheme': 'onedark',
+ \ }
+" vimtex
let g:vimtex_view_method = 'zathura'
let g:vimtex_compiler_progname = 'nvr'
if !exists('g:deoplete#omni#input_patterns')
- let g:deoplete#omni#input_patterns = {}
+ let g:deoplete#omni#input_patterns = {}
endif
let g:deoplete#omni#input_patterns.tex = g:vimtex#re#deoplete
+" Nvim-R
call deoplete#custom#option('omni_patterns', {
- \ 'r': ['[^. *\t]\.\w*', '\h\w*::\w*', '\h\w*\$\w*'],
- \})
+ \ 'r': ['[^. *\t]\.\w*', '\h\w*::\w*', '\h\w*\$\w*'],
+ \})
+
+" let R_latexcmd = ['latexmk','-pdf','-pdflatex="lualatex -synctex=1 -interaction=nonstopmode"']
+" OmniSharp
call deoplete#custom#option('sources', {
- \ 'cs': ['omnisharp'],
- \ })
+ \ 'cs': ['omnisharp'],
+ \ })
let g:OmniSharp_server_use_mono = 1
+"NERDTree
map <C-k> :NERDTreeToggle<CR>
-set hidden
+" LanguageClient
+"
let g:LanguageClient_autoStart = 1
let g:LanguageClient_serverCommands = {
- \ 'javascript': ['javascript-typescript-stdio'],
- \ 'javascript.jsx': ['javascript-typescript-stdio'],
- \ 'python': ['pyls'],
- \ 'julia': ['julia', '--startup-file=no', '--history-file=no', '-e', '
- \ using LanguageServer;
- \ using Pkg;
- \ import StaticLint;
- \ import SymbolServer;
- \ env_path = dirname(Pkg.Types.Context().env.project_file);
- \ debug = false;
- \
- \ server = LanguageServer.LanguageServerInstance(stdin, stdout, debug, env_path, "", Dict());
- \ server.runlinter = true;
- \ run(server);
- \ '],
- \ 'c': ['ccls', '--log-file=/tmp/cc.log'],
- \ 'cpp': ['ccls', '--log-file=/tmp/cc.log'],
- \ 'cuda': ['ccls', '--log-file=/tmp/cc.log'],
- \ 'objc': ['ccls', '--log-file=/tmp/cc.log'],
- \ }
+ \ 'javascript': ['javascript-typescript-stdio'],
+ \ 'javascript.jsx': ['javascript-typescript-stdio'],
+ \ 'python': ['pyls'],
+ \ 'julia': ['julia', '--startup-file=no', '--history-file=no', '-e', '
+ \ using LanguageServer;
+ \ using Pkg;
+ \ import StaticLint;
+ \ import SymbolServer;
+ \ env_path = dirname(Pkg.Types.Context().env.project_file);
+ \ debug = false;
+ \
+ \ server = LanguageServer.LanguageServerInstance(stdin, stdout, debug, env_path, "", Dict());
+ \ server.runlinter = true;
+ \ run(server);
+ \ '],
+ \ 'c': ['ccls', '--log-file=/tmp/cc.log'],
+ \ 'cpp': ['ccls', '--log-file=/tmp/cc.log'],
+ \ 'cuda': ['ccls', '--log-file=/tmp/cc.log'],
+ \ 'objc': ['ccls', '--log-file=/tmp/cc.log'],
+ \ }
let g:LanguageClient_loadSettings = 1 " Use an absolute configuration path if you want system-wide settings
let g:LanguageClient_settingsPath = '/home/shyman/.config/nvim/settings.json'
-let g:LanguageClient_hasSnippetSupport = 0
-
-let g:deoplete#enable_at_startup = 1
nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
-" let R_latexcmd = ['latexmk','-pdf','-pdflatex="lualatex -synctex=1 -interaction=nonstopmode"']
+" vim-racer
+let g:racer_experimental_completer = 1
-au BufReadPost APKBUILD set syntax=sh noexpandtab
+" vim settings
-syntax on
-colorscheme onedark
+set hidden
+set lazyredraw
+set termguicolors
set noshowmode
+set wildmenu
set nu
set mouse=a
-
-set tabstop=8
+set tabstop=4
set softtabstop=4
set shiftwidth=4
-set noexpandtab
+set expandtab
+set autoindent
+
+syntax on
+
+filetype on
+filetype plugin on
+filetype indent on
+
+colorscheme onedark
tnoremap <Esc> <C-\><C-n>
au TermOpen * setlocal nonumber norelativenumber
+
+au BufReadPost APKBUILD set syntax=sh noexpandtab
+
+autocmd Filetype python call SetPythonOptions()
+function SetPythonOptions()
+ setlocal textwidth=79
+ setlocal fileformat=unix
+endfunction
+
+autocmd Filetype tex call SetTeXOptions()
+function SetTeXOptions()
+ setlocal sw=2
+ setlocal textwidth=79
+ setlocal iskeyword+=:
+ setlocal spell! spelllang=pl
+endfunction
