From 3093434a41a82e1b8fe52e406a99e5aece97512e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Mon, 10 Jun 2019 08:50:12 +0100 Subject: [PATCH 1/5] add adkman env --- .setenv.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.setenv.sh b/.setenv.sh index 47f99422..4b97c943 100644 --- a/.setenv.sh +++ b/.setenv.sh @@ -15,4 +15,8 @@ export EDITOR="vim" 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" \ No newline at end of file +export NVM_DIR="$HOME/.nvm" + +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" + From 84cbef87d08e27c326907f77fd249f887709cb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Mon, 10 Jun 2019 09:44:48 +0100 Subject: [PATCH 2/5] Do not fail on cargo update failures --- common/up.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/up.sh b/common/up.sh index 2afc0b9d..f31a2349 100755 --- a/common/up.sh +++ b/common/up.sh @@ -114,13 +114,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 @@ -147,8 +143,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 From 273872e97c1953bd52d67ee04b27f4e1153a6463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Tue, 11 Jun 2019 10:51:44 +0100 Subject: [PATCH 3/5] Add TLP to Ubuntu --- ubuntu/up.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubuntu/up.sh b/ubuntu/up.sh index 1dce5014..57dbdb53 100755 --- a/ubuntu/up.sh +++ b/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 restart docker + sudo systemctl enable --now tlp + sudo systemctl enable --now docker sudo systemctl enable --now syncthing@$USER.service fi From fe5a0ba35ded2caa5d3173508477a12aba19cccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 13 Jun 2019 08:14:21 +0100 Subject: [PATCH 4/5] Faster update time in vim --- .vimrc.settings | 2 ++ .zprezto | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.vimrc.settings b/.vimrc.settings index 20e97c33..390d3b88 100755 --- a/.vimrc.settings +++ b/.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="" + diff --git a/.zprezto b/.zprezto index 1f4601e4..1d585464 160000 --- a/.zprezto +++ b/.zprezto @@ -1 +1 @@ -Subproject commit 1f4601e44c989b90dc7314b151891fa60a101251 +Subproject commit 1d58546406bc8f13b910141265f67dbe2f08bd5f From b6650b7a2f348ff2a1dc227e54542eca872017c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 13 Jun 2019 08:35:07 +0100 Subject: [PATCH 5/5] Do not show nerdtree startup complaints --- .vimrc.plugins-settings | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vimrc.plugins-settings b/.vimrc.plugins-settings index 59c9599b..02f48376 100644 --- a/.vimrc.plugins-settings +++ b/.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 -autocmd StdinReadPre * 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 +let NERDTreeWinSize = 25 +autocmd StdinReadPre * silent! let s:std_in=1 +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