Support regular tmux 256 colour option

Reviewed-on: https://codeberg.org/diginaut/dotfiles/pulls/3

.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/direnv/direnvrc

@@ -0,0 +1,28 @@
+layout_uv() {
+    if [[ -z "$VIRTUAL_ENV" && -d ".venv" ]]; then
+        # No explicit VIRTUAL_ENV was exported (enabled), and a .venv dir exists, use that
+        VIRTUAL_ENV="$(pwd)/.venv"
+    fi
+
+    if [[ -z $VIRTUAL_ENV || ! -d $VIRTUAL_ENV ]]; then
+        log_status "No virtual environment exists. Executing \`uv venv\` to create one."
+        if [[ -z $PYTHON_WANTED ]]; then
+            # No Python version specified, just create a virtualenv
+            uv venv
+        else
+            # Specific Python version requested, use that; will download if needed
+            uv venv --python $PYTHON_WANTED
+        fi
+        VIRTUAL_ENV="$(pwd)/.venv"
+    fi
+
+    if [ -d ".venv/bin" ]; then
+        PATH_add .venv/bin
+    elif [ -d ".venv/Scripts" ]; then
+        PATH_add .venv/Scripts
+    fi
+    export UV_ACTIVE=1  # or VENV_ACTIVE=1
+    export VIRTUAL_ENV
+
+    log_status "Using venv at $VIRTUAL_ENV"
+}

.config/environment.d/kde_plasma.conf

@@ -0,0 +1,2 @@
+# https://www.reddit.com/r/linux_gaming/comments/1ohgzch/if_you_have_kde_65_you_def_want_to_into_enabling/
+KWIN_USE_OVERLAYS=1

.config/fish/config.fish

@@ -69,6 +69,15 @@ alias la 'ls -A'
 alias l 'ls -CF'
 alias lll 'ls --color=always -alF | less -R'
 
+# Replace ls with eza, if installed
+if type -q eza
+    alias ll='eza -al --color=always --group-directories-first --icons' # preferred listing
+    alias ls='eza -a --color=always --group-directories-first --icons' # all files and dirs
+    alias la='eza -l --color=always --group-directories-first --icons' # long format
+    alias lt='eza -aT --color=always --group-directories-first --icons' # tree listing
+    alias l.="eza -a | grep -e '^\.'" # show only dotfiles
+end
+
 alias exa 'exa --icons --header --group-directories-first'
 alias exatree 'exa --icons --header --group-directories-first --long --tree'
 
@@ -83,7 +92,7 @@ alias gst "git status"
 alias ga "git add -A"
 alias gl "git log"
 alias gls "git shortlog --summary"
-alias gld "git log --follow -p -- "  # Shows history with diffs for the filename provided
+alias gld "git log --follow -p -- " # Shows history with diffs for the filename provided
 alias gr "git reflog"
 alias gt 'git tag|less'
 #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c'
@@ -132,7 +141,7 @@ alias pypitest_up 'python3 -m build; python3 -m twine upload --repository testpy
 
 alias youtube-dl 'youtube-dl -t -f bestvideo+bestaudio/best --merge-output-format mp4'
 
-alias weather 'ansiweather'
+alias weather ansiweather
 alias wttr 'curl -s wttr.in/Beverwijk | head -17'
 
 # https://www.reddit.com/r/vim/comments/7axmsb/i_cant_believe_how_good_fzf_is/?st=jgm7kba5&sh=590aa1e0
@@ -148,7 +157,7 @@ function imready
     # e.g.: longrunning.sh; imready
     set laststatus $status
     if test $status = 0
-        set result "success"
+        set result success
     else
         set result "failed with result $laststatus"
     end
@@ -167,4 +176,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/nvim/after/ftplugin/lua.lua

@@ -0,0 +1,9 @@
+-- indent_type = "Spaces"
+-- indent_width = 4
+-- call_parentheses = "Always"
+-- column_width = 120
+
+vim.bo.tabstop = 4
+vim.bo.softtabstop = 4
+vim.bo.shiftwidth = 4
+vim.bo.expandtab = true

.config/nvim/init.lua

@@ -0,0 +1 @@
+require("config.lazy")

.config/nvim/lua/config/lazy.lua

