desktop/.config/user-dirs.dirs

@@ -8,7 +8,7 @@
 XDG_DESKTOP_DIR="$HOME/desktop"
 XDG_DOCUMENTS_DIR="$HOME/documents"
 XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_MUSIC_DIR="$HOME/media/music"
+XDG_MUSIC_DIR="$HOME/media/audio/music"
 XDG_PICTURES_DIR="$HOME/pictures"
 XDG_PUBLICSHARE_DIR="$HOME/"
 XDG_TEMPLATES_DIR="$HOME/"

nvim/.config/nvim/after/ftplugin/csv.lua

@@ -1,4 +0,0 @@
--- turn on a nice table view if we have it
-if require("core.util").is_available("csvview") then
-	require("csvview").enable()
-end

nvim/.config/nvim/after/ftplugin/tsv.lua

@@ -1,4 +0,0 @@
--- turn on a nice table view if we have it
-if require("core.util").is_available("csvview") then
-	require("csvview").enable()
-end

nvim/.config/nvim/lazy-lock.json

@@ -16,7 +16,6 @@
   "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
   "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" },
   "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" },
-  "csvview.nvim": { "branch": "main", "commit": "a4c45eadb03a462a80dd1a545d0f9cb636b73664" },
   "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" },
   "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
   "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" },
@@ -74,7 +73,6 @@
   "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" },
   "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-spider": { "branch": "main", "commit": "fed9f683db005e6eb676e11a615b0e249a21142e" },
   "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
   "nvim-toggleterm.lua": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },

nvim/.config/nvim/lua/modules/base.lua

@@ -43,6 +43,44 @@ return {
 			},
 		},
 	},
+	-- jump between letters with improved fFtT quicksearch, mimics sneak
+	{
+		"folke/flash.nvim",
+		event = "VeryLazy",
+		opts = {
+			modes = {
+				search = {
+					enabled = false,
+				},
+			},
+		},
+		keys = {
+			{
+				"s",
+				mode = { "n", "x" },
+				function()
+					require("flash").jump()
+				end,
+				desc = "Flash",
+			},
+			{
+				"S",
+				mode = { "n", "x", "o" },
+				function()
+					require("flash").treesitter()
+				end,
+				desc = "Flash Treesitter",
+			},
+			{
+				"r",
+				mode = "o",
+				function()
+					require("flash").remote()
+				end,
+				desc = "Remote Flash",
+			},
+		},
+	},
 
 	-- generic tool installer; automatic external dependency mgmt for neovim
 	-- used in my config for LSPs, formatters and linters
@@ -62,6 +100,8 @@ return {
 			{ "<leader>vm", ":Mason<cr>", desc = "Mason" },
 		},
 	},
