diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index 075c525..88e432a 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -32,6 +32,11 @@ else let g:prosession_dir = '~/.config/nvim/session/' endif +Plug 'autozimu/LanguageClient-neovim', { + \ 'branch': 'next', + \ 'do': 'bash install.sh', + \ } + Plug 'vim-airline/vim-airline' " status line let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 " automatically displays all buffers when there's only one tab open diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim index 55b7122..81ae103 100644 --- a/apps/neovim/settings.vim +++ b/apps/neovim/settings.vim @@ -1,5 +1,16 @@ scriptencoding utf8 +" configuration for language servers +let g:LanguageClient_serverCommands = { + \ 'rust': ['rustup', 'run', 'stable', 'rls'], + \ 'javascript': ['/usr/local/bin/javascript-typescript-stdio'], + \ 'javascript.jsx': ['tcp://127.0.0.1:2089'], + \ 'haskell': ['/usr/bin/hie-wrapper'], + \ 'python': ['/usr/local/bin/pyls'], + \ } + +let g:LanguageClient_serverCommands = {} + " fix neovim cursor let $NVIM_TUI_ENABLE_CURSOR_SHAPE = 1 diff --git a/de/xloadresources b/de/xloadresources index 9cc58ca..d2b8540 100755 --- a/de/xloadresources +++ b/de/xloadresources @@ -42,7 +42,7 @@ if [ -f "$usermodmap" ]; then fi if [ -d "/etc/X11/xinit/xinitrc.d" ] ; then - for f in "/etc/X11/xinit/xinitrc.d/?*.sh" ; do + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do [ -x "$f" ] && . "$f" done unset f diff --git a/shell/aliases b/shell/aliases index be7100f..00d75ac 100644 --- a/shell/aliases +++ b/shell/aliases @@ -66,7 +66,8 @@ alias tcom="tmux attach -t comms || tmux new -s comms" alias g="git" alias gs="git status" alias gpl="git pull" -alias gp="git push --all" +alias gp="git push" +alias gpa="git push --all && git push --tags" alias grbpf="git push --force-with-lease" alias gac="git add -A && git commit" alias gsur="git submodule update --remote" @@ -143,7 +144,7 @@ if command -v nvim >/dev/null 2>&1; then export EDITOR="nvim" fi -export BROWSER="google-chrome-unstable" +export BROWSER="firefox" # arch aliases # TODO: load os-specific aliases based on running OS diff --git a/shell/paths b/shell/paths index 575a7d3..ac26010 100644 --- a/shell/paths +++ b/shell/paths @@ -7,6 +7,10 @@ export PATH=$PATH:"$GOPATH/bin" export PATH=$PATH:"$DOTFILES_PATH/scripts/bin" export PATH=$PATH:"$HOME/.cargo/bin" +if [ -d "$HOME/.local/bin" ]; then + export PATH=$PATH:"$HOME/.local/bin" +fi + if [ -d "$HOME/.bin" ]; then export PATH=$PATH:"$HOME/.bin" fi