restructure neovim for lazy and copilot

.config/nvim/lazy-lock.json

@@ -1,7 +1,7 @@
 {
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "LazyVim": { "branch": "main", "commit": "c3477ed81e8e26bce1eb53f9c04a8aa7adc1807a" },
-  "LuaSnip": { "branch": "master", "commit": "3d2ad0c0fa25e4e272ade48a62a185ebd0fe26c1" },
+  "LazyVim": { "branch": "main", "commit": "9a0543531d05a417ba63f3dd710530ba5765aca5" },
+  "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
   "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
   "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
   "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" },
@@ -10,56 +10,57 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "copilot.lua": { "branch": "master", "commit": "9cb5396205faf609bc9df0e841e133ccb1b70540" },
-  "dressing.nvim": { "branch": "master", "commit": "5fb5cce0cbfcedeadbcee43e5674e8c9a9f28d4a" },
+  "copilot.lua": { "branch": "master", "commit": "e48bd7020a98be217d85c006a298656294fd6210" },
+  "dressing.nvim": { "branch": "master", "commit": "39611852fd7bbac117e939a26759bb37361f0c90" },
   "feline.nvim": { "branch": "main", "commit": "c32c2ffcee38f14e157582552fa9ee41c24452d2" },
-  "flash.nvim": { "branch": "main", "commit": "188666c2d76347e46fc8527f9428fd48693b469c" },
-  "gitsigns.nvim": { "branch": "main", "commit": "a36bc3360d584d39b4fb076d855c4180842d4444" },
-  "go.nvim": { "branch": "master", "commit": "97b76f3188c64d4dacfc17c7c1543f775a3fb8e8" },
+  "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" },
+  "gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" },
+  "go.nvim": { "branch": "master", "commit": "6550ddf5ce491d17af009c397aceb25310566eaa" },
+  "goerr-nvim": { "branch": "main", "commit": "d30ba1cab652e78dbf6a644eb4823be57e9af203" },
   "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" },
-  "lazy.nvim": { "branch": "main", "commit": "b7043f2983d7aead78ca902f3f2053907081859a" },
-  "lsp-zero.nvim": { "branch": "v2.x", "commit": "52582fc91efb40ee347c20570ff7d32849ef4a89" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
+  "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "c70bd7362f728b568b4884bc82a8208d14ace537" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "d381fcb78d7a562c3244e1c8f76406954649db36" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "73c68abdf65279e41526eb152876511a8ae84ea2" },
-  "mason.nvim": { "branch": "main", "commit": "664c987c3b14d2262a4e580f993a3e5045baded0" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "8324fd52f7880bf17142f56b45f544d64eff5ac9" },
-  "neotest": { "branch": "master", "commit": "e46eae5739c470aa011ee43108ea8a730736174e" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
+  "mason.nvim": { "branch": "main", "commit": "3f6b544c75c01549f7a2a9e395e0f1cea42b25dd" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
+  "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" },
   "nginx.vim": { "branch": "master", "commit": "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42" },
-  "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" },
-  "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" },
-  "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" },
+  "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
+  "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
+  "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
   "nvim-bufdel": { "branch": "main", "commit": "96c4f7ab053ddab0025bebe5f7c71e4795430e47" },
-  "nvim-cmp": { "branch": "main", "commit": "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0" },
-  "nvim-cokeline": { "branch": "main", "commit": "cb4bbdf9bb6c8a070a655f04842bb86a101e040d" },
+  "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
+  "nvim-cokeline": { "branch": "main", "commit": "056da2596e20959d0fd6d9f713c10c6884e5ece0" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "a6d48d23407fbad7a4c1451803b8f34cab31c441" },
-  "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b6b34b9acf84949f0ac1c00747765e62b81fb38d" },
+  "nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" },
+  "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0" },
   "nvim-surround": { "branch": "main", "commit": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18" },
-  "nvim-treesitter": { "branch": "master", "commit": "f03db67aa400940a4e39f138a20cc9d0843528d3" },
+  "nvim-treesitter": { "branch": "master", "commit": "7c1e944311a0d4eb2c8a346661ee4ed207aca514" },
   "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
-  "nvim-web-devicons": { "branch": "master", "commit": "14b3a5ba63b82b60cde98d0a40319d80f25e8301" },
+  "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
+  "oil.nvim": { "branch": "master", "commit": "eaa20a6aee7c4df89d80ec8208de63ec2fa4d38a" },
   "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" },
-  "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" },
+  "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
   "robotframework-vim": { "branch": "master", "commit": "75d5b371a4da2a090a2872d55bd0dead013f334e" },
-  "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
+  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
   "sad.nvim": { "branch": "master", "commit": "869c7f3ca3dcd28fd78023db6a7e1bf8af0f4714" },