@@ -0,0 +1,37 @@
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+	if vim.v.shell_error ~= 0 then
+		vim.api.nvim_echo({
+			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+			{ out, "WarningMsg" },
+			{ "\nPress any key to exit..." },
+		}, true, {})
+		vim.fn.getchar()
+		os.exit(1)
+	end
+end
+vim.opt.rtp:prepend(lazypath)
+
+vim.filetype.add({ extension = { todo = "todo" } })
+
+-- Make sure to setup `mapleader` and `maplocalleader` before
+-- loading lazy.nvim so that mappings are correct.
+-- This is also a good place to setup other settings (vim.opt)
+
+-- Setup lazy.nvim
+require("lazy").setup({
+	spec = {
+		-- add LazyVim and import its plugins
+		{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
+		-- import your plugins
+		{ import = "plugins" },
+	},
+	-- Configure any other settings here. See the documentation for more details.
+	-- colorscheme that will be used when installing plugins.
+	install = { colorscheme = { "bebop" } },
+	-- automatically check for plugin updates
+	checker = { enabled = true },
+})

.config/nvim/lua/config/options.lua

@@ -0,0 +1,38 @@
+-- Default options: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
+
+vim.g.mapleader = ","
+vim.g.maplocalleader = ","
+
+vim.opt.number = true
+vim.opt.relativenumber = false -- relative line numbers
+vim.opt.tabstop = 4 -- tab width in spaces
+vim.bo.tabstop = 4 -- tab width in spaces
+vim.opt.shiftwidth = 4 -- indent width
+vim.bo.shiftwidth = 4 -- indent width
+vim.opt.expandtab = true -- spaces instead of tabs
+vim.opt.smartindent = true -- smart indentation
+vim.opt.termguicolors = true -- true color support
+vim.opt.clipboard = "unnamedplus" -- system clipboard
+-- vim.opt.smoothscroll = true
+vim.opt.conceallevel = 0 -- please don't hide stuff from me
+vim.opt.wrap = true -- Enable line wrap
+
+vim.opt.spelllang = { "en", "nl" }
+
+-- Replace 'dayh' with a formatted day header
+vim.cmd("iab <expr> dayh strftime('== %Y%m%d %A ======')")
+-- Replace 'timeh' with a formatted date/time header
+vim.cmd("iab <expr> timeh strftime('## %Y%m%d %a %H:%M:%S')")
+
+-- vim.cmd("iabbrev <expr> ,d strftime('%Y-%m-%d')")
+-- vim.cmd("iabbrev <expr> ,t strftime('%Y-%m-%dT%TZ')")
+vim.cmd("inoreabbrev <expr> ,u system('uuidgen')->trim()->tolower()")
+
+-- Enable autoread and set up checking triggers
+vim.o.autoread = true
+vim.api.nvim_create_autocmd({ "FocusGained", "BufEnter" }, {
+	command = "if mode() != 'c' | checktime | endif",
+	pattern = "*",
+})
+
+-- Colorscheme is set in its plugin file

.config/nvim/lua/plugins/colorizer.lua

@@ -0,0 +1,3 @@
+return {
+  'norcalli/nvim-colorizer.lua'
+};

.config/nvim/lua/plugins/colorscheme.lua

@@ -0,0 +1,14 @@
+return {
+	-- { "folke/tokyonight.nvim" },
+	-- { "rebelot/kanagawa.nvim" },
+	-- { "Shatur/neovim-ayu" },
+	{ "ATTron/bebop.nvim" },
+
+	-- Configure LazyVim to load our favourite colorscheme
+	{
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "bebop",
+		},
+	},
+}

.config/nvim/lua/plugins/conform.lua

@@ -0,0 +1,12 @@
+return {
+  "stevearc/conform.nvim",
+  opts = {
+
+    formatters_by_ft = {
+      sh = { "shfmt" },
+      bash = { "shfmt" },
+      lua = { "stylua" },
+      fish = { "fish_indent" },
+    },
+  },
+}

.config/nvim/lua/plugins/luarocks.lua

@@ -0,0 +1,5 @@
+return {
+	"vhyrro/luarocks.nvim",
+	priority = 1000, -- Very high priority is required, luarocks.nvim should run as the first plugin in your config.
+	config = true,
+}

