Merge branch 'master' of github.com:aquatix/dotfiles

.bash_aliases

@@ -109,11 +109,6 @@ alias pip_upgrade="pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs
 # 20140908 reload tmux config
 alias tmux_reload="tmux source-file ~/.tmux.conf"
 
-# project-oriented aliases
-alias dcpvag='workon dcp; cd ~/workspace/sanoma/content-library/; vagrant ssh'
-alias dcpsrc='cd ~/development/current/content-library/src/content_library/; . ~/development/env/bin/activate'
-alias dcpcelery='python manage.py celery worker -Q celery -l info'
-
 # update/install Calibre ebook manager
 alias updatecalibre='sudo -v && wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c "import sys; main=lambda:sys.stderr.write('"'"'Download failed\n'"'"'); exec(sys.stdin.read()); main()"'
 
@@ -126,6 +121,9 @@ alias weather='ansiweather'
 
 alias pypi_up='python setup.py register sdist --formats=zip upload'
 
+# Use midnight commander without mouse being annoying
+alias mc='mc -d'
+
 # if you're really annoyed with a runaway process
 function fuck() {
   if killall -9 "$2"; then

.bashrc

@@ -177,6 +177,7 @@ if [ -e ~/.ssh/config.d ]; then
             [ -e ~/.ssh/config ] && mv ~/.ssh/config ~/.ssh/config.bak.$(date -Is)
             # Lets preserve order, so you can have  00_generic 10_homestuff 20_work1 21_work2  and such
             find ~/.ssh/config.d/* -type f -print0 | sort -z | xargs -0 -n1 cat > ~/.ssh/config
+            chmod 600 ~/.ssh/config
         fi
     fi
 fi
@@ -217,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

@@ -69,6 +69,9 @@ alias la 'ls -A'
 alias l 'ls -CF'
 alias lll 'ls --color=always -alF | less -R'
 
+alias exa 'exa --icons --header --group-directories-first'
+alias exatree 'exa --icons --header --group-directories-first --long --tree'
+
 ## Git
 alias gu "git pull --all"
 alias gp "git push; git push --tags"
@@ -89,9 +92,9 @@ alias ffnightly 'env MOZ_USE_XINPUT2=1 /usr/local/bin/firefoxnightly/firefox'
 
 ## SSH, for compatibility, as our terminfo now is non-standard 'tmux-256color-italic' in tmux
 #alias ssh 'env TERM=xterm-256color ssh'
-function ssh
+#function ssh
-    env TERM=screen-256color ssh $argv
+#    env TERM=screen-256color ssh $argv
-end
+#end
 
 ## Grepping
 alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep'
@@ -124,8 +127,8 @@ alias pip_upgrade "pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs
 
 alias pyloc 'find . -name "*.py" | xargs wc -l'
 
-alias pypi_up 'python setup.py sdist --formats=zip upload -r pypi'
+alias pypi_up 'python3 -m build; python3 -m twine upload dist/*'
-alias pypi_sanoma 'python setup.py sdist --formats=zip upload -r sanoma'
+alias pypitest_up 'python3 -m build; python3 -m twine upload --repository testpypi dist/*'
 
 alias youtube-dl 'youtube-dl -t -f bestvideo+bestaudio/best --merge-output-format mp4'
 
@@ -162,3 +165,10 @@ function jl
     # Pretty print the json file used as argument, and feed it in colour to less
     jq -C --indent 2 . $argv | less -R
 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

@@ -0,0 +1,186 @@
+format = """
+[](#9A348E)\
+$jobs\
+$os\
+$username\
+[](bg:#DA627D fg:#9A348E)\
+$directory\
+[](fg:#DA627D bg:#FCA17D)\
+$git_branch\
+$git_status\
+[](fg:#FCA17D bg:#86BBD8)\
+$c\
+$elixir\
+$elm\
+$golang\
+$gradle\
+$haskell\
+$java\
+$julia\
+$nodejs\
+$nim\
+$python\
+$rust\
+$scala\
+[](fg:#86BBD8 bg:#06969A)\
+$docker_context\
+[](fg:#06969A bg:#33658A)\
+$time\
+[ ](fg:#33658A)\
+$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]
+# show_always = true
+show_always = false
+style_user = "bg:#9A348E"
+style_root = "bg:#9A348E"
+format = '[$user ]($style)'
+disabled = false
+
+# An alternative to the username module which displays a symbol that
+# represents the current operating system
+[os]
+style = "bg:#9A348E"
+disabled = true # Disabled by default
+
+[directory]
+style = "bg:#DA627D"
+format = "[ $path ]($style)"
+truncation_length = 3
+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" = ""
+"workspace" = ""
+# Keep in mind that the order matters. For example:
+# "Important Documents" = " 󰈙 "
+# will not be replaced, because "Documents" was already substituted before.
+# So either put "Important Documents" before "Documents" or use the substituted version:
+# "Important 󰈙 " = " 󰈙 "
+
+[c]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[docker_context]
+symbol = ""
+style = "bg:#06969A"
+format = '[ $symbol $context ]($style) $path'
+
+[elixir]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[elm]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[git_branch]
+symbol = ""
+style = "bg:#FCA17D"
+truncation_length = 30
+format = '[ $symbol $branch ]($style)'
+
+[git_status]
+ahead = '⇡${count}'
+diverged = '⇕⇡${ahead_count}⇣${behind_count}'
+behind = '⇣${count}'
+#    
+style = "bg:#FCA17D"
+# 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 = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[gradle]
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[haskell]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[java]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[julia]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[nodejs]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[nim]
+symbol = "󰆥"
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[python]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $virtualenv) ]($style)'
+
+[rust]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[scala]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol( $version) ]($style)'
+
+[cmd_duration]
+min_time = 2000
+show_milliseconds = true
+#format = ' $duration ($style)'
+format = '[](fg:#333333)[$duration](bg:#333333)[](fg:#333333) ($style)'
+
+[time]
+disabled = false
+# time_format = "%R" # Hour:Minute Format
+time_format = "%T" # Hour:Minute:Second Format
+style = "bg:#33658A"
+format = '[ $time ]($style)'

.gitconfig

@@ -65,3 +65,16 @@
 	insteadOf = "bitbucket:"
 [pull]
 	rebase = false
+[safe]
+	directory = /storage/emulated/0/Git/phren
+	directory = /storage/emulated/0/Git/divaultphren
+	directory = /storage/emulated/0/Git/mydocs
+	directory = /data/data/com.termux/files/home/.dot/dotfiles/
+	directory = /storage/emulated/0/Git/dammit.nl
+	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

.vim/after/ftplugin/python.vim

@@ -28,6 +28,7 @@ virtualenv_path = find_virtualenv(['virtualenv', 'venv'])  #vim.eval('ale_virtua
 if virtualenv_path:
     has_pylint_django = glob.glob(os.path.join(virtualenv_path, 'lib/*/site-packages/pylint_django'))
     has_pylint = glob.glob(os.path.join(virtualenv_path, 'lib/*/site-packages/pylint'))
+    has_ruff = glob.glob(os.path.join(virtualenv_path, 'lib/*/site-packages/ruff'))
     has_flake8 = glob.glob(os.path.join(virtualenv_path, 'lib/*/site-packages/flake8'))
     has_bandit = glob.glob(os.path.join(virtualenv_path, 'lib/*/site-packages/bandit'))
 else:
@@ -43,6 +44,12 @@ else:
     except ImportError:
         has_pylint = False
 
+    try:
+        find_spec('ruff')
+        has_ruff = True
+    except ImportError:
+        has_ruff = False
+
     try:
         find_spec('flake8')
         has_flake8 = True
@@ -58,6 +65,8 @@ else:
 linters = []
 if has_pylint:
     linters.append('pylint')
+if has_ruff:
+    linters.append('ruff')
 if has_flake8:
     linters.append('flake8')
 if has_bandit:

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

@@ -9,3 +9,12 @@ reprovisioning
 hardcoded
 deduplicating
 cruft
+digimarks
+blogmarks
+backend
+dammIT
+isso
+diginaut
+jailbreaking
+plugin
+Readeck

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

@@ -175,3 +175,80 @@ naproxen
 nerden
 E-depot
 Carcassonne
+groepsles
+kennismakingsdag
+Jira
+chippies
+Battlefield
+webinar
+phren
+farfalle
+streamen
+ieuw
+kattenpoep
+kerstontbijt
+ThinkPad
+spelavond
+comics
+refinement
+datacentrum
+zometeen
+hyper
+inductieplaat
+level
+Europaplein
+Blendle
+prutten
+mirai
+kernel
+VPN
+schrapend
+wastafelkraan
+cracottes
+cracotte
+Picard
+nerdcave
+Röyksopp
+Linnaeushof
+recruiter
+Decathlon
+aqua
+Cineworld
+Panta
+Rhei
+hey
+Zoë
+voilà
+Daan's
+Pinkeltje
+awesome
+webhaak
+klassendienst
+rewrite
+Plex
+automagiseren
+slaapmasker
+puntpaprika
+Roblox
+Samsung
+Galaxy
+iPad
+Matt
+powernap
+Nordschleife
+hackathons
+hackathon
+knakkende
+etensgeluiden
+gebarbecuede
+WTF
+syncthing
+Madurodam
+fietsrit
+multifactorauthenticatie
+SSO-gebruikers
+hacktop
+computerwerk
+labwerk
+PowerPoint
+Kubuntu

.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"

.vimrc

@@ -4,7 +4,7 @@
 " wholesale is generally not a good idea; getting an idea to what things
 " actually mean and are used for is really recommended.
 
-set shell=/bin/bash
+set shell=bash
 
 set encoding=utf-8
 
@@ -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' }
@@ -396,12 +401,14 @@ nmap <leader>= <Plug>(ale_fix)
 " Quickly open the loclist to see syntax errors
 nmap <leader>; :lopen<CR>
 let g:ale_maximum_file_size = 500000  " Don't lint large files (> 500KB), it can slow things down
-let g:ale_fixers = {}
+"let g:ale_fixers = {}
+let g:ale_fixers = { '*': ['remove_trailing_lines', 'trim_whitespace'], }
 " Python specific settings
-let g:ale_fixers.python = ['isort']
+let g:ale_fixers.python = ['isort', 'ruff', 'black']
+" JS specific settings
 let g:ale_fixers.javascript = ['eslint', 'prettier']
 
-" See VIMHOME/after/ftplugin/python.vim for some pylint configuration, also checking whether a
+" See VIMHOME/after/ftplugin/python.vim for some linting configuration, also checking whether a
 " project uses Django
 
 " Show errors or warnings in the statusline
@@ -486,7 +493,10 @@ au BufNewFile,BufRead *.j2,*.jinja2 set ft=jinja
 Plug 'ludovicchabant/vim-gutentags'
 " know when Gutentags is generating tags (prints 'TAGS' in status-line)
 set statusline+=%{gutentags#statusline()}
-let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", "tmp", "vendor", "*.vim/bundle/*", "*.vim/plugged/*"]
+let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", ".obsidian/*", "tmp", "vendor", "*.vim/bundle/*", "*.vim/plugged/*"]
+" use ripgrep to create list of files to index, which should help with
+" ignoring non-versioned files, for example with .gitignore
+let g:gutentags_file_list_command = 'rg --files'
 "let g:gutentags_trace = 1
 
 

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-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

bin/font_update

@@ -13,7 +13,7 @@ function install_font {
 
 IFS=$'\n'
 
-FONTS_CODING=$'Hack/Bold/complete/Hack Bold Nerd Font Complete Mono.ttf
+FONTS_CODING_OLD=$'Hack/Bold/complete/Hack Bold Nerd Font Complete Mono.ttf
 Hack/Regular/complete/Hack Regular Nerd Font Complete Mono.ttf
 Hack/BoldItalic/complete/Hack Bold Italic Nerd Font Complete Mono.ttf
 Hack/Italic/complete/Hack Italic Nerd Font Complete Mono.ttf
@@ -24,34 +24,69 @@ SourceCodePro/Regular/complete/Sauce Code Pro Nerd Font Complete Mono.ttf
 SourceCodePro/Light/complete/Sauce Code Pro Light Nerd Font Complete Mono.ttf
 SourceCodePro/Light-Italic/complete/Sauce Code Pro Light Italic Nerd Font Complete Mono.ttf'
 
+FONTS_CODING=$'HackNerdFontMono-BoldItalic.ttf
+HackNerdFontMono-Bold.ttf
+HackNerdFontMono-Italic.ttf
+HackNerdFontMono-Regular.ttf
+FiraCodeNerdFontMono-Bold.ttf
+FiraCodeNerdFontMono-Light.ttf
+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
+MonaspiceNeNerdFontMono-BoldItalic.otf
+MonaspiceNeNerdFontMono-Bold.otf
+MonaspiceNeNerdFontMono-Italic.otf
+MonaspiceNeNerdFontMono-LightItalic.otf
+MonaspiceNeNerdFontMono-Light.otf
+MonaspiceNeNerdFontMono-Regular.otf'
+
 FONTS_FUTURA=$'Futura-Std-Bold_19042.ttf
 Futura-Std-Bold-Oblique_19041.ttf
 Futura-Std-Book_19044.ttf
 Futura-Std-Book-Oblique_19043.ttf'
 
-FONTS_OVERPASS=$'overpass-bold-italic.otf
+FONTS_OVERPASS=$'Overpass-BlackItalic.ttf
-overpass-bold.otf
+Overpass-Black.ttf
-overpass-extrabold-italic.otf
+Overpass-BoldItalic.ttf
-overpass-extrabold.otf
+Overpass-Bold.ttf
-overpass-extralight-italic.otf
+Overpass-ExtraBoldItalic.ttf
-overpass-extralight.otf
+Overpass-ExtraBold.ttf
-overpass-heavy-italic.otf
+Overpass-ExtraLightItalic.ttf
-overpass-heavy.otf
+Overpass-ExtraLight.ttf
-overpass-italic.otf
+Overpass-Italic.ttf
-overpass-light-italic.otf
+Overpass-LightItalic.ttf
-overpass-light.otf
+Overpass-Light.ttf
-overpass-regular.otf
+Overpass-MediumItalic.ttf
-overpass-semibold-italic.otf
+Overpass-Medium.ttf
-overpass-semibold.otf
+Overpass-Regular.ttf
-overpass-thin-italic.otf
+Overpass-SemiBoldItalic.ttf
-overpass-thin.otf'
+Overpass-SemiBold.ttf
+Overpass-ThinItalic.ttf
+Overpass-Thin.ttf'
 
-FONTS_JETBRAINS=$'JetBrainsMono-Bold-Italic.ttf
+FONTS_JETBRAINS=$'JetBrainsMono-BoldItalic.ttf
 JetBrainsMono-Bold.ttf
-JetBrainsMono-ExtraBold-Italic.ttf
+JetBrainsMono-ExtraBoldItalic.ttf
 JetBrainsMono-ExtraBold.ttf
 JetBrainsMono-Italic.ttf
-JetBrainsMono-Medium-Italic.ttf
+JetBrainsMono-MediumItalic.ttf
 JetBrainsMono-Medium.ttf
 JetBrainsMono-Regular.ttf'
 
@@ -88,27 +123,56 @@ Knack RegularOblique Plus Nerd File Types Plus Font Awesome Plus Octicons Plus P
 Knack Bold Nerd Font Complete Mono.ttf
 Knack Regular Nerd Font Complete Mono.ttf
 Knack Bold Italic Nerd Font Complete Mono.ttf
-Knack Italic Nerd Font Complete Mono.ttf'
+Knack Italic Nerd Font Complete Mono.ttf
+overpass-bold-italic.otf
+overpass-bold.otf
+overpass-extrabold-italic.otf
+overpass-extrabold.otf
+overpass-extralight-italic.otf
+overpass-extralight.otf
+overpass-heavy-italic.otf
+overpass-heavy.otf
+overpass-italic.otf
+overpass-light-italic.otf
+overpass-light.otf
+overpass-regular.otf
+overpass-semibold-italic.otf
+overpass-semibold.otf
+overpass-thin-italic.otf
+overpass-thin.otf
+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
+JetBrainsMono-Bold-Italic.ttf
+JetBrainsMono-ExtraBold-Italic.ttf
+JetBrainsMono-Medium-Italic.ttf'
 
 if [ -e ~/.dot_is_server ]; then
     # Update from the repo
     echo "== Nerd fonts ======"
+    PARENT_DIR="/stuff/system/fonts"
     SOURCE_DIR="/stuff/system/fonts/nerd-fonts/patched-fonts"
     DEST_DIR="/stuff/system/sync/fonts/active"
-    if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
+    #if [ -d "$PARENT_DIR" ] && [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
+    if [ -d "$PARENT_DIR" ] && [ -d "$DEST_DIR" ]; then
+        cd "$PARENT_DIR"
+        # git pull --all
+        #git clone --depth=1 https://github.com/ryanoasis/nerd-fonts.git
         cd "$SOURCE_DIR"
-        git pull --all
         while read -r FONT; do
             echo "Copied font: $FONT"
             cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR"
         done <<< "$FONTS_CODING"
     else
-        echo "$SOURCE_DIR or $DEST_DIR not found, aborting"
+        echo "$PARENT_DIR, $SOURCE_DIR or $DEST_DIR not found, aborting"
     fi
 
     # Update from the repo
     echo "== Jetbrains Mono ======"
-    SOURCE_DIR="/stuff/system/fonts/JetBrainsMono/ttf"
+    SOURCE_DIR="/stuff/system/fonts/JetBrainsMono/fonts/ttf"
     DEST_DIR="/stuff/system/sync/fonts/active"
     if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
         cd "$SOURCE_DIR"
@@ -123,7 +187,7 @@ if [ -e ~/.dot_is_server ]; then
 
     # Update from the repo
     echo "== Overpass ======"
-    SOURCE_DIR="/stuff/system/fonts/Overpass/desktop-fonts/overpass"
+    SOURCE_DIR="/stuff/system/fonts/Overpass/fonts/ttf"
     DEST_DIR="/stuff/system/sync/fonts/active"
     if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
         cd "$SOURCE_DIR"
@@ -198,7 +262,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/mac.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Stolen from https://raw.githubusercontent.com/Cybertinus/macvendor_extractor/master/mac.sh
+
+##########
+# CONFIG #
+##########
+
+# Download from http://standards-oui.ieee.org/oui/oui.txt
+ouilocation="${HOME}/.dot/oui.txt"
+
+#################
+# ACTUAL SCRIPT #
+#################
+
+if [ ! -f "${ouilocation}" ] ; then
+	echo "OUI location can not be found at ${ouilocation}. Have you updated the config?" 1>&2
+	read -p "Do you want to download it now [y/N]? " -n 1 -r
+	echo    # (optional) move to a new line
+	if [[ $REPLY =~ ^[Yy]$ ]]
+	then
+		wget https://standards-oui.ieee.org/oui/oui.txt -O "${ouilocation}"
+	else
+		echo "Aborted"
+		exit 1
+	fi
+fi
+
+if [[ $(find "${ouilocation}" -mtime +30 -print) ]]; then
+	echo "File ${ouilocation} is older than 30 days"
+fi
+
+if [ -z "${1}" ] ; then
+	echo 'No mac address specified, please do so as first argument' 1>&2
+	exit 2
+fi
+
+macaddress="$(echo "${1}" | sed -e 's/[-.:]//g' | tr '[:lower:]' '[:upper:]')"
+macaddress="${macaddress:0:6}"
+echo -n "${1} = "
+
+vendor="$(awk "/^${macaddress}/ {print substr(\$0,index(\$0,\$4))}" "${ouilocation}")"
+if [ -z "${vendor}" ] ; then
+	echo "Not specified in ${ouilocation}"
+else
+	echo "${vendor}"
+fi
+

bin/pgadmin4

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-PGADMINVENV="pgadmin4"
-VENVDIR="$HOME/.virtualenvs/${PGADMINVENV}"
-
-if [ ! -d "$VENVDIR" ] || [ ! -e "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/pgAdmin4.py" ] || [ ! -e "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py" ]; then
-    if [[ -z "$VIRTUAL_ENV" ]]; then
-        # Only activate the virtualenv if we aren't in one already
-        source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
-        mkvirtualenv "${PGADMINVENV}"
-        echo "Downloading the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/ ..."
-        pip install https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v1.6/pip/pgadmin4-1.6-py2.py3-none-any.whl
-        echo "SERVER_MODE = False" >> "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py"
-    fi
-
-    # Install
-    #echo
-    #echo "Download the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/"
-    #echo
-    #echo "Install with:"
-    #echo "workon pgadmin4"
-    #echo "pip install ./pgadmin4-1.6-py2.py3-none-any.whl"
-    #echo "echo "SERVER_MODE = False" >> ${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py"
-else
-    if [[ -z "$VIRTUAL_ENV" ]]; then
-        # Only activate the virtualenv if we aren't in one already
-        source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
-        workon "${PGADMINVENV}"
-    fi
-
-    # Start
-    python "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/pgAdmin4.py"
-fi

bin/unzip_all

@@ -6,6 +6,5 @@ find . -type f -name '*.zip' -exec sh -c '
     zipdir=$(basename "$file" .zip)
     #echo "$zipdir $file"
     unzip -d "$zipdir" "$file"
-    read line </dev/tty
   done
 ' sh {} +

bin/update_proton_ge

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# make temp working directory
+mkdir /tmp/proton-ge-custom
+cd /tmp/proton-ge-custom
+
+# download tarball
+echo "Downloading tarball of latest release..."
+curl -sLOJ $(curl -s https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep .tar.gz)
+
+# download checksum 
+echo "Downloading checksum..."
+curl -sLOJ $(curl -s https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep .sha512sum) 
+
+# check tarball with checksum
+echo "Checking..."
+sha512sum -c *.sha512sum
+# if result is ok, continue
+
+# make steam directory if it does not exist
+mkdir -p ~/.steam/root/compatibilitytools.d
+
+# extract proton tarball to steam directory
+echo "Extracting to Steam folder..."
+tar -xf GE-Proton*.tar.gz -C ~/.steam/root/compatibilitytools.d/
+echo "All done :)"

bin/worknotes

@@ -1,7 +1,9 @@
 #!/bin/bash
-cd ~/mydocs/work/divault
+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" ~/mydocs/work/divault/planning_2021.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.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?"