summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/airline.vim2
-rw-r--r--modules/deoplete.vim8
-rw-r--r--modules/pythonpath.vim2
-rw-r--r--modules/theme.vim45
4 files changed, 39 insertions, 18 deletions
diff --git a/modules/airline.vim b/modules/airline.vim
index 6d2aae4c..9f376f76 100644
--- a/modules/airline.vim
+++ b/modules/airline.vim
@@ -3,7 +3,7 @@ let g:airline#extensions#tabline#enabled = 1
" enable powerline fonts
let g:airline_powerline_fonts = 1
" Switch to your current theme
-let g:airline_theme = 'codedark'
+let g:airline_theme = 'onedark'
" Always show tabs
set showtabline=2
" We don't need to see things like -- INSERT -- anymore
diff --git a/modules/deoplete.vim b/modules/deoplete.vim
index 7498329d..4023f5fc 100644
--- a/modules/deoplete.vim
+++ b/modules/deoplete.vim
@@ -26,9 +26,11 @@ inoremap <silent><expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
inoremap <expr><BS> deoplete#smart_close_popup()."\<C-h>"
-call deoplete#custom#option('sources', {
- \ 'python': ['file', 'LanguageClient', 'neosnippet'],
- \ })
+" Only get completion candidates from these
+"call deoplete#custom#option('sources', {
+ "\ 'python': ['file', 'LanguageClient', 'neosnippet'],
+ "\ })
+
" Sort matches alphabetically
call deoplete#custom#source('_', 'sorters', ['sorter_word'])
" Disable shorter or equal length matches
diff --git a/modules/pythonpath.vim b/modules/pythonpath.vim
index 676078bc..6fdc0ba0 100644
--- a/modules/pythonpath.vim
+++ b/modules/pythonpath.vim
@@ -1 +1 @@
-let g:python3_host_prog = expand("~/.miniconda/envs/neovim/bin/python3.7")
+let g:python3_host_prog = expand("~/.miniconda/envs/neovim/bin/python3.8")
diff --git a/modules/theme.vim b/modules/theme.vim
index 164e7356..34a4e98b 100644
--- a/modules/theme.vim
+++ b/modules/theme.vim
@@ -1,21 +1,40 @@
-
" Switch to whatever colorscheme you like
-"colorscheme onedark
-""colorscheme gruvbox
-colorscheme codedark
-
-" This chunk is just for spacevim theme
-"colorscheme space-vim-dark
-"let g:space_vim_dark_background = 235
-"color space-vim-dark
-
-" gray comments
-""hi Comment guifg=#5C6370 ctermfg=59
-" this will show italics if your terminal supports that
+
+" onedark.vim override: Don't set a background color when running in a terminal;
+" just use the terminal's background color
+" `gui` is the hex color code used in GUI mode/nvim true-color mode
+" `cterm` is the color code used in 256-color mode
+" `cterm16` is the color code used in 16-color mode
+if (has("autocmd") && !has("gui_running"))
+ augroup colorset
+ autocmd!
+ let s:white = { "gui": "#ABB2BF", "cterm": "145", "cterm16" : "7" }
+ autocmd ColorScheme * call onedark#set_highlight("Normal", { "fg": s:white }) " `bg` will not be styled since there is no `bg` setting
+ augroup END
+endif
+
hi Comment cterm=italic
+let g:onedark_hide_endofbuffer=1
+let g:onedark_terminal_italics=1
+let g:onedark_termcolors=256
+
+syntax on
+colorscheme onedark
+
" checks if your terminal has 24-bit color support
if (has("termguicolors"))
set termguicolors
hi LineNr ctermbg=NONE guibg=NONE
endif
+
+" Syntax highlighting
+let g:python_highlight_all=1
+
+" Change this when you know where i3 will be
+aug i3config_ft_detection
+ au!
+ au BufNewFile,BufRead ~/.config/i3/config set filetype=i3config
+aug end
+
+" TODO checkout vim-jsx