diff --git a/.bashrc b/.bashrc index 592ce91..51892dc 100644 --- a/.bashrc +++ b/.bashrc @@ -220,3 +220,5 @@ export QT_AUTO_SCREEN_SCALE_FACTOR=1 [ -f ~/.fzf.bash ] && source ~/.fzf.bash [ -f ~/.cargo/env ] && . "$HOME/.cargo/env" + +[ -f ~/.local/bin/env ] && . "$HOME/.local/bin/env" diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index faaf1b1..ea1f146 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -16,3 +16,6 @@ dammIT isso diginaut Pratchett +jailbreaking +plugin +Readeck diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index 8105f89..cf0ecfb 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -250,3 +250,5 @@ SSO-gebruikers hacktop computerwerk labwerk +PowerPoint +Kubuntu diff --git a/.vimrc b/.vimrc index f96a6e8..7f8c38a 100644 --- a/.vimrc +++ b/.vimrc @@ -327,9 +327,13 @@ if !filereadable(skip_ycm) " Only load YouCompleteMe if ~/.dot_no_ycm does not " sudo apt-get install python-dev " cd ~/.vim/bundle/YouCompleteMe " ./install.py # For C-style languages: ./install.py --clang-completer - if has('patch-8.1.2269') + if has('patch-9.1.0016') " Latest YCM needs at least this version of vim Plug 'ycm-core/YouCompleteMe' + elseif has('8.2.3995') + Plug 'ycm-core/YouCompleteMe', { 'branch':'legacy-vim-8.2' } + elseif has('8.1.2269') + Plug 'ycm-core/YouCompleteMe', { 'branch':'legacy-vim-8.1' } else " Version compatible with the vim in Debian 10 buster " Plug 'ycm-core/YouCompleteMe', { 'commit':'d98f896' } diff --git a/README.md b/README.md index 74b070f..aceeae8 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,21 @@ ln -s ../.dot/dotfiles/.config/starship.toml ``` +## All dependencies + +To have the full experience, install all of these: + +```bash +sudo apt install git curl vim-nox fzf ripgrep exuberant-ctags fish grc tmux htop direnv +# needed for building vim plugins: +sudo apt install cmake build-essentials +# also, this classic: +sudo apt install mc +``` + +and maybe install a nice colour theme for your terminal from https://gogh-co.github.io/Gogh/ - I use argonaut with a black background myself. + + ## vim config The [.vimrc](https://github.com/aquatix/dotfiles/blob/master/.vimrc) has a lot going on. [Find out more about my tweaks](https://dammit.nl/tag/vim.html) and use `:Maps` in vim itself to see key mappings diff --git a/install.sh b/install.sh index f15fdbc..9fe7b0e 100644 --- a/install.sh +++ b/install.sh @@ -128,6 +128,15 @@ elif [ ! -e ~/.dot/.dot_no_fish ]; then done fi +echo +echo "Do you wish to install the starship prompt?" +select yn in "Yes" "No"; do + case $yn in + Yes ) make_link $DIR ".config/starship.yml"; curl -sS https://starship.rs/install.sh | sh; break;; + No ) break;; + esac +done + if [ ! -e ~/.dot_is_server ] && [ ! -e ~/.dot_no_server ]; then echo echo "Is this machine a server?"