Cleanup and Node Version Manager

install/.zshrc

@@ -2,6 +2,10 @@
 export ZSH="$HOME/.oh-my-zsh"
 source $ZSH/oh-my-zsh.sh
 
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
 # Use zplug
 source ~/.zplug/init.zsh
 

vimcfg.vim

@@ -13,15 +13,6 @@ Plug 'borissov/fugitive-gitea'
 " Ale: Runs fast and works well.
 Plug 'dense-analysis/ale'
 
-" deoplete: Ale wants this for code completeopt (fucking dependency hell)
-Plug 'Shougo/deoplete.nvim'
-Plug 'roxma/nvim-yarp'
-Plug 'roxma/vim-hug-neovim-rpc'
-
-" deoplete PHP support
-Plug 'phpactor/phpactor' ,  {'do': 'composer install', 'for': 'php'}
-Plug 'kristijanhusak/deoplete-phpactor'
-
 " Better HTML PHP support
 Plug 'beanworks/vim-phpfmt'
 
@@ -50,7 +41,7 @@ Plug 'fholgado/minibufexpl.vim'
 Plug 'vim-airline/vim-airline'
 
 "" AutoComplPop: Open the popup menu for autocompletion
-"Plug 'vim-scripts/AutoComplPop'
+Plug 'vim-scripts/AutoComplPop'
 
 "" Indexing
 " ctrlp.vim: Quickly find files by name without navigating
@@ -66,13 +57,8 @@ Plug 'tpope/vim-surround'
 " Initialize plugin system
 call plug#end()
 
-"" vim config
+let g:fugitive_gitlab_domains = ['http://gitlab.kreativ.rudel:8001', 'gitlab.kreativ.rudel']
-" Intendation
+let g:fugitive_gitea_domains = ['https://git.doggoat.de']
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set expandtab
-set autoindent
 
 "" NERDTree config
 " Autostart NERDTree on start
@@ -87,22 +73,20 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isT
 let g:ale_fixers = {
 \   '*': ['remove_trailing_lines', 'trim_whitespace'],
 \   'javascript': ['eslint'],
-\   'php': ['phpcbf']
+\   'php': ['phpcbf'],
+\   'rust': ['rustfmt'],
 \}
 
 " Run linter on save
 let g:ale_fix_on_save = 1
 
-" Enable ale completion
+let g:ale_linters = {
-"let g:ale_completion_enabled = 1
+\   'rust': ['rls', 'cargo']
+\}
 
-" Overwrite omnicomplete function with ale
+" Enable completion where available.
-"set omnifunc=ale#completion#OmniFunc
+let g:ale_completion_enabled = 1
-
+set omnifunc=ale#completion#OmniFunc
-" Enable deoplete for Ale
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#ignore_sources = get(g:, 'deoplete#ignore_sources', {})
-let g:deoplete#ignore_sources = ['omni']
 
 "" Gutentags
 " Auto generate ctags on startup
@@ -139,3 +123,13 @@ let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'
 "" Vim Config
 " Some autocompletion settings.
 set completeopt+=longest,menuone,menu,preview
+
+" Add clipboard support
+set clipboard=unnamedplus
+
+" Intendation
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
+set expandtab
+set autoindent

zshcfg/alias.zsh

@@ -22,13 +22,6 @@ alias krinstall="echo '###===  NodeJS  ===###' && npm install && echo '###===  B
 # Quickly ZIP and Delete on enter press
 alias quickzip='ALEXAFILE="${PWD##*/}_$(cat /dev/urandom | env LC_CTYPE=C tr -cd 'a-f0-9' | head -c 32).zip"; zip ${ALEXAFILE} -r * && echo "Press enter to delete file." && read && rm ${ALEXAFILE}'
 
-# Laradock Lo
-alias laraws="docker-compose exec workspace bash"
-alias laramysql="docker-compose exec mysql bash"
-alias laramaria="docker-compose exec mariadb bash"
-
-# alias copydl='file=$(ls -tp ~/Downloads | grep -v /$ | head -1);echo "Copy: ~/Downloads/$file -> $(pwd)/$file"; cp ~/Downloads/$file ./'
-
 copydl() {
 
 	if [ $# -eq 1 ]
@@ -66,3 +59,8 @@ alias gitroot='cd $(git rev-parse --show-toplevel)'
 alias dc-clearmysql='find $(git rev-parse --show-toplevel)/docker/lib/mysql -mindepth 1 -maxdepth 1 -not -name '.gitkeep' -exec rm -rf "{}" \;'
 
 alias gpgcb="xsel --clipboard | sed 's/^ *//g' | gpg2 -d"
+
+if [ -n "$(command -v vimx)" ]; then
+    alias oldvim='vim'
+    alias vim='vimx'
+fi