Use unique tmpdir

.bashrc

@@ -218,3 +218,7 @@ export NVM_DIR="${HOME}/.nvm"
 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"

.config/fish/config.fish

@@ -167,4 +167,8 @@ function jl
 end
 
 # Initialise starship theme
+# curl -sS https://starship.rs/install.sh|sh
 starship init fish | source
+
+#  https://direnv.net/
+direnv hook fish | source

.config/starship.toml

@@ -1,5 +1,6 @@
 format = """
 [](#9A348E)\
+$jobs\
 $os\
 $username\
 [](bg:#DA627D fg:#9A348E)\
@@ -29,9 +30,18 @@ $time\
 $cmd_duration\
 """
 
+# Timeout for commands executed by starship (ms)
+command_timeout = 2000
+
 # Disable the blank line at the start of the prompt
 # add_newline = false
 
+# Backgrounded processes
+[jobs]
+style = "bg:#9A348E"
+symbol = '✦'
+format = '[$number$symbol ]($style)'
+
 # You can also replace your username with a neat symbol like   or disable this
 # and use the os module below
 [username]
@@ -57,10 +67,11 @@ truncation_symbol = "…/"
 # Here is how you can shorten some long paths by text replacement
 # similar to mapped_locations in Oh My Posh:
 [directory.substitutions]
-"Documents" = "󰈙 "
-"Downloads" = " "
-"Music" = " "
-"Pictures" = " "
+"Documents" = "󰈙"
+"Downloads" = ""
+"Music" = ""
+"Pictures" = ""
+"workspace" = ""
 # Keep in mind that the order matters. For example:
 # "Important Documents" = " 󰈙 "
 # will not be replaced, because "Documents" was already substituted before.
@@ -68,24 +79,24 @@ truncation_symbol = "…/"
 # "Important 󰈙 " = " 󰈙 "
 
 [c]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [docker_context]
-symbol = " "
+symbol = ""
 style = "bg:#06969A"
 format = '[ $symbol $context ]($style) $path'
 
 [elixir]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [elm]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [git_branch]
 symbol = ""
@@ -94,57 +105,72 @@ truncation_length = 30
 format = '[ $symbol $branch ]($style)'
 
 [git_status]
+ahead = '⇡${count}'
+diverged = '⇕⇡${ahead_count}⇣${behind_count}'
+behind = '⇣${count}'
+#    
 style = "bg:#FCA17D"
-format = '[$all_status$ahead_behind ]($style)'
+# style = "bg:#fb7d4b"
+# style = "bg:#fb7d4b fg:#ff0000"
+# style = "fg:#000000 bg:#FCA17D"
+# style = "fg:#ff0000 bg:#FCA17D"
+# staged = ''
+# modified = ''
+# untracked = '?'
+# format = '[$all_status$ahead_behind ]($style)'
+format = '[$all_status$ahead_behind]($style)'
+# format = '[$all_status$ahead_behind]($style)[ ](bg:#FCA17D)'
+# format = '[$all_status$ahead_behind]($style)[ ](bg:#FCA17D)'
+# format = '[](bg:#fb7d4b fg:#FCA17D)[$all_status$ahead_behind]($style)[](bg:#FCA17D fg:#fb7d4b)'
 
 [golang]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [gradle]
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [haskell]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [java]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [julia]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [nodejs]
 symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [nim]
-symbol = "󰆥 "
+symbol = "󰆥"
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [python]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($virtualenv) ]($style)'
+format = '[ $symbol( $virtualenv) ]($style)'
 
 [rust]
 symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [scala]
-symbol = " "
+symbol = ""
 style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
+format = '[ $symbol( $version) ]($style)'
 
 [cmd_duration]
 min_time = 2000

.config/zed/settings.json

@@ -0,0 +1,25 @@
+// Zed settings
+//
+// For information on how to configure Zed, see the Zed
+// documentation: https://zed.dev/docs/configuring-zed
+//
+// To see all of Zed's default settings without changing your
+// custom settings, run `zed: open default settings` from the
+// command palette (cmd-shift-p / ctrl-shift-p)
+{
+  "vim_mode": true,
+  "icon_theme": "Material Icon Theme",
+  "base_keymap": "JetBrains",
+  "ui_font_size": 16,
+  "buffer_font_size": 15,
+  "terminal": {
+    "font_family": "MonaspiceNe Nerd Font Mono",
+    "font_size": 15,
+    "line_height": "standard"
+  },
+  "theme": {
+    "mode": "dark",
+    "light": "One Light",
+    "dark": "Zedokai Darker"
+  }
+}

.gitconfig

@@ -74,3 +74,11 @@
 	directory = /mnt/chromeos/PlayFiles/Documents/phren
 	directory = /mnt/chromeos/PlayFiles/Documents/divaultphren
 	directory = /mnt/chromeos/PlayFiles/Documents/mydocs
+#[http]
+#	postBuffer = 1048576000
+#	lowSpeedLimit = 0
+#	lowSpeedTime = 999999
+[init]
+	defaultBranch = main
+[merge]
+	tool = vimdiff

