diff --git a/.config/nvim/fnl/init.fnl b/.config/nvim/fnl/init.fnl
index 2b329cd6..76349826 100644
--- a/.config/nvim/fnl/init.fnl
+++ b/.config/nvim/fnl/init.fnl
@@ -20,7 +20,7 @@
(set vim.o.wildmode "longest:full")
(set vim.o.winborder :rounded)
-(set vim.o.diffopt :inline:char)
+(set vim.o.diffopt "inline:char")
;; search
(set vim.o.gdefault true)
@@ -98,6 +98,38 @@
(vim.filetype.add {:extension {:ua :uiua}})
+;;; vim.pack
+
+(vim.pack.add ["https://git.kejadlen.dev/alpha/vim-colors-paramount.git"
+ ;; was using jaawerth/fennel.vim, but there are some annoyances
+ ;; with it, so let's try this one instead
+ "https://github.com/atweiden/vim-fennel.git"
+ "https://github.com/christoomey/vim-tmux-navigator.git"
+ "https://github.com/direnv/direnv.vim.git"
+ "https://github.com/hashivim/vim-terraform.git"
+ "https://github.com/itchyny/lightline.vim.git"
+ "https://github.com/j-hui/fidget.nvim.git"
+ "https://github.com/junegunn/fzf.vim.git"
+ "https://github.com/justinmk/vim-dirvish.git"
+ "https://github.com/lukas-reineke/indent-blankline.nvim.git"
+ "https://github.com/neovim/nvim-lspconfig.git"
+ "https://github.com/nvim-treesitter/nvim-treesitter.git"
+ "https://github.com/nvim-treesitter/nvim-treesitter-context.git"
+ "https://github.com/nvim-treesitter/nvim-treesitter-textobjects.git"
+ ;; here for completeness, but actually added in init.lua for
+ ;; bootstrapping purposes
+ ; "https://github.com/rktjmp/hotpot.nvim.git"
+ "https://github.com/suy/vim-context-commentstring.git"
+ "https://github.com/tpope/vim-abolish.git"
+ "https://github.com/tpope/vim-dispatch.git"
+ "https://github.com/tpope/vim-repeat.git"
+ "https://github.com/tpope/vim-sensible.git"
+ "https://github.com/tpope/vim-sleuth.git"
+ "https://github.com/tpope/vim-speeddating.git"
+ "https://github.com/tpope/vim-surround.git"
+ "https://github.com/tpope/vim-unimpaired.git"
+ "https://github.com/tpope/vim-vinegar.git"])
+
(require :fzf)
(require :lsp)
@@ -216,7 +248,7 @@
(let [{: setup} (require :ibl)] (setup))
;; mini.align
-(let [{: setup} (require :mini.align)] (setup))
+; (let [{: setup} (require :mini.align)] (setup))
;;; generate help files
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index ce76a558..4574ef99 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,2 +1,5 @@
+-- Needs to be added to vim.pack before requiring hotpot
+vim.pack.add({"https://github.com/rktjmp/hotpot.nvim.git"})
require("hotpot")
+
require("init")
diff --git a/.gitmodules b/.gitmodules
index fd7e0487..d4ee6026 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,143 +17,15 @@
[submodule "frink.alfredworkflow"]
path = src/frink.alfredworkflow
url = https://github.com/kejadlen/frink.alfredworkflow
-[submodule "lspconfig"]
- path = .local/share/nvim/site/pack/alpha/start/lspconfig
- url = https://github.com/neovim/nvim-lspconfig.git
- branch = master
- shallow = true
-[submodule "lightline"]
- path = .local/share/nvim/site/pack/alpha/start/lightline
- url = https://github.com/itchyny/lightline.vim.git
- branch = master
- shallow = true
-[submodule "treesitter"]
- path = .local/share/nvim/site/pack/alpha/start/treesitter
- url = https://github.com/nvim-treesitter/nvim-treesitter.git
- branch = master
- shallow = true
-[submodule "vim-tmux-navigator"]
- path = .local/share/nvim/site/pack/alpha/start/vim-tmux-navigator
- url = https://github.com/christoomey/vim-tmux-navigator.git
- branch = master
- shallow = true
-[submodule "unimpaired"]
- path = .local/share/nvim/site/pack/alpha/start/unimpaired
- url = https://github.com/tpope/vim-unimpaired.git
- branch = master
- shallow = true
-[submodule "sleuth"]
- path = .local/share/nvim/site/pack/alpha/start/sleuth
- url = https://github.com/tpope/vim-sleuth.git
- branch = master
- shallow = true
-[submodule "sensible"]
- path = .local/share/nvim/site/pack/alpha/start/sensible
- url = https://github.com/tpope/vim-sensible.git
- branch = master
- shallow = true
-[submodule "surround"]
- path = .local/share/nvim/site/pack/alpha/start/surround
- url = https://github.com/tpope/vim-surround.git
- branch = master
- shallow = true
-[submodule "fzf"]
- path = .local/share/nvim/site/pack/alpha/start/fzf
- url = https://github.com/junegunn/fzf.vim.git
- branch = master
- shallow = true
-[submodule "repeat"]
- path = .local/share/nvim/site/pack/alpha/start/repeat
- url = https://github.com/tpope/vim-repeat.git
- branch = master
- shallow = true
-[submodule "tabular"]
- path = .local/share/nvim/site/pack/alpha/start/tabular
- url = https://github.com/godlygeek/tabular.git
- branch = master
- shallow = true
-[submodule "treesitter-textobjects"]
- path = .local/share/nvim/site/pack/alpha/start/treesitter-textobjects
- url = https://github.com/nvim-treesitter/nvim-treesitter-textobjects.git
- branch = master
- shallow = true
-[submodule "hotpot"]
- path = .local/share/nvim/site/pack/alpha/start/hotpot
- url = https://github.com/rktjmp/hotpot.nvim.git
- shallow = true
- branch = main
-[submodule "fennel"]
- path = .local/share/nvim/site/pack/alpha/start/fennel
- url = https://github.com/jaawerth/fennel.vim.git
- branch = main
- shallow = true
-[submodule "paramount"]
- path = .local/share/nvim/site/pack/alpha/start/paramount
- url = https://git.kejadlen.dev/alpha/vim-colors-paramount.git
- branch = main
- shallow = true
-[submodule "context-commentstring"]
- path = .local/share/nvim/site/pack/alpha/start/context-commentstring
- url = https://github.com/suy/vim-context-commentstring.git
- branch = master
- shallow = true
-[submodule "terraform"]
- path = .local/share/nvim/site/pack/alpha/start/terraform
- url = https://github.com/hashivim/vim-terraform.git
- branch = master
- shallow = true
-[submodule "direnv.vim"]
- path = .local/share/nvim/site/pack/alpha/start/direnv
- url = https://github.com/direnv/direnv.vim.git
- branch = master
- shallow = true
[submodule "fzf-git.sh"]
path = src/fzf-git.sh
url = https://github.com/kejadlen/fzf-git.sh.git
branch = main
shallow = true
-[submodule "treesitter-context"]
- path = .local/share/nvim/site/pack/alpha/start/treesitter-context
- url = https://github.com/nvim-treesitter/nvim-treesitter-context.git
- branch = master
- shallow = true
-[submodule "fidget.nvim"]
- path = .local/share/nvim/site/pack/alpha/start/fidget
- url = https://github.com/j-hui/fidget.nvim.git
- shallow = true
-[submodule "dirvish"]
- path = .local/share/nvim/site/pack/alpha/start/dirvish
- url = https://github.com/justinmk/vim-dirvish.git
- branch = master
- shallow = true
[submodule "masked-email.alfredworkflow"]
path = src/masked-email.alfredworkflow
url = https://github.com/kejadlen/masked-email.alfredworkflow
branch = main
-[submodule "vim-speeddating"]
- path = .local/share/nvim/site/pack/alpha/start/speeddating
- url = https://github.com/tpope/vim-speeddating.git
- branch = master
-[submodule "indent-blankline"]
- path = .local/share/nvim/site/pack/alpha/start/indent-blankline
- url = https://github.com/lukas-reineke/indent-blankline.nvim.git
- branch = master
-[submodule "vim-dispatch"]
- path = .local/share/nvim/site/pack/alpha/start/dispatch
- url = https://github.com/tpope/vim-dispatch.git
- branch = master
-[submodule "mini.align"]
- path = .local/share/nvim/site/pack/alpha/start/mini-align
- url = https://github.com/echasnovski/mini.align.git
- branch = main
-[submodule "dirdiff"]
- path = .local/share/nvim/site/pack/alpha/start/dirdiff
- url = https://github.com/will133/vim-dirdiff.git
- branch = master
-[submodule "vim-abolish"]
- path = .local/share/nvim/site/pack/alpha/start/abolish
- url = https://github.com/tpope/vim-abolish.git
- branch = master
[submodule "tpm"]
path = .config/tmux/plugins/tpm
url = https://github.com/tmux-plugins/tpm
diff --git a/.local/share/nvim/site/pack/alpha/start/abolish b/.local/share/nvim/site/pack/alpha/start/abolish
deleted file mode 160000
index dcbfe065..00000000
--- a/.local/share/nvim/site/pack/alpha/start/abolish
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dcbfe065297d31823561ba787f51056c147aa682
diff --git a/.local/share/nvim/site/pack/alpha/start/context-commentstring b/.local/share/nvim/site/pack/alpha/start/context-commentstring
deleted file mode 160000
index edcf56c3..00000000
--- a/.local/share/nvim/site/pack/alpha/start/context-commentstring
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit edcf56c323071ddabf3cf68c8d39edc22b930809
diff --git a/.local/share/nvim/site/pack/alpha/start/dirdiff b/.local/share/nvim/site/pack/alpha/start/dirdiff
deleted file mode 160000
index 84bc8999..00000000
--- a/.local/share/nvim/site/pack/alpha/start/dirdiff
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 84bc8999fde4b3c2d8b228b560278ab30c7ea4c9
diff --git a/.local/share/nvim/site/pack/alpha/start/direnv b/.local/share/nvim/site/pack/alpha/start/direnv
deleted file mode 160000
index ab2a7e08..00000000
--- a/.local/share/nvim/site/pack/alpha/start/direnv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ab2a7e08dd630060cd81d7946739ac7442a4f269
diff --git a/.local/share/nvim/site/pack/alpha/start/dirvish b/.local/share/nvim/site/pack/alpha/start/dirvish
deleted file mode 160000
index c87a8e10..00000000
--- a/.local/share/nvim/site/pack/alpha/start/dirvish
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c87a8e103f2e8b44b411a38dda9bbe1229547952
diff --git a/.local/share/nvim/site/pack/alpha/start/dispatch b/.local/share/nvim/site/pack/alpha/start/dispatch
deleted file mode 160000
index a2ff28ab..00000000
--- a/.local/share/nvim/site/pack/alpha/start/dispatch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a2ff28abdb2d89725192db5b8562977d392a4d3f
diff --git a/.local/share/nvim/site/pack/alpha/start/fennel b/.local/share/nvim/site/pack/alpha/start/fennel
deleted file mode 160000
index c6a9c035..00000000
--- a/.local/share/nvim/site/pack/alpha/start/fennel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6a9c035ca108cbb24273d96cd6277fb8fbc60b4
diff --git a/.local/share/nvim/site/pack/alpha/start/fidget b/.local/share/nvim/site/pack/alpha/start/fidget
deleted file mode 160000
index e2a175c2..00000000
--- a/.local/share/nvim/site/pack/alpha/start/fidget
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e2a175c2abe2d4f65357da1c98c59a5cfb2b543f
diff --git a/.local/share/nvim/site/pack/alpha/start/fzf b/.local/share/nvim/site/pack/alpha/start/fzf
deleted file mode 160000
index 556f45e7..00000000
--- a/.local/share/nvim/site/pack/alpha/start/fzf
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 556f45e79ae5e3970054fee4c4373472604a1b4e
diff --git a/.local/share/nvim/site/pack/alpha/start/hotpot b/.local/share/nvim/site/pack/alpha/start/hotpot
deleted file mode 160000
index c6026bed..00000000
--- a/.local/share/nvim/site/pack/alpha/start/hotpot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6026bedbc593ce5c00399ccfb1cf964180f529b
diff --git a/.local/share/nvim/site/pack/alpha/start/indent-blankline b/.local/share/nvim/site/pack/alpha/start/indent-blankline
deleted file mode 160000
index 7871a880..00000000
--- a/.local/share/nvim/site/pack/alpha/start/indent-blankline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7871a88056f7144defca9c931e311a3134c5d509
diff --git a/.local/share/nvim/site/pack/alpha/start/lightline b/.local/share/nvim/site/pack/alpha/start/lightline
deleted file mode 160000
index d6a07ea3..00000000
--- a/.local/share/nvim/site/pack/alpha/start/lightline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6a07ea376a4b7372aa59e7ea6a051c9470bb4d0
diff --git a/.local/share/nvim/site/pack/alpha/start/lspconfig b/.local/share/nvim/site/pack/alpha/start/lspconfig
deleted file mode 160000
index 1b801f68..00000000
--- a/.local/share/nvim/site/pack/alpha/start/lspconfig
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1b801f68d09e70e59e6dd967b663b6d84ee3e87d
diff --git a/.local/share/nvim/site/pack/alpha/start/mini-align b/.local/share/nvim/site/pack/alpha/start/mini-align
deleted file mode 160000
index e715137a..00000000
--- a/.local/share/nvim/site/pack/alpha/start/mini-align
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e715137aece7d05734403d793b8b6b64486bc812
diff --git a/.local/share/nvim/site/pack/alpha/start/paramount b/.local/share/nvim/site/pack/alpha/start/paramount
deleted file mode 160000
index ceaed9d1..00000000
--- a/.local/share/nvim/site/pack/alpha/start/paramount
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ceaed9d1ac18380a9e97b266237288dd4e40ed5e
diff --git a/.local/share/nvim/site/pack/alpha/start/repeat b/.local/share/nvim/site/pack/alpha/start/repeat
deleted file mode 160000
index 65846025..00000000
--- a/.local/share/nvim/site/pack/alpha/start/repeat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 65846025c15494983dafe5e3b46c8f88ab2e9635
diff --git a/.local/share/nvim/site/pack/alpha/start/sensible b/.local/share/nvim/site/pack/alpha/start/sensible
deleted file mode 160000
index 0ce2d843..00000000
--- a/.local/share/nvim/site/pack/alpha/start/sensible
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0ce2d843d6f588bb0c8c7eec6449171615dc56d9
diff --git a/.local/share/nvim/site/pack/alpha/start/sleuth b/.local/share/nvim/site/pack/alpha/start/sleuth
deleted file mode 160000
index be69bff8..00000000
--- a/.local/share/nvim/site/pack/alpha/start/sleuth
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit be69bff86754b1aa5adcbb527d7fcd1635a84080
diff --git a/.local/share/nvim/site/pack/alpha/start/speeddating b/.local/share/nvim/site/pack/alpha/start/speeddating
deleted file mode 160000
index c17eb01e..00000000
--- a/.local/share/nvim/site/pack/alpha/start/speeddating
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c17eb01ebf5aaf766c53bab1f6592710e5ffb796
diff --git a/.local/share/nvim/site/pack/alpha/start/surround b/.local/share/nvim/site/pack/alpha/start/surround
deleted file mode 160000
index 3d188ed2..00000000
--- a/.local/share/nvim/site/pack/alpha/start/surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3d188ed2113431cf8dac77be61b842acb64433d9
diff --git a/.local/share/nvim/site/pack/alpha/start/tabular b/.local/share/nvim/site/pack/alpha/start/tabular
deleted file mode 160000
index 12437cd1..00000000
--- a/.local/share/nvim/site/pack/alpha/start/tabular
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 12437cd1b53488e24936ec4b091c9324cafee311
diff --git a/.local/share/nvim/site/pack/alpha/start/terraform b/.local/share/nvim/site/pack/alpha/start/terraform
deleted file mode 160000
index 24de93af..00000000
--- a/.local/share/nvim/site/pack/alpha/start/terraform
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 24de93afb05078bac6a2e966402cc1f672277708
diff --git a/.local/share/nvim/site/pack/alpha/start/treesitter b/.local/share/nvim/site/pack/alpha/start/treesitter
deleted file mode 160000
index 42fc28ba..00000000
--- a/.local/share/nvim/site/pack/alpha/start/treesitter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 42fc28ba918343ebfd5565147a42a26580579482
diff --git a/.local/share/nvim/site/pack/alpha/start/treesitter-context b/.local/share/nvim/site/pack/alpha/start/treesitter-context
deleted file mode 160000
index 93b29a32..00000000
--- a/.local/share/nvim/site/pack/alpha/start/treesitter-context
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 93b29a32d5f4be10e39226c6b796f28d68a8b483
diff --git a/.local/share/nvim/site/pack/alpha/start/treesitter-textobjects b/.local/share/nvim/site/pack/alpha/start/treesitter-textobjects
deleted file mode 160000
index ad8f0a47..00000000
--- a/.local/share/nvim/site/pack/alpha/start/treesitter-textobjects
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ad8f0a472148c3e0ae9851e26a722ee4e29b1595
diff --git a/.local/share/nvim/site/pack/alpha/start/unimpaired b/.local/share/nvim/site/pack/alpha/start/unimpaired
deleted file mode 160000
index 6d44a6dc..00000000
--- a/.local/share/nvim/site/pack/alpha/start/unimpaired
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d44a6dc2ec34607c41ec78acf81657248580bf1
diff --git a/.local/share/nvim/site/pack/alpha/start/vim-tmux-navigator b/.local/share/nvim/site/pack/alpha/start/vim-tmux-navigator
deleted file mode 160000
index 424b5caa..00000000
--- a/.local/share/nvim/site/pack/alpha/start/vim-tmux-navigator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 424b5caa154bff34dc258ee53cec5a8e36cf7ea8