From 3359d7d80dda514449c154ff61944eb5b732f54f Mon Sep 17 00:00:00 2001 From: Josh Fabean Date: Wed, 29 May 2019 19:07:49 -0500 Subject: [PATCH] updated sway and nvim --- .config/nvim/init.vim | 26 +++++++++++++++----------- .config/sway/arch-lappy-sway | 6 +++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 5edd853..503cf40 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -6,6 +6,7 @@ endif call plug#begin() " Plugins +Plug 'miyakogi/seiya.vim' Plug 'ctrlpvim/ctrlp.vim' Plug 'FelikZ/ctrlp-py-matcher' Plug 'jeetsukumaran/vim-filebeagle' @@ -116,17 +117,17 @@ let g:deoplete#omni#input_patterns.java = [ \'[^. \t0-9]\::\w*', \] -call deoplete#custom#set('buffer', 'mark', 'ℬ') -call deoplete#custom#set('ternjs', 'mark', '') -call deoplete#custom#set('omni', 'mark', '⌾') -call deoplete#custom#set('file', 'mark', 'file') -call deoplete#custom#set('jedi', 'mark', '') -call deoplete#custom#set('typescript', 'mark', '') -call deoplete#custom#set('neosnippet', 'mark', '') -call deoplete#custom#set('java', 'mark', '') -call deoplete#custom#set('javacomplete2', 'mark', '') +call deoplete#custom#source('buffer', 'mark', 'ℬ') +call deoplete#custom#source('ternjs', 'mark', '') +call deoplete#custom#source('omni', 'mark', '⌾') +call deoplete#custom#source('file', 'mark', 'file') +call deoplete#custom#source('jedi', 'mark', '') +call deoplete#custom#source('typescript', 'mark', '') +call deoplete#custom#source('neosnippet', 'mark', '') +call deoplete#custom#source('java', 'mark', '') +call deoplete#custom#source('javacomplete2', 'mark', '') -call deoplete#custom#set('typescript', 'rank', 630) +call deoplete#custom#source('typescript', 'rank', 630) set completefunc=autoprogramming#complete let g:deoplete#auto_complete_delay = 50 @@ -134,7 +135,7 @@ let g:deoplete#ignore_sources = get(g:,'deoplete#ignore_sources',{}) let g:deoplete#ignore_sources.java = ['omni'] let g:deoplete#ignore_sources.php = ['omni'] let g:deoplete#omni#functions = get(g:,'deoplete#omni#functions',{}) -call deoplete#custom#set('_', 'matchers', ['matcher_full_fuzzy']) +call deoplete#custom#source('_', 'matchers', ['matcher_full_fuzzy']) inoremap deoplete#mappings#smart_close_popup()."\" inoremap deoplete#mappings#smart_close_popup()."\" inoremap deoplete#mappings#manual_complete() @@ -190,3 +191,6 @@ let g:UltiSnipsJumpBackwardTrigger="" " PHP7 let g:ultisnips_php_scalar_types = 1 +let g:seiya_auto_enable=1 + +let g:seiya_target_groups = has('nvim') ? ['guibg'] : ['ctermbg'] diff --git a/.config/sway/arch-lappy-sway b/.config/sway/arch-lappy-sway index 3fef76e..01add17 100644 --- a/.config/sway/arch-lappy-sway +++ b/.config/sway/arch-lappy-sway @@ -247,9 +247,9 @@ output eDP-1 pos 0 0 res 2880x1800 output DP-1 pos 2880 0 res 1920x1200 output DP-2 pos 4800 0 res 1920x1200 # background images -output eDP-1 bg ~/Wallpapers/stars.jpg stretch -output DP-1 bg ~/Wallpapers/stars.jpg stretch -output DP-2 bg ~/Wallpapers/stars.jpg stretch +output eDP-1 bg ~/Wallpapers/xp-sunrise.png stretch +output DP-1 bg ~/Wallpapers/xp-sunrise.png stretch +output DP-2 bg ~/Wallpapers/xp-sunrise.png stretch bindsym $mod+Shift+m exec --no-startup-id "sway output output DP-1 pos 2880 0 res 1920x1080 && sway ouput DP-2 res 1920x1080" ##############################