.local/share/org.gnome.Ptyxis/palettes/diginaut.palette

@@ -0,0 +1,25 @@
+[Palette]
+Name=Diginaut
+Background=#000000
+Foreground=#FFFAF4
+Cursor=#FFFAF4
+Color0=#232323
+Color1=#FF000F
+Color2=#8CE10B
+Color3=#FFB900
+Color4=#008DF8
+Color5=#6D43A6
+Color6=#00D8EB
+Color7=#FFFFFF
+Color8=#444444
+Color9=#FF2740
+Color10=#ABE15B
+Color11=#FFD242
+Color12=#0092FF
+Color13=#9A5FEB
+Color14=#67FFF0
+Color15=#FFFFFF
+
+# This file was generated from https://github.com/Gogh-Co/Gogh/tree/master/themes/Argonaut.yml
+# Modified by aquatix/diginaut
+

.vim/spell/en.utf-8.add

@@ -15,3 +15,8 @@ backend
 dammIT
 isso
 diginaut
+Pratchett
+jailbreaking
+plugin
+Readeck
+enshittification

.vim/spell/nl.utf-8.add

@@ -241,3 +241,17 @@ hackathon
 knakkende
 etensgeluiden
 gebarbecuede
+WTF
+syncthing
+Madurodam
+fietsrit
+multifactorauthenticatie
+SSO-gebruikers
+hacktop
+computerwerk
+labwerk
+PowerPoint
+Kubuntu
+Ichthus
+Castor
+JungleTrain

.vim/syntax/todo.vim

@@ -22,8 +22,8 @@ syntax match todoDayKeyword "Hackathon"
 syntax match todoDayKeyword "hackathon"
 syntax match todoDayKeyword "papadag"
 syntax match todoDayKeyword "vrije dag"
-syntax match todoDayKeyword "vrij"
-syntax match todoDayKeyword "Vrij"
+"syntax match todoDayKeyword "vrij"
+"syntax match todoDayKeyword "Vrij"
 syntax match todoDayKeyword "koningsdag"
 "syntax match todoDayKeyword "ill"
 syntax match todoDayKeyword "ziek"
@@ -51,16 +51,16 @@ highlight scratchThis ctermfg=Grey guifg=#666666
 " Task statuses
 syntax match todoNote "\v^\s{-}n .*$" nextgroup=todoNote
 syntax match todoNote "\v^  .*$" nextgroup=todoNote
-highlight todoNote ctermfg=Grey guifg=#666666
+highlight todoNote ctermfg=Grey guifg=#666666 cterm=italic
 
 syntax match todoStatusDone "\v^\s{-}v " nextgroup=todoItem skipwhite
 highlight todoStatusDone ctermfg=green guifg=#00ff00
 
 syntax match todoStatusCancelled "\v^\s{-}x .*$" nextgroup=todoItem skipwhite
-highlight todoStatusCancelled ctermfg=DarkGreen guifg=#005f00
+highlight todoStatusCancelled ctermfg=DarkGreen guifg=#005f00 cterm=italic
 
 syntax match todoStatusDoing "\v^\s{-}d .*$" nextgroup=todoItem skipwhite
-highlight todoStatusDoing ctermfg=223 guifg=#f0dfaf
+highlight todoStatusDoing ctermfg=223 guifg=#f0dfaf cterm=italic
 
 syntax match todoStatusTest "\v^\s{-}t " nextgroup=todoItem skipwhite
 highlight todoStatusTest ctermfg=darkcyan guifg=#6666ff
@@ -70,7 +70,7 @@ highlight todoStatusTodo ctermfg=red guifg=#ff0000
 
 syntax match todoStatusImportant "\v^\s{-}\> .*$" nextgroup=todoItem skipwhite
 syntax match todoStatusImportant "\v^\s{-}! .*$" nextgroup=todoItem skipwhite
-highlight todoStatusImportant ctermfg=167 guifg=#d75f5f
+highlight todoStatusImportant ctermfg=167 guifg=#d75f5f cterm=italic
 
 syntax match todoStatusQuestion "\v^\s{-}\? " nextgroup=todoItem skipwhite
 highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff

.vimrc

@@ -293,7 +293,8 @@ map <F9> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<
 Plug 'Yggdroot/indentLine'
 let g:indentLine_char = '┊'
 "let g:indentLine_setConceal = 0
-let g:indentLine_conceallevel = 1
+"let g:indentLine_conceallevel = 1
+let g:indentLine_conceallevel = 0
 " Do not conceal LaTeX symbols
 let g:tex_conceal=""
 
@@ -326,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' }
@@ -444,6 +449,9 @@ let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
 Plug 'lervag/wiki.vim'
 " Config below, after plug#end()
 
+" marksman LSP integration (ALE) for advanced Markdown organising
+Plug 'artempyanykh/marksman'
+
 
 if $USER != 'root'
     " notational velocity with fzf: quickly search and open notes
