From 640ba449fb83c02d27c585e3fe5dab2578008fdd Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 26 Jan 2025 13:55:48 +0100 Subject: [PATCH 1/9] YouCompleteMe legacy branches for older vim versions --- .vimrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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' } From c0ba50cf359800b91c2898e6dad71d5d04b7445d Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 10 Feb 2025 17:06:31 +0100 Subject: [PATCH 2/9] Packages --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 74b070f..dbee6aa 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,15 @@ 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 tmux htop +``` + + ## 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 From 739ab149c55029adca0de88ecb4dc00c7d9ecf95 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 11 Feb 2025 18:04:01 +0100 Subject: [PATCH 3/9] Local binaries, like uv --- .bashrc | 2 ++ 1 file changed, 2 insertions(+) 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" From 436a28f702e9ce8241c65405cf2925fee1ca035d Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 11 Feb 2025 18:04:53 +0100 Subject: [PATCH 4/9] More dependencies/good stuff --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dbee6aa..4cc8660 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,11 @@ ln -s ../.dot/dotfiles/.config/starship.toml To have the full experience, install all of these: ```bash -sudo apt install git curl vim-nox fzf ripgrep exuberant-ctags fish tmux htop +sudo apt install git curl vim-nox fzf ripgrep exuberant-ctags fish grc tmux htop +# needed for building vim plugins: +sudo apt install cmake build-essentials +# also, this classic: +sudo apt install mc ``` From 37e92734d7d0086d6428f8252a5ca213b87682b2 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 16 Mar 2025 18:53:06 +0100 Subject: [PATCH 5/9] Words --- .vim/spell/en.utf-8.add | 2 ++ .vim/spell/nl.utf-8.add | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 83653b4..b2ca5b9 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -15,3 +15,5 @@ backend dammIT isso diginaut +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 From 3c9b12b400a0b419198a3e128f59ba7b3d40e3c6 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Thu, 20 Mar 2025 13:25:14 +0100 Subject: [PATCH 6/9] 20250304: word --- .vim/spell/en.utf-8.add | 1 + 1 file changed, 1 insertion(+) diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 83653b4..5d22283 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -15,3 +15,4 @@ backend dammIT isso diginaut +jailbreaking From cd550ea3fe8d50fe0148339548bc70abf28ee707 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 1 Apr 2025 16:12:54 +0200 Subject: [PATCH 7/9] direnv is used by the fish configuration --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cc8660..0f729f0 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ ln -s ../.dot/dotfiles/.config/starship.toml 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 +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: From 75666f9add5675f396fedcbdee4d626a5e60d65a Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 1 Apr 2025 16:13:08 +0200 Subject: [PATCH 8/9] Automatically install starship config when wanted --- install.sh | 9 +++++++++ 1 file changed, 9 insertions(+) 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?" From c394e8be26db4e0b0e51fee485efd8808ecf368b Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 2 Apr 2025 17:20:53 +0200 Subject: [PATCH 9/9] 20250214: Argonaut terminal theme from Gogh --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4cc8660..96c2d2c 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ sudo apt install cmake build-essentials 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