+	-- personal dict improvements for git sync
+	{ "micarmst/vim-spellsync", event = "VeryLazy" },
 	{
 		"folke/which-key.nvim",
 		event = "CursorHold",

nvim/.config/nvim/lua/modules/data_analysis.lua

@@ -1,24 +1,4 @@
 return {
-	{
-		-- pretty table-view and movement for CSV-like files
-		"hat0uma/csvview.nvim",
-		opts = {
-			view = {
-				display_mode = "border",
-				spacing = 1,
-			},
-			keymaps = {
-				jump_next_field_end = { "<S-l>", mode = { "n", "v" } },
-				jump_prev_field_end = { "<S-h>", mode = { "n", "v" } },
-				jump_next_row = { "<S-j>", mode = { "n", "v" } },
-				jump_prev_row = { "<S-k>", mode = { "n", "v" } },
-				textobject_field_inner = { "if", mode = { "o", "x" } },
-				textobject_field_outer = { "af", mode = { "o", "x" } },
-			},
-		},
-		cmd = { "CsvViewEnable", "CsvViewDisable", "CsvViewToggle" },
-		ft = { "csv", "tsv", "dsv", "psv", "ssv", "scsv" },
-	},
 	{
 		"jmbuhr/otter.nvim",
 		config = function()

nvim/.config/nvim/lua/modules/editing.lua

@@ -2,64 +2,6 @@ return {
 	-- surround things with other things using ys/cs/ds
 	{ "kylechui/nvim-surround", config = true, event = { "CursorHold", "InsertEnter" } },
 
-    -- more intelligent w/e/b key jumps including CamelCase, snake_case words and
-    -- ignoring some punctuation
-	{
-		"chrisgrieser/nvim-spider",
-		keys = {
-			{ "w", "<cmd>lua require('spider').motion('w')<CR>", mode = { "n", "o", "x" } },
-			{ "e", "<cmd>lua require('spider').motion('e')<CR>", mode = { "n", "o", "x" } },
-			{ "b", "<cmd>lua require('spider').motion('b')<CR>", mode = { "n", "o", "x" } },
-		},
-	},
-	-- jump between letters with improved fFtT quicksearch, mimics sneak
-	{
-		"folke/flash.nvim",
-		event = "VeryLazy",
-		opts = {
-			modes = {
-				search = {
-					enabled = false,
-				},
-			},
-		},
-		keys = {
-			{
-				"s",
-				mode = { "n", "x" },
-				function()
-					require("flash").jump()
-				end,
-				desc = "Flash",
-			},
-			{
-				"S",
-				mode = { "n", "x" },
-				function()
-					require("flash").jump({
-						pattern = vim.fn.expand("<cword>"),
-					})
-				end,
-				desc = "Flash",
-			},
-			{
-				"r",
-				mode = "o",
-				function()
-					require("flash").remote()
-				end,
-				desc = "Remote Flash",
-			},
-			{
-				"R",
-				mode = { "n", "x", "o" },
-				function()
-					require("flash").treesitter_search()
-				end,
-				desc = "Flash Treesitter",
-			},
-		},
-	},
 	-- extend the ^x / ^a possibilities to dates, hex, alphabets, markdown headers
 	-- REMAPPED TO C-X / C-S for decrement/increment
 	{

nvim/.config/nvim/lua/modules/prose.lua

@@ -340,8 +340,6 @@ local prose_plugs = {
 		dependencies = { "nvim-treesitter/nvim-treesitter" },
 		event = { "BufEnter *.mdx" }, -- since the plug itself defines mdx ft
 	},
-	-- personal dict improvements for git sync
-	{ "micarmst/vim-spellsync", event = "VeryLazy" },
 }
 
 return prose_plugs

sh/.config/carapace/specs/cat.yaml

@@ -0,0 +1,3 @@
+# yaml-language-server: $schema=https://carapace.sh/schemas/command.json
+name: cat
+run: "[bat]"

sh/.config/sh/xdg

@@ -26,9 +26,9 @@ test "$XDG_DOCUMENTS_DIR" || export XDG_DOCUMENTS_DIR="$HOME/documents"
 test "$XDG_DOWNLOAD_DIR" || export XDG_DOWNLOAD_DIR="$HOME/downloads"
 
 export XDG_MEDIA_DIR="$HOME/media"
-export XDG_MUSIC_DIR="$XDG_MEDIA_DIR/music"
+export XDG_MUSIC_DIR="$XDG_MEDIA_DIR/audio/music"
 export XDG_PICTURES_DIR="$HOME/pictures"
-export XDG_VIDEOS_DIR="$XDG_MEDIA_DIR/videos"
+export XDG_VIDEOS_DIR="$HOME/videos"
 
 ## Non-Standard additions
 # non-standard, is added to path to enable execution of any files herein

terminal/.config/bash/bashrc

@@ -28,6 +28,8 @@ alias ls='ls --color=auto'
 
 eval "$(starship init bash)"
 eval "$(zoxide init bash)"
+export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
+source <(carapace _carapace)
 
 set -o vi
 stty time 0

terminal/.config/nushell/config.nu

@@ -39,6 +39,8 @@ starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.n
 atuin init nu | save -f ($nu.data-dir | path join "vendor/autoload/atuin.nu")
 # load zoxide bookmarks
 zoxide init nushell | save -f ($nu.data-dir | path join "vendor/autoload/zoxide.nu")
+# load carapace completions
+source ~/.cache/carapace/init.nu
 
 # keybinds
 $env.config.keybindings = [

terminal/.config/nushell/env.nu

@@ -0,0 +1,23 @@
+# env.nu
+#
+# Installed by:
+# version = "0.102.0"
+#
+# Previously, environment variables were typically configured in `env.nu`.
+# In general, most configuration can and should be performed in `config.nu`
+# or one of the autoload directories.
+#
+# This file is generated for backwards compatibility for now.
+# It is loaded before config.nu and login.nu
+#
+# See https://www.nushell.sh/book/configuration.html
+#
+# Also see `help config env` for more options.
+#
+# You can remove these comments if you want or leave
+# them for future reference.
+
+## create carapace completions
+$env.CARAPACE_BRIDGES = 'zsh,fish,bash,inshellisense' # optional
+mkdir ~/.cache/carapace
+carapace _carapace nushell | save --force ~/.cache/carapace/init.nu

terminal/.config/zsh/zshrc

@@ -140,6 +140,11 @@ TRANSIENT_PROMPT_RPROMPT='$(starship prompt --right --terminal-width="$COLUMNS"
 TRANSIENT_PROMPT_TRANSIENT_PROMPT='$(starship module character)'
 eval "$(zoxide init zsh)"
 eval "$(atuin init zsh)"
+export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
+source <(carapace _carapace)
+# make fzf-tab compatible with carapace
+# see <https://github.com/carapace-sh/carapace-bin/issues/2819#issuecomment-3092307945>
+zstyle ':fzf-tab:*' query-string ''
 
 # Speed up autocomplete, force prefix mapping
 zstyle ':completion:*' accept-exact '*(N)'

vcs/jj/config/nushell/autoload/jj.nu

@@ -58,8 +58,7 @@ def --wrapped jloof [search: string, ...flags] {
 alias jlfw = jj log -r "wip()" # Find 'WIP:'-prefixed changes
 alias jlfp = jj log -r "private()" # Find 'PRIVATE:'-prefixed changes
 
-alias jlh = jj log -r 'heads(all())'
+alias jh = jj log -r 'ancestors(heads(all()), 3)'
-alias JLH = jj log -r 'ancestors(heads(all()), 3)'
 
 alias jrb = jj rebase
 

vcs/jj/config/sh/alias.d/jj.sh

@@ -70,8 +70,7 @@ alias jlfw='jj log -r "wip()"'
 alias jlfp='jj log -r "private()"'
 
 # show branches (i.e. head commits) w a couple previous commits
-alias jlh="jj log -r 'heads(all())'"
+alias jh="jj log -r 'ancestors(heads(all()), 3)'"
-alias JLH="jj log -r 'ancestors(heads(all()), 3)'"
 
 alias jrb="jj rebase"