-  "smart-open.nvim": { "branch": "0.2.x", "commit": "e67d3cc01cfa863f7d5e16b2b2f0bf2bf46f6283" },
+  "smart-open.nvim": { "branch": "0.2.x", "commit": "20ac086494a6dda649b0cfb255565e8b248d0550" },
   "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" },
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
-  "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
-  "telescope.nvim": { "branch": "master", "commit": "ffe35cb433192fcb5080b557c1aef14d37092035" },
+  "telescope.nvim": { "branch": "master", "commit": "1228f3b15ca3d9b95dcb92efda6a3448871030bd" },
   "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
-  "trouble.nvim": { "branch": "main", "commit": "a3372bd2ba3a91882a6e54ed35da13a441d7c167" },
+  "trouble.nvim": { "branch": "main", "commit": "0e6703c1d37d2d34ed029ab54f9bd66e3f2ecbf7" },
   "vim": { "branch": "main", "commit": "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
   "vim-js": { "branch": "master", "commit": "90f340d31907590fad059cd9aab03a55ab49e352" },
   "vim-jsx-pretty": { "branch": "master", "commit": "6989f1663cc03d7da72b5ef1c03f87e6ddb70b41" },
   "vim-markdown": { "branch": "master", "commit": "cc82d88e2a791f54d2b6e2b26e41f743351ac947" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
   "vim-terraform": { "branch": "master", "commit": "2bbc5f65a80c79a5110494a2ba1b869075fcf7a0" },
-  "which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" }
+  "which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" }
 }

.config/nvim/lua/config/keymaps.lua

@@ -1,6 +1,6 @@
 local k = vim.keymap
 
--- Copilot: move these keybindings into ./lua/plugins/whichkey.lua
+-- Copilot: move th5ese keybindings into ./lua/plugins/whichkey.lua
 -- Move them into the whichkey configuration
 
 -- Search
@@ -40,7 +40,7 @@ k.set("n", "H", "<cmd>bprev<cr>")
 k.set({ "n", "i" }, "<C-o>n", "<cmd>bnext<cr>")
 k.set({ "n", "i" }, "<C-o>p", "<cmd>bprev<cr>")
 
--- Incremental search
+-- Incremental search5
 k.set("n", "<esc>", "<cmd>noh<cr>")
 k.set("n", "\\", "<cmd>noh<cr>")
 

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

@@ -18,6 +18,7 @@ o.expandtab = true
 o.foldenable = false
 o.foldexpr = "nvim_treesitter#foldexpr()"
 o.foldmethod = "expr"
+-- o.foldmethod = "syntax"
 o.grepprg = "rg --color=never"
 o.guicursor = "a:blinkon0,i:ver25-iCursor"
 o.ignorecase = true

.config/nvim/lua/plugins/better_escape.lua

@@ -0,0 +1,8 @@
+-- Faster insert exit
+return {
+	"max397574/better-escape.nvim",
+	event = "InsertEnter",
+	config = function()
+		require("better_escape").setup({ mapping = { "jk" } })
+	end,
+}

.config/nvim/lua/plugins/bufdel.lua

@@ -0,0 +1,2 @@
+-- Close tab, buffer, or neovim
+return { "ojroques/nvim-bufdel" }

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

@@ -0,0 +1,5 @@
+-- Colorize hex codes
+return {
+	"norcalli/nvim-colorizer.lua",
+	cmd = "ColorizerToggle",
+}

.config/nvim/lua/plugins/commentary.lua

@@ -0,0 +1,2 @@
+-- Comment mgmt
+return { "tpope/vim-commentary", event = "BufEnter" }

.config/nvim/lua/plugins/indent_lines.lua

@@ -0,0 +1,2 @@
+-- Indent guides
+return { "lukas-reineke/indent-blankline.nvim", ft = { "python" } }

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

@@ -0,0 +1,2 @@
+-- Enable LazyVim plugins
+return { "LazyVim/LazyVim" }

.config/nvim/lua/plugins/oil.lua

@@ -0,0 +1,6 @@
+return {
+	"stevearc/oil.nvim",
+	opts = {},
+	-- Optional dependencies
+	dependencies = { "nvim-tree/nvim-web-devicons" },
+}

.config/nvim/lua/plugins/sad.lua

@@ -0,0 +1,2 @@
+-- Cross-project find / replace
+return { "ray-x/sad.nvim", dependencies = "ray-x/guihua.lua", cmd = "Sad" }

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

@@ -6,6 +6,7 @@ return {
 		"folke/trouble.nvim",
 		"nvim-tree/nvim-web-devicons",
 		{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
+		{ "danielfalk/smart-open.nvim", branch = "0.2.x", dependencies = "kkharji/sqlite.lua" },
 	},
 	cmd = { "Telescope" },
 	config = function()
@@ -26,5 +27,6 @@ return {
 			},
 		})
 		require("telescope").load_extension("fzf")
+		require("telescope").load_extension("smart_open")
 	end,
 }

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