@@ -581,6 +589,21 @@ fun! TrimWhitespace()
 endfun
 command! TrimWhitespace call TrimWhitespace()
 
+" Visually select text then press ~ to convert the text to UPPER CASE, then to lower case, then to Title Case.
+" Keep pressing ~ until you get the case you want.
+" https://vim.fandom.com/wiki/Switching_case_of_characters
+function! TwiddleCase(str)
+  if a:str ==# toupper(a:str)
+    let result = tolower(a:str)
+  elseif a:str ==# tolower(a:str)
+    let result = substitute(a:str,'\(\<\w\+\>\)', '\u\1', 'g')
+  else
+    let result = toupper(a:str)
+  endif
+  return result
+endfunction
+vnoremap ~ y:call setreg('', TwiddleCase(@"), getregtype(''))<CR>gv""Pgv
+
 " enable words completion
 set dictionary+=/usr/share/dict/words
 " use ctrl-n ctrl-n instead of ctrl-x ctrl-k

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,33 @@ 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
+```
+
+
+## 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-essential
+# 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

bin/font_update

@@ -34,6 +34,32 @@ FiraCodeNerdFontMono-Medium.ttf
 FiraCodeNerdFontMono-Regular.ttf
 FiraCodeNerdFontMono-Retina.ttf
 FiraCodeNerdFontMono-SemiBold.ttf
+JetBrainsMonoNerdFontMono-BoldItalic.ttf
+JetBrainsMonoNerdFontMono-Bold.ttf
+JetBrainsMonoNerdFontMono-ExtraBoldItalic.ttf
+JetBrainsMonoNerdFontMono-ExtraBold.ttf
+JetBrainsMonoNerdFontMono-ExtraLightItalic.ttf
+JetBrainsMonoNerdFontMono-ExtraLight.ttf
+JetBrainsMonoNerdFontMono-Italic.ttf
+JetBrainsMonoNerdFontMono-LightItalic.ttf
+JetBrainsMonoNerdFontMono-Light.ttf
+JetBrainsMonoNerdFontMono-MediumItalic.ttf
+JetBrainsMonoNerdFontMono-Medium.ttf
+JetBrainsMonoNerdFontMono-Regular.ttf
+JetBrainsMonoNerdFontMono-SemiBoldItalic.ttf
+JetBrainsMonoNerdFontMono-SemiBold.ttf
+JetBrainsMonoNerdFontMono-ThinItalic.ttf
+JetBrainsMonoNerdFontMono-Thin.ttf
+LilexNerdFont-BoldItalic.ttf
+LilexNerdFont-Bold.ttf
+LilexNerdFont-ExtraLightItalic.ttf
+LilexNerdFont-ExtraLight.ttf
+LilexNerdFont-Italic.ttf
+LilexNerdFont-MediumItalic.ttf
+LilexNerdFont-Medium.ttf
+LilexNerdFont-Regular.ttf
+LilexNerdFont-ThinItalic.ttf
+LilexNerdFont-Thin.ttf
 MonaspiceNeNerdFontMono-BoldItalic.otf
 MonaspiceNeNerdFontMono-Bold.otf
 MonaspiceNeNerdFontMono-Italic.otf
@@ -125,11 +151,14 @@ overpass-semibold.otf
 overpass-thin-italic.otf
 overpass-thin.otf
 Fira Code Bold Nerd Font Complete Mono.ttf
-Fira Code Bold Nerd Font Complete Mono.ttf
+Fira Code Regular Nerd Font Complete Mono.ttf
 Hack Bold Nerd Font Complete Mono.ttf
 Hack Regular Nerd Font Complete Mono.ttf
 Hack Bold Italic Nerd Font Complete Mono.ttf
-Hack Italic Nerd Font Complete Mono.ttf'
+Hack Italic Nerd Font Complete Mono.ttf
+JetBrainsMono-Bold-Italic.ttf
+JetBrainsMono-ExtraBold-Italic.ttf
+JetBrainsMono-Medium-Italic.ttf'
 
 if [ -e ~/.dot_is_server ]; then
     # Update from the repo
@@ -243,7 +272,8 @@ else
         done <<< "$FONTS_DELETE"
         # Just to be sure, clear and refresh your font cache and restart Firefox
         fc-cache -f -v
-        echo 'You might want to restart your browser'
+        echo
+        echo '/!\ You might want to restart your browser and/or terminals'
     else
         echo "$SOURCE_DIR not found, aborting"
     fi

bin/update_discord

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Use a uniquely named, temporary directory to download to
+TMPDIR=$(mktemp -d)
+
+wget "https://discord.com/api/download?platform=linux&format=deb" -O "${TMPDIR}/discord.deb"
+sudo dpkg -i "${TMPDIR}/discord.deb"
+
+# Clean up
+rm "${TMPDIR}/discord.deb"

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_2023.todo ~/divaultphren/index.md
+vim -c "set nofoldenable" ~/divaultplan/planning_2025.todo ~/divaultphren/index.md ~/divaultwiki/home.md

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.toml"; 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?"