dotfiles

commit f739246731a438aeafc6521c3a94c170475c881d
parent 6b400fa304af437afa89ccfd6755a5644dab5d77
Author: Ashymad <czilukim@o2.pl>
Date:   Wed, 13 Feb 2019 00:15:27 +0100

Merge remote-tracking branch 'origin/master' into notwobug

Diffstat:
M
emacs/.emacs.d/init.el
 | 
2
+-
M
git/.gitconfig
 | 
2
+-
M
nvim/.config/nvim/init.vim
 | 
51
++++++++++++++++++++++++++++++++++++++++++---------
M
st/.st/config.h
 | 
1
-

4 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
@@ -141,7 +141,7 @@
     ("f142c876b896c6ca19149cacd80ddd68a351f67f7fe3b786274ceee970276780" default)))
  '(package-selected-packages
    (quote
-    (hy-mode slime slime-company use-package rainbow-delimiters zerodark-theme wc-mode flyspell-lazy ess markdown-mode async auctex evil-magit magit evil ## paradox)))
+    (racket-mode hy-mode slime slime-company use-package rainbow-delimiters zerodark-theme wc-mode flyspell-lazy ess markdown-mode async auctex evil-magit magit evil ## paradox)))
  '(paradox-github-token t)
  '(tool-bar-mode nil))
 (custom-set-faces
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -1,3 +1,3 @@
 [user]
-	email = czilukim@o2.pl
+	email = szymon.mikulicz@posteo.net
 	name = Ashymad
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -28,6 +28,9 @@ Plug 'lervag/vimtex'
 " Rust
 Plug 'rust-lang/rust.vim'
 
+" C#
+Plug 'OmniSharp/omnisharp-vim'
+
 " R
 Plug 'jalvesaq/Nvim-R'
 
@@ -41,9 +44,14 @@ Plug 'autozimu/LanguageClient-neovim', {
 
 Plug 'junegunn/fzf'
 
-" Snippets
-Plug 'Shougo/neosnippet'
-Plug 'Shougo/neosnippet-snippets'
+Plug 'ervandew/supertab'
+
+" UltiSnips
+
+Plug 'SirVer/ultisnips'
+
+" Mail
+Plug 'paretje/deoplete-notmuch', {'for': 'mail'}
 
 " Git
 Plug 'tpope/vim-fugitive'
@@ -57,14 +65,18 @@ call plug#end()
 call camelcasemotion#CreateMotionMappings('<leader>')
 
 " Deoplete
-let g:deoplete#enable_at_startup = 1
 inoremap <expr><C-h> deoplete#smart_close_popup()."\<C-h>"
 inoremap <expr><BS> deoplete#smart_close_popup()."\<C-h>"
-set completeopt+=noinsert
 
-" neosnippet
+" supertab
+
+let g:SuperTabDefaultCompletionType = "<c-n>"
 
-let g:neosnippet#enable_completed_snippet = 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
@@ -122,6 +134,11 @@ call deoplete#custom#option('omni_patterns', {
 	    \ 'r': ['[^. *\t]\.\w*', '\h\w*::\w*', '\h\w*\$\w*'],
 	    \})
 
+call deoplete#custom#option('sources', {
+	    \ 'cs': ['omnisharp'],
+	    \ })
+
+let g:OmniSharp_server_use_mono = 1
 
 map <C-k> :NERDTreeToggle<CR>
 
@@ -130,15 +147,31 @@ let g:LanguageClient_autoStart = 1
 let g:LanguageClient_serverCommands = {
     \ 'javascript': ['javascript-typescript-stdio'],
     \ 'javascript.jsx': ['javascript-typescript-stdio'],
-    \ "python": ['pyls'],
+    \ 'python': ['pyls'],
     \ 'julia': ['julia', '--startup-file=no', '--history-file=no', '-e', '
     \     using LanguageServer;
-    \     server = LanguageServer.LanguageServerInstance(stdin, stdout, false);
+    \     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>
diff --git a/st/.st/config.h b/st/.st/config.h
@@ -183,7 +183,6 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ TERMMOD,              XK_I,           iso14755,       {.i =  0} },
 	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
 	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
 };