Merge branch 'master' of github.com:cyplo/dotfiles

.setenv.sh

@@ -17,5 +17,8 @@ export KEYTIMEOUT=1
 export VAGRANT_DEFAULT_PROVIDER=virtualbox
 export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
 export NVM_DIR="$HOME/.nvm"
-eval $(luarocks path --bin)
 
+export SDKMAN_DIR="$HOME/.sdkman"
+[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
+
+eval $(luarocks path --bin)

.vimrc.plugins-settings

@@ -16,7 +16,7 @@ let g:ctrlp_show_hidden = 1
 let g:lsp_signs_enabled = 1
 let g:lsp_diagnostics_echo_cursor = 1
 
-" nerdtree startup
+let NERDTreeWinSize = 25
-autocmd StdinReadPre * let s:std_in=1
+autocmd StdinReadPre * silent! let s:std_in=1
-autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | endif
+autocmd VimEnter * silent! f argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif
 

.vimrc.settings

@@ -39,6 +39,7 @@ set relativenumber
 set laststatus=2
 set noshowmode
 set showtabline=1 "only show tabline when more than 1 tab
+set updatetime=300
 
 " exclude quickfix from the buffers list
 augroup qf
@@ -49,3 +50,4 @@ augroup END
 " vimdiff
 set diffopt+=iwhite
 set diffexpr=""
+

.zprezto

@@ -1 +1 @@
-Subproject commit 1f4601e44c989b90dc7314b151891fa60a101251
+Subproject commit 1d58546406bc8f13b910141265f67dbe2f08bd5f

common/up.sh

@@ -113,13 +113,9 @@ if [[ -z $NORUST ]]; then
     "$RUSTUP_TEMP" -y
     rm -f "$RUSTUP_TEMP"
 
-    set +e
     rustup update
-    set -e
     rustup install stable
-    set +e
     rustup install nightly
-    set -e
     rustup default stable
 
     rustup component add rls --toolchain stable
@@ -146,8 +142,8 @@ if [[ -z $NORUST ]]; then
 
     set +e
     cargo install-update -a
-    set -e
     rustup run nightly cargo install-update -a
+    set -e
 fi
 
 set +e

ubuntu/up.sh

@@ -5,7 +5,7 @@ set -v
 
 sudo apt update
 sudo apt -y upgrade
-sudo apt -y --fix-missing install apt-file aptitude aria2 atop cmake curl git glances gnupg2 keepass2 mercurial pv python-dev python-pip python3-pip ruby-dev tmux vim whois zsh dirmngr syncthing net-tools coreutils xclip wget scdaemon flatpak gnome-software-plugin-flatpak ufw
+sudo apt -y --fix-missing install apt-file aptitude aria2 atop cmake curl git glances gnupg2 keepass2 mercurial pv python-dev python-pip python3-pip ruby-dev tmux vim whois zsh dirmngr syncthing net-tools coreutils xclip wget scdaemon flatpak gnome-software-plugin-flatpak ufw tlp
 
 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 
@@ -22,8 +22,8 @@ sudo groupadd docker | true
 sudo usermod -aG docker $USER
 
 if [[ -z $NO_SYSTEMCTL ]]; then
-    sudo systemctl enable docker
+    sudo systemctl enable --now tlp
-    sudo systemctl restart docker
+    sudo systemctl enable --now docker
     sudo systemctl enable --now syncthing@$USER.service
 fi