@@ -4,6 +4,7 @@ return {
 	dependencies = {
 
 		{ "nvim-treesitter/playground", lazy = true },
+		{ "windwp/nvim-ts-autotag", lazy = true, event = { "BufEnter" } },
 	},
 
 	config = function()

.config/nvim/lua/plugins/whichkey.lua

@@ -25,12 +25,12 @@ return {
 		local wk = require("which-key")
 		wk.register({
 			["<leader>"] = {
-				["<leader>"] = {
-					name = "Easymotion",
-					w = { "<cmd>HopWord<cr>", "Hop line" },
-					j = { "<cmd>HopWordAC<cr>", "Word down" },
-					k = { "<cmd>HopWordBC<cr>", "Word up" },
-				},
+				-- ["<leader>"] = {
+				-- 	name = "Easymotion",
+				-- 	w = { "<cmd>HopWord<cr>", "Hop line" },
+				-- 	j = { "<cmd>HopWordAC<cr>", "Word down" },
+				-- 	k = { "<cmd>HopWordBC<cr>", "Word up" },
+				-- },
 				f = {
 					name = "Find",
 					a = { "<cmd>Telescope<cr>", "Find all" },

.skhdrc

@@ -1,16 +1,16 @@
 # vi: ft=config
 
-alt - n : yabai -m space --focus next
-alt - p : yabai -m space --focus prev
-alt - 1 : yabai -m space --focus 1
-alt - 2 : yabai -m space --focus 2
-alt - 3 : yabai -m space --focus 3
-alt - 4 : yabai -m space --focus 4
-alt - 5 : yabai -m space --focus 5
-alt - 6 : yabai -m space --focus 6
-alt - 7 : yabai -m space --focus 7
-alt - 8 : yabai -m space --focus 8
-alt - 9 : yabai -m space --focus 9
+# alt - n : yabai -m space --focus next
+# alt - p : yabai -m space --focus prev
+# alt - 1 : yabai -m space --focus 1
+# alt - 2 : yabai -m space --focus 2
+# alt - 3 : yabai -m space --focus 3
+# alt - 4 : yabai -m space --focus 4
+# alt - 5 : yabai -m space --focus 5
+# alt - 6 : yabai -m space --focus 6
+# alt - 7 : yabai -m space --focus 7
+# alt - 8 : yabai -m space --focus 8
+# alt - 9 : yabai -m space --focus 9
 
 
 alt - b : yabai -m space --balance
@@ -30,12 +30,14 @@ alt - w : yabai -m window --toggle float;\
 alt - f : yabai -m space --layout float;\
   yabai -m window --grid 1:1:1:1:1:1
 
-alt - s : yabai -m space --layout float;\
-  yabai -m config window_border off;\
-  yabai -m config window_shadow on
-alt - d : yabai -m space --layout bsp;\
-  yabai -m config window_border on;\
-  yabai -m config window_shadow float
+alt - s : yabai -m space --layout float
+  #;\
+  # yabai -m config window_border off;\
+  # yabai -m config window_shadow on
+alt - d : yabai -m space --layout bsp
+  #;\
+  # yabai -m config window_border on;\
+  # yabai -m config window_shadow float
 
 
 alt - 0x18 : yabai -m space --gap rel:-8;\

.yabairc

@@ -1,24 +1,25 @@
 #!/usr/bin/env sh
 
-sudo yabai --load-sa
-yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
+# sudo yabai --load-sa
+# yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
 # https://github.com/koekeishiya/yabai/wiki/Configuration
 # shasum -a 256 $(which yabai)
 # codesign -fs 'yabai-cert' $(brew --prefix yabai)/bin/yabai
 
 # borders
-yabai -m config window_border on
+yabai -m config window_border off
 
 # opacity
 yabai -m config window_opacity off
 # First two digits are opacity
-yabai -m config active_window_border_color "0x70D08770"
+# yabai -m config active_window_border_color "0x70D08770"
 
 # animation
 # yabai -m config window_animation_duration 0.35
 
 # global settings
-yabai -m config window_shadow float
+# yabai -m config window_shadow float
+yabai -m config window_shadow off
 yabai -m config window_placement second_child
 yabai -m config auto_balance off
 yabai -m config layout float
@@ -31,11 +32,11 @@ yabai -m config mouse_follows_focus off
 yabai -m config focus_follows_mouse off
 
 # padding and gaps
-yabai -m config top_padding 0
-yabai -m config bottom_padding 0
-yabai -m config left_padding 0
-yabai -m config right_padding 0
-yabai -m config window_gap 0
+yabai -m config top_padding 8
+yabai -m config bottom_padding 8
+yabai -m config left_padding 8
+yabai -m config right_padding 8
+yabai -m config window_gap 8
 
 # app exclusions
 # yabai -m rule --add app="^System Settings$" manage=off sticky=on layer=above