Merge branch 'air-2025-09-12' of github.com:ADGEfficiency/dotfiles into wsl-2025-09-20

Author: ADGEfficiency

Makefile

@@ -26,13 +26,13 @@ setup-stow:
 
 STOW_ARGS=-vv
 dotfiles: setup-stow
-	stow $(STOW_ARGS) -d dotfiles -t $(HOME) $(OS)
-	stow $(STOW_ARGS) dotfiles
-	stow $(STOW_ARGS) yabai
+	stow "$(STOW_ARGS)" -d dotfiles -t "$(HOME)"$(OS)
+	stow "$(STOW_ARGS)" dotfiles
+	stow "$(STOW_ARGS)" yabai
 	ln -sf ~/dotfiles/fish ~/.config/fish\
 
 test: setup-nix
-	bash ./nix/load-$(OS).sh && bash ./tests/*.sh
+	bash ./nix/load-"$(OS)".sh && bash ./tests/*.sh
 
 .PHONY: setup-uv python js
 
@@ -64,12 +64,12 @@ setup-vim:
 
 setup-nix:
 	curl -L https://nixos.org/nix/install | sh
-	. ./nix/load-$(OS).sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
-	. ./nix/load-$(OS).sh && nix-channel --update
+	. ./nix/load-"$(OS)".sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
+	. ./nix/load-"$(OS)".sh && nix-channel --update
 
 NIX_ARGS=--extra-experimental-features nix-command --extra-experimental-features flakes
 nix-pkgs: setup-nix
-	. ./nix/load-$(OS).sh && cd nix && nix flake update $(NIX_ARGS) && nix profile install $(NIX_ARGS)
+	. ./nix/load-"$(OS)".sh && cd nix && nix flake update $(NIX_ARGS) && (nix profile upgrade $(NIX_ARGS) nix || nix profile install $(NIX_ARGS) .)
 
 .PHONY: setup-brew brew-pkgs
 
@@ -78,6 +78,6 @@ setup-brew:
 	brew update; brew upgrade
 
 brew-pkgs: setup-brew
-	brew install hadolint vale actionlint mactex pandoc fzf keychain wordnet
+	brew install hadolint vale actionlint mactex pandoc fzf keychain wordnet entr
 	brew install koekeishiya/formulae/yabai
 	brew install koekeishiya/formulae/skhd

README.md

@@ -86,6 +86,12 @@ Neovim config is in `./nvim`. To use the Neovim setup, put this folder into `$XD
 
 I use Lazy for package management in Neovim - it will install packages when you first open the editor.
 
+### Shell Customization
+
+The `s` command opens a fuzzy file finder (fzf) to search and open files in `$EDITOR`. Run `s` in any directory, or pass a path like `s ~/projects`. Supports multi-select with Tab.
+
+Lot's of aliases - see `scripts/aliases.sh`.
+
 ### Getting Kitty to Play Nice on macOS
 
 Had weird issue with the first execution of Kitty not loading the `kitty.conf` correctly - fixed with:
@@ -112,5 +118,3 @@ Had weird issue with the first execution of Kitty not loading the `kitty.conf` c
 
 $ launchctl load ~/Library/LaunchAgents/setenv.XDG_CONFIG_HOME.plist
 ```
-
-

dotfiles/.envrc

@@ -1,2 +1,3 @@
 source_env_if_exists ~/.env.secret
 export TRACE=0
+source .venv/bin/activate

dotfiles/.luarc.json

@@ -1,6 +1,6 @@
 {
   "workspace.library": [
-    "/Users/adam/dotfiles/nvim",
+    "/Users/adamgreen/dotfiles/nvim",
     "${3rd}/luassert/library",
     "${3rd}/luv/library"
   ]

nix/flake.lock

@@ -15,7 +15,7 @@
         defaultPackage = with pkgs; buildEnv {
           name = "shell";
           paths = [
-            actionlint
+            # actionlint # Installed via Homebrew to avoid nokogiri build issues
             go-tools
             bash
             bat
@@ -32,6 +32,8 @@
             entr
             findutils
             # fish
+            fd
+            csvlens
             flyctl
             gh
             git
@@ -60,7 +62,7 @@
             nodePackages_latest.prettier
             nodePackages_latest.sql-formatter
             nodePackages_latest.stylelint
-            nodejs_20
+            nodejs_22
             ov
             pandoc
             ripgrep

nix/flake.nix

@@ -0,0 +1,20 @@
+{
+  "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
+  "runtime": {
+    "version": "LuaJIT"
+  },
+  "diagnostics": {
+    "globals": ["vim"]
+  },
+  "workspace": {
+    "library": [
+      "$VIMRUNTIME",
+      "${3rd}/luv/library",
+      "${3rd}/luassert/library"
+    ],
+    "checkThirdParty": false
+  },
+  "telemetry": {
+    "enable": false
+  }
+}

nvim/.luarc.json

@@ -21,7 +21,9 @@
   "gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
   "lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
   "mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
   "nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" },
@@ -31,6 +33,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" },
   "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
   "nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
   "obsidian.nvim": { "branch": "main", "commit": "e0eb92c5afcacf5bf11e4735079a538fd1486ea9" },
@@ -40,6 +43,7 @@
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-git-file-history.nvim": { "branch": "master", "commit": "c27d99ba88ec5f0b6d2b9f9bc67dd3d14c610b25" },
   "telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
@@ -52,6 +56,7 @@
   "vim-markdown-toc": { "branch": "master", "commit": "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1" },
   "vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
   "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
+  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
   "winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
   "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }

nvim/lazy-lock.json

@@ -25,11 +25,11 @@ vim.cmd([[
 
 -- Search in personal notes
 local function searchPersonalNotes()
-	require("telescope.builtin").find_files({
+	require("telescope.builtin").find_files(require("telescope.themes").get_ivy({
 		prompt_title = "<Personal Notes>",
 		search_dirs = { "~/personal", "~/programming-resources" },
 		path_display = { "absolute" },
-	})
+	}))
 end
 _G.searchPersonalNotes = searchPersonalNotes
 -- :S

nvim/lua/config/command.lua

@@ -89,38 +89,23 @@ km("n", "<leader>g", ":Grepper -tool rg -noprompt -cword <CR>", opts)
 
 -- Telescope
 -- Search diagnostics
-km(
-	"n",
-	"<leader>rd",
-	":lua require'telescope.builtin'.diagnostics(require('telescope.themes').get_ivy({}))<cr><cr>",
-	opts
-)
+km("n", "<leader>rd", ":lua require'telescope.builtin'.diagnostics(require('telescope.themes').get_ivy({}))<cr>", opts)
 -- Search open buffers
 km(
 	"n",
 	"<leader><leader>",
-	":lua require'telescope.builtin'.buffers(require('telescope.themes').get_ivy({}))<cr><cr>",
+	":lua require'telescope.builtin'.buffers(require('telescope.themes').get_ivy({}))<cr>",
 	opts
 )
 -- Search for files in cwd
-km("n", "<leader>j", ":lua require'telescope.builtin'.find_files(require('telescope.themes').get_ivy({}))<CR>", opts)
+km("n", "<leader>j", ":lua require'telescope.builtin'.find_files(require('telescope.themes').get_ivy({}))<cr>", opts)
 --- Search through recent files
-km("n", "<leader>ro", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr><cr>", opts)
-km("n", "<leader>rr", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr><cr>", opts)
+km("n", "<leader>ro", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr>", opts)
+km("n", "<leader>rr", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr>", opts)
 -- Search for a string
-km(
-	"n",
-	"<leader>rg",
-	":lua require'telescope.builtin'.live_grep(require('telescope.themes').get_ivy({}))<cr><cr>",
-	opts
-)
+km("n", "<leader>rg", ":lua require'telescope.builtin'.live_grep(require('telescope.themes').get_ivy({}))<cr>", opts)
 -- Search for a string under cursor
-km(
-	"n",
-	"<leader>rc",
-	":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))<cr><cr>",
-	opts
-)
+km("n", "<leader>rc", ":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))<cr>", opts)
 
 -- Oil
 vim.keymap.set("n", "<leader>o", "<CMD>split | Oil<CR>")