From 0d2830f9e4319343a1f8d6da9914c568e4bfcc0d Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 1 May 2024 14:14:04 +0200
Subject: [PATCH 1/4] Some history, and starship configuration

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2ff46af..74b070f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 dotfiles
 ========
 
-After having my homedirs in subversion for years, moved this collection to Git in 2014 and standardised over all my machines.
+After having my homedirs in subversion for years, moved this collection to Git [in 2014](https://github.com/aquatix/dotfiles/commit/18c02056381e7c44dd220f6cd54182ce3f040104) and standardised over all my machines (servers, desktops, laptops, phones, tablets).
 
 To install:
 
@@ -27,6 +27,18 @@ Both the shell configuration and vim make use of `fzf`. [fzf is a general-purpos
 If your distribution does not provide a package, [get yours from the releases page](https://github.com/BurntSushi/ripgrep/releases) (there's a .deb for 64-bit systems).
 
 
+## starship prompt
+
+By default, the included fish shell configuration installs and uses the bobthefish prompt, but I have been using the [starship](https://starship.rs/) prompt [since November 2023](https://github.com/aquatix/dotfiles/commit/3836faaaf1e1207ee122eb3b72aa3cab27b4f1f7) and [configuration is included](https://github.com/aquatix/dotfiles/blob/master/.config/starship.toml).
+
+To use, [install starship](https://starship.rs/#quick-install) and link the configuration to activate the configured prompt:
+
+```bash
+cd ~/.config
+ln -s ../.dot/dotfiles/.config/starship.toml
+```
+
+
 ## 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 286796856a694c0776e3f852b3e85f93c96dc9e3 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 29 May 2024 11:24:05 +0200
Subject: [PATCH 2/4] Load wiki too

---
 bin/worknotes | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/worknotes b/bin/worknotes
index 6b23ba8..6ad09ee 100755
--- a/bin/worknotes
+++ b/bin/worknotes
@@ -3,5 +3,7 @@ cd ~/divaultplan
 git pull
 cd ~/divaultphren
 git pull
+cd ~/divaultwiki
+git pull
 #vim -c ":vsp planning_2015.todo" notes_2015.md notes_2014.md
-vim -c "set nofoldenable" ~/divaultplan/planning_2024.todo ~/divaultphren/index.md
+vim -c "set nofoldenable" ~/divaultplan/planning_2024.todo ~/divaultphren/index.md ~/divaultwiki/home.md

From b5d7771bc654583361573ce1b506f878c083e2ef Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 29 May 2024 11:24:40 +0200
Subject: [PATCH 3/4] 20240507: word

---
 .vim/spell/nl.utf-8.add | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index afc02b9..b11a506 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -243,3 +243,4 @@ etensgeluiden
 gebarbecuede
 WTF
 syncthing
+fietsrit

From 78dd4a936dc5b044580bcd3d84150434c9329e47 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 29 May 2024 11:26:01 +0200
Subject: [PATCH 4/4] Source rust cargo env when available

---
 .bashrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.bashrc b/.bashrc
index 109fa1d..592ce91 100644
--- a/.bashrc
+++ b/.bashrc
@@ -218,3 +218,5 @@ export NVM_DIR="${HOME}/.nvm"
 export QT_AUTO_SCREEN_SCALE_FACTOR=1
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+
+[ -f ~/.cargo/env ] && . "$HOME/.cargo/env"