.config/nvim/lua/plugins/markdown-plus.lua

@@ -0,0 +1,5 @@
+return {
+	"yousefhadder/markdown-plus.nvim",
+	ft = "markdown",
+	opts = {},
+}

.config/nvim/lua/plugins/markdown-toggle.lua

@@ -0,0 +1,23 @@
+return {
+	"roodolv/markdown-toggle.nvim",
+	config = function()
+		require("markdown-toggle").setup({
+			-- cycle through checkboxes
+			cycle_box_table = true,
+			-- doing, done,  wut, important, forwarded
+			box_table = { "/", "x", "?", "!", ">" },
+			keymaps = {
+				toggle = {
+					["<C-q>"] = "quote",
+					["<C-l>"] = "list",
+					["<Leader><C-l>"] = "list_cycle",
+					["<C-n>"] = "olist",
+					["<M-x>"] = "checkbox_cycle",
+					["<Leader><M-x>"] = "checkbox",
+					["<C-h>"] = "heading",
+					["<Leader><C-h>"] = "heading_toggle",
+				},
+			},
+		})
+	end,
+}

.config/nvim/lua/plugins/python.lua

@@ -0,0 +1,16 @@
+return {
+  "linux-cultist/venv-selector.nvim",
+  dependencies = {
+    "neovim/nvim-lspconfig",
+    "nvim-telescope/telescope.nvim",
+  },
+  ft = "python", -- Load when opening Python files
+  opts = {
+    search = {}, -- if you add your own searches, they go here.
+    options = {} -- if you add plugin options, they go here.
+  },
+  event = 'VeryLazy', -- Optional: needed only if you want to type `:VenvSelect` without a keymapping
+  keys = {
+    { "<leader>V", "<cmd>VenvSelect<cr>" }, -- Open picker on keymap
+  },
+}

.config/nvim/lua/plugins/snacks.lua

@@ -0,0 +1,7 @@
+return {
+	"folke/snacks.nvim",
+	opts = {
+		scroll = { enabled = false },
+		-- other stuff
+	},
+}

.config/nvim/lua/plugins/telescope.lua

@@ -0,0 +1,8 @@
+return {
+    "nvim-telescope/telescope.nvim",
+    dependencies = { "nvim-lua/plenary.nvim" },
+    keys = {
+        { "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
+        { "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Live Grep" },
+    },
+}

.config/nvim/lua/plugins/treesitter.lua

@@ -0,0 +1,57 @@
+return {
+	"nvim-treesitter/nvim-treesitter",
+	lazy = false, -- Keep false to ensure loading for Neo-tree
+	build = ":TSUpdate",
+	config = function()
+		local treesitter = require("nvim-treesitter")
+		treesitter.setup()
+		treesitter.install({
+			"java",
+			"c",
+			"lua",
+			"vim",
+			"vimdoc",
+			"query",
+			-- "elixir",
+			-- "heex",
+			"markdown",
+			"markdown_inline",
+			"bash",
+			"javascript",
+			"typescript",
+			"html",
+			"toml",
+			"yaml",
+		})
+
+		vim.api.nvim_create_autocmd("FileType", {
+			pattern = {
+				"java",
+				"c",
+				"lua",
+				"vim",
+				"vimdoc",
+				"query",
+				-- "elixir",
+				-- "heex",
+				"markdown",
+				"markdown_inline",
+				"bash",
+				"javascript",
+				"typescript",
+				"html",
+				"toml",
+				"yaml",
+			},
+			callback = function()
+				-- syntax highlighting, provided by Neovim
+				vim.treesitter.start()
+				-- folds, provided by Neovim (I don't like folds)
+				-- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+				-- vim.wo.foldmethod = 'expr'
+				-- indentation, provided by nvim-treesitter
+				vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+			end,
+		})
+	end,
+}

.config/nvim/stylua.toml

@@ -0,0 +1,5 @@
+indent_type = "Spaces"
+indent_width = 2
+column_width = 120
+[sort_requires]
+enabled = true

.config/nvim/syntax/todo.vim

@@ -0,0 +1 @@
+../../../.vim/syntax/todo.vim

.config/starship.toml

@@ -79,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 = ""
@@ -124,53 +124,53 @@ format = '[$all_status$ahead_behind]($style)'
 # 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

.gitignore

@@ -1,3 +1,9 @@
+# Neovim
+.config/nvim/lazy-lock.json
+.config/nvim/lazyvim.json
+# Contains some personal stuff
+.config/nvim/lua/plugins/obsidian.lua
+
 # Vim
 .vim/bundle
 *.spl

.local/share/konsole/diginaut.colorscheme

@@ -0,0 +1,95 @@
+[Background]
+Color=0,0,0
+
+[BackgroundFaint]
+Color=0,0,1
+
+[BackgroundIntense]
+Color=68,68,69
+
+[Color0]
+Color=35,35,35
+
+[Color0Faint]
+Color=35,35,35
+
+[Color0Intense]
+Color=68,68,68
+
+[Color1]
+Color=255,0,15
+
+[Color1Faint]
+Color=255,0,15
+
+[Color1Intense]
+Color=255,39,64
+
+[Color2]
+Color=140,225,11
+
+[Color2Faint]
+Color=140,225,11
+
+[Color2Intense]
+Color=171,225,91
+
+[Color3]
+Color=255,185,0
+
+[Color3Faint]
+Color=255,185,0
+
+[Color3Intense]
+Color=255,210,66
+
+[Color4]
+Color=0,141,248
+
+[Color4Faint]
+Color=0,141,248
+
+[Color4Intense]
+Color=0,146,255
+
+[Color5]
+Color=109,67,166
+
+[Color5Faint]
+Color=109,67,166
+
+[Color5Intense]
+Color=154,95,235
+
+[Color6]
+Color=0,216,235
+
+[Color6Faint]
+Color=0,216,235
+
+[Color6Intense]
+Color=103,255,240
+
+[Color7]
+Color=255,255,255
+
+[Color7Faint]
+Color=255,255,255
+
+[Color7Intense]
+Color=255,255,255
+
+[Foreground]
+Color=255,250,244
+
+[ForegroundFaint]
+Color=255,250,244
+
+[ForegroundIntense]
+Color=255,250,244
+
+[General]
+Description=Diginaut
+#Opacity=0.93
+Wallpaper=
+

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

.tmux.conf

@@ -2,9 +2,9 @@
 set -g bell-action any
 
 # Default termtype. If the rcfile sets $TERM, that overrides this value.
-set -g default-terminal tmux-256color-italic
+set -g default-terminal "tmux-256color"
 #set -g terminal-overrides ',tmux-256color-italic:Tc'
-set -ga terminal-overrides ',*256col*:Tc'
+set -ga terminal-overrides ',*256col*:Tc:RGB'
 
 # Keep your finger on ctrl, or don't
 bind-key ^D detach-client

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

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

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

@@ -243,3 +243,15 @@ etensgeluiden
 gebarbecuede
 WTF
 syncthing
+Madurodam
+fietsrit
+multifactorauthenticatie
+SSO-gebruikers
+hacktop
+computerwerk
+labwerk
+PowerPoint
+Kubuntu
+Ichthus
+Castor
+JungleTrain

.vim/syntax/todo.vim

@@ -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
@@ -610,7 +633,7 @@ set hidden
 set cryptmethod=blowfish2
 
 " Ensure 256 colour support if the terminal supports it
-if has("gui_running") || &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
+if has("gui_running") || &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color" || &term == "tmux-256color-italic"
 
     set background=dark
     let g:enable_bold_font = 1
@@ -651,6 +674,13 @@ iab <expr> dayh strftime("== %Y%m%d %A ======")
 " Replace 'timeh' with a formatted date/time header
 iab <expr> timeh strftime("## %Y%m%d %a %H:%M:%S")
 
+iabbrev <expr> ,d strftime('%Y-%m-%d')
+iabbrev <expr> ,t strftime('%Y-%m-%dT%TZ')
+inoreabbrev <expr> ,u system('uuidgen')->trim()->tolower()
+" vim.cmd("iabbrev <expr> ,d strftime('%Y-%m-%d')")
+" vim.cmd("iabbrev <expr> ,t strftime('%Y-%m-%dT%TZ')")
+" vim.cmd("inoreabbrev <expr> ,u system('uuidgen')->trim()->tolower()")
+
 " Fly through buffers instead of cycling
 " nnoremap <leader>l :ls<cr>:b<space>
 

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:
 
@@ -15,7 +15,8 @@ sh install.sh  # follow the instructions and install the files in the homedir
 
 Extra's:
 
-[virtualfish](https://virtualfish.readthedocs.io/en/latest/install.html) for virtualenv(wrapper) integration in `fish` shell.
+- [virtualfish](https://virtualfish.readthedocs.io/en/latest/install.html) for virtualenv(wrapper) integration in `fish` shell.
+- *N.B.:* virtualfish might be on its way out, with `uv` and `direnv` configurations
 
 
 ## Dependency on `fzf` and ripgrep `rg`
@@ -27,6 +28,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

@@ -50,6 +50,16 @@ 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
@@ -110,6 +120,9 @@ Rubik-MediumItalic.ttf
 Rubik-Medium.ttf
 Rubik-Regular.ttf'
 
+FONTS_SUSE=$'SUSE-Italic-VariableFont_wght.ttf
+SUSE-VariableFont_wght.ttf'
+
 # https://github.com/eosrei/emojione-color-font/
 # FONTS_VARIOUS=$'EmojiOneColor-SVGinOT.ttf'
 
@@ -165,7 +178,7 @@ if [ -e ~/.dot_is_server ]; then
         while read -r FONT; do
             echo "Copied font: $FONT"
             cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR"
-        done <<< "$FONTS_CODING"
+        done <<<"$FONTS_CODING"
     else
         echo "$PARENT_DIR, $SOURCE_DIR or $DEST_DIR not found, aborting"
     fi
@@ -180,7 +193,7 @@ if [ -e ~/.dot_is_server ]; then
         while read -r FONT; do
             echo "Copied font: $FONT"
             cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR"
-        done <<< "$FONTS_JETBRAINS"
+        done <<<"$FONTS_JETBRAINS"
     else
         echo "$SOURCE_DIR or $DEST_DIR not found, aborting"
     fi
@@ -195,7 +208,7 @@ if [ -e ~/.dot_is_server ]; then
         while read -r FONT; do
             echo "Copied font: $FONT"
             cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR"
-        done <<< "$FONTS_OVERPASS"
+        done <<<"$FONTS_OVERPASS"
     else
         echo "$SOURCE_DIR or $DEST_DIR not found, aborting"
     fi
@@ -210,7 +223,7 @@ if [ -e ~/.dot_is_server ]; then
         while read -r FONT; do
             echo "Copied font: $FONT"
             cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR"
-        done <<< "$FONTS_GO"
+        done <<<"$FONTS_GO"
     else
         echo "$SOURCE_DIR or $DEST_DIR not found, aborting"
     fi
@@ -227,22 +240,25 @@ else
         while read -r FONT; do
             FONT_FILE=$(basename "${SOURCE_DIR}/${FONT}")
             install_font "$SOURCE_DIR/$FONT_FILE" "$DEST_DIR/$FONT_FILE"
-        done <<< "$FONTS_CODING"
+        done <<<"$FONTS_CODING"
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
-        done <<< "$FONTS_JETBRAINS"
+        done <<<"$FONTS_JETBRAINS"
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
-        done <<< "$FONTS_FUTURA"
+        done <<<"$FONTS_FUTURA"
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
-        done <<< "$FONTS_OVERPASS"
+        done <<<"$FONTS_OVERPASS"
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
-        done <<< "$FONTS_GO"
+        done <<<"$FONTS_GO"
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
-        done <<< "$FONTS_RUBIK"
+        done <<<"$FONTS_RUBIK"
+        while read -r FONT; do
+            install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
+        done <<<"$FONTS_SUSE"
         # while read -r FONT; do
         #     install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
         # done <<< "$FONTS_VARIOUS"
@@ -259,7 +275,7 @@ else
                 echo "Deleting symlink $DEST_DIR/$FONT"
                 rm "$DEST_DIR/$FONT"
             fi
-        done <<< "$FONTS_DELETE"
+        done <<<"$FONTS_DELETE"
         # Just to be sure, clear and refresh your font cache and restart Firefox
         fc-cache -f -v
         echo

bin/plasma_toggle_tablet_mode

@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+
+import subprocess
+import gi
+
+gi.require_version('Gio', '2.0')
+from gi.repository import Gio, GLib
+
+KDE_VERSION = 6
+OBJECT_PATH = '/kwinrc'
+INTERFACE_NAME = 'org.kde.kconfig.notify'
+SIGNAL_NAME = 'ConfigChanged'
+
+current_mode: str = subprocess.check_output([f"kreadconfig{KDE_VERSION}", "--file", "kwinrc", "--group", "Input", "--key", "TabletMode", "--default", "auto"]).decode(encoding='utf-8').strip()
+if current_mode == "on":
+    subprocess.check_call([f"kwriteconfig{KDE_VERSION}", "--file", "kwinrc", "--group", "Input", "--key", "TabletMode", "off"])
+else:
+    subprocess.check_call([f"kwriteconfig{KDE_VERSION}", "--file", "kwinrc", "--group", "Input", "--key", "TabletMode", "on"])
+
+connection = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+Gio.DBusConnection.emit_signal(connection, None, OBJECT_PATH, INTERFACE_NAME, SIGNAL_NAME, GLib.Variant.new_tuple(GLib.Variant('a{saay}', {'Input': [b'TabletMode']})))

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,11 @@ 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
+if ! command -v nvim >/dev/null 2>&1; then
+    vim -c "set nofoldenable" ~/divaultplan/planning_2026.md
+else
+    nvim -c "set nofoldenable" ~/divaultplan/planning_2026.md
+fi

install.sh

@@ -1,29 +1,6 @@
 #!/bin/bash
 # inspired by rrix' dotfiles
 
-install_hg()
-{
-    # Mercurial extensions
-    touch "${HOME}/.dot_has_hg"
-    HGDIR="${HOME}/workspace/application_addons/mercurial"
-    mkdir -p $HGDIR
-    cd $HGDIR || exit
-
-    for REPO in Mekk/mercurial_keyring sjl/hg-prompt durin42/hg-git yujiewu/hgflow
-    do
-        REPODIR="${REPO##*/}"
-        echo $REPODIR
-        if [ ! -d "$HGDIR/$REPODIR" ]; then
-            hg clone http://bitbucket.org/$REPO
-            #echo  http://bitbucket.org/$REPO
-        else
-            cd $HGDIR/$REPODIR || exit
-            #echo $HGDIR/$REPODIR
-            hg pull -u
-        fi
-    done
-}
-
 install_fish()
 {
     touch ~/.dot/.dot_has_fish
@@ -85,8 +62,11 @@ DATETIME=$(date +%Y%m%d_%H%M)
 # Go home
 cd || exit
 
+# We need this config (sub)dir to exist for the symlink
+mkdir -p .config/direnv
+
 # Symlink all the things
-for TARGET in .bash_aliases .bashrc bin .gitconfig .gitignore_global .gitmodules .hgauthors.txt .hgignore .hgrc .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh
+for TARGET in .bash_aliases .bashrc bin .gitconfig .gitignore_global .gitmodules .hgauthors.txt .hgignore .hgrc .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh .config/direnv/direnvrc .config/nvim
 do
     make_link $DIR $TARGET
 done
@@ -102,21 +82,8 @@ if [ ! -d "${HOME}/.vim/autoload/plug.vim" ]; then
     vim
 fi
 
-#if [ -e ~/.dot_has_hg ]; then
-#    install_hg
-#elif [ ! -e ~/.dot_no_hg ]; then
-#    echo
-#    echo "Do you wish to install mercurial stuff?"
-#    select yn in "Yes" "No"; do
-#        case $yn in
-#            Yes ) install_hg; break;;
-#            No ) touch ~/.dot_no_hg; break;;
-#        esac
-#    done
-#fi
-
 if [ -e ~/.dot/.dot_has_fish ]; then
-    install_hg
+    install_fish
 elif [ ! -e ~/.dot/.dot_no_fish ]; then
     echo
     echo "Do you wish to install fish shell configuration?"
@@ -128,6 +95,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?"