summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/init.vim3
-rw-r--r--.config/nvim/plug-config/vim-lsp.vim13
-rw-r--r--.config/nvim/plug.vim6
-rw-r--r--.config/zsh/.zshrc2
-rw-r--r--.config/zsh/plugins.zsh1
5 files changed, 22 insertions, 3 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 496fc47..601ed4c 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -24,7 +24,8 @@ source $XDG_CONFIG_HOME/nvim/settings.vim
source $XDG_CONFIG_HOME/nvim/bindings.vim
source $XDG_CONFIG_HOME/nvim/sidebars.vim
source $XDG_CONFIG_HOME/nvim/langs.vim
-source $XDG_CONFIG_HOME/nvim/plug-config/airline.vim
+"source $XDG_CONFIG_HOME/nvim/plug-config/airline.vim
+source $XDG_CONFIG_HOME/nvim/plug-config/lightline.vim
source $XDG_CONFIG_HOME/nvim/plug-config/asyncomplete.vim
source $XDG_CONFIG_HOME/nvim/plug-config/floaterm.vim
source $XDG_CONFIG_HOME/nvim/plug-config/nerd-commenter.vim
diff --git a/.config/nvim/plug-config/vim-lsp.vim b/.config/nvim/plug-config/vim-lsp.vim
index 03c9d82..fb0d055 100644
--- a/.config/nvim/plug-config/vim-lsp.vim
+++ b/.config/nvim/plug-config/vim-lsp.vim
@@ -21,6 +21,19 @@ highlight LspWarningHighlight cterm=underline gui=underline ctermfg=DarkRed guif
highlight LspInformationHighlight cterm=underline gui=underline ctermfg=Green guifg=Green
highlight LspHintHighlight term=italic cterm=italic gui=italic ctermfg=Green guifg=Green
+augroup LspGo
+ au!
+ autocmd User lsp_setup call lsp#register_server({
+ \ 'name': 'go-lang',
+ \ 'cmd': {server_info->['gopls']},
+ \ 'whitelist': ['go'],
+ \ })
+ autocmd FileType go setlocal omnifunc=lsp#complete
+ "autocmd FileType go nmap <buffer> gd <plug>(lsp-definition)
+ "autocmd FileType go nmap <buffer> ,n <plug>(lsp-next-error)
+ "autocmd FileType go nmap <buffer> ,p <plug>(lsp-previous-error)
+augroup END
+
let g:lsp_signs_priority = 10
let g:lsp_textprop_enabled = 1
let g:lsp_cxx_hl_use_text_props = 1
diff --git a/.config/nvim/plug.vim b/.config/nvim/plug.vim
index bc2cda0..c78b508 100644
--- a/.config/nvim/plug.vim
+++ b/.config/nvim/plug.vim
@@ -29,8 +29,10 @@ Plug 'tpope/vim-speeddating'
Plug 'tpope/vim-surround'
Plug 'unblevable/quick-scope'
Plug 'vifm/vifm.vim'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
+"Plug 'vim-airline/vim-airline'
+"Plug 'vim-airline/vim-airline-themes'
+Plug 'itchyny/lightline.vim'
+Plug 'shinchu/lightline-gruvbox.vim'
Plug 'vim-scripts/grep.vim'
Plug 'voldikss/fzf-floaterm'
Plug 'voldikss/vim-floaterm'
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 3e2d583..963766b 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -11,6 +11,8 @@
# == ===== ==== ==
# ========================
+[ -z "$TMUX" ] && export TERM=xterm-256color || export TERM=screen-256color
+
autoload -U colors && colors
HISTSIZE=1000000
diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh
index 1ef66a9..d6060a0 100644
--- a/.config/zsh/plugins.zsh
+++ b/.config/zsh/plugins.zsh
@@ -12,3 +12,4 @@
# ========================
source $HOME/.local/packs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null
+source $HOME/.local/packs/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh >/dev/null