feat: Updates to nvim config and snippets

nvim/m-housh/lua/user/plugin/cmp.lua

@@ -14,6 +14,8 @@ return {
 		local luasnip = require("luasnip")
 		local lspkind = require("lspkind")
 
+		-- TODO: This is implemented in LuaSnip config, does it need to be here?
+
 		-- loads vscode style snippets from installed plugins (e.g. friendly-snippets)
 		require("luasnip.loaders.from_vscode").lazy_load()
 
@@ -32,6 +34,9 @@ return {
 				["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
 				["<C-e>"] = cmp.mapping.abort(), -- close completion window
 				["<CR>"] = cmp.mapping.confirm({ select = false, behavior = cmp.ConfirmBehavior.Replace }),
+				-- TODO:
+				-- The next two mappings are also implemented in the LuaSnip configuration,
+				-- as <C-j> and <C-k> do they actually need to be here??
 				["<C-b>"] = cmp.mapping(function(fallback)
 					if luasnip.jumpable(-1) then
 						luasnip.jump(-1)

nvim/m-housh/lua/user/plugin/init.lua

@@ -1,31 +1,2 @@
 -- This file contains plugin's that don't require much configuration.
-return {
---   {
---     "L3MON4D3/LuaSnip",
---     version = "2.*",
---     build = "make install_jsregexp",
---     event = { 'BufReadPre', 'BufNewFile' },
---     config = function()
---       local luasnip = require('luasnip')
---       local types = require('luasnip.util.types')
---       luasnip.config.set_config {
---         history = true,
---         updateevents = "TextChanged,TextChangedI",
---         enable_autosnippets = true,
---         ext_opts = {
---           [types.choiceNode] = {
---             active = {
---               virt_text = { { "<-", "Error" } },
---             },
---           },
---         },
---       }
---     end
---   },
-  {
-	  "hrsh7th/vim-vsnip",
-	  config = function()
-      vim.g.vsnip_snippet_dir = os.getenv('HOME') .. '/.config/m-housh/lua/snippets/'
-    end
-  },
-}
+return {}

nvim/m-housh/lua/user/plugin/lsp.lua

@@ -74,6 +74,7 @@ return {
 					-- more details: https://github.com/neovim/neovim/issues/19237#issuecomment-2237037154
 					client.offset_encoding = "utf-8"
 				end,
+				cmd = lsp == "sourcekit" and { vim.trim(vim.fn.system("xcrun -f sourcekit-lsp")) } or nil,
 			})
 		end
 
@@ -84,6 +85,7 @@ return {
 			vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
 		end
 
+		-- For some reason I was having trouble getting this to work inside the on-attach, so it's here.
 		vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "[R]e-[N]ame" })
 	end,
 }

nvim/m-housh/lua/user/plugin/oil.lua

@@ -11,9 +11,8 @@ return {
 				["<M-h>"] = "actions.select_split",
 			},
 			view_options = {
-				--show_hidden = true,
-				is_hidden_file = function(name, bufnr)
-					-- Don't show .DS_STORE in output.
+				is_hidden_file = function(name, _) -- second arg is bufnr, but not currently used.
+					-- Don't show .DS_Store in output.
 					local is_ds_store = name ~= ".DS_Store"
 					return not is_ds_store
 				end,
@@ -25,5 +24,8 @@ return {
 
 		-- Open parent directory in floating window.
 		vim.keymap.set("n", "<space>-", require("oil").toggle_float)
+
+		-- Old habits die hard, map what used to toggle neo-tree to just open a float.
+		vim.keymap.set("n", "<C-n>", require("oil").toggle_float)
 	end,
 }

nvim/m-housh/lua/user/plugin/telescope.lua

@@ -27,14 +27,18 @@ return {
 				},
 				mappings = {
 					i = {
-						-- Close on first esc instead of gonig to normal mode
+						-- Close on first esc instead of going to normal mode
 						["<esc>"] = actions.close,
 						["<A-q>"] = actions.send_selected_to_qflist,
 						["<C-q>"] = actions.send_to_qflist,
 						["<s-tab>"] = actions.toggle_selection + actions.move_selection_next,
 						["<tab>"] = actions.toggle_selection + actions.move_selection_previous,
+						["<C-j>"] = actions.move_selection_next,
+						["<C-k>"] = actions.move_selection_previous,
 					},
 					n = {
+						["<C-j>"] = actions.move_selection_next,
+						["<C-k>"] = actions.move_selection_previous,
 						["<s-tab>"] = actions.toggle_selection + actions.move_selection_next,
 						["<tab>"] = actions.toggle_selection + actions.move_selection_previous,
 						["<A-q>"] = actions.send_selected_to_qflist,

nvim/m-housh/lua/user/plugin/xcodebuild.lua

@@ -77,46 +77,3 @@ return {
     vim.keymap.set("n", "<leader>xa", "<cmd>XcodebuildCodeActions<cr>", { desc = "Show Code Actions" })
 	end,
 }
--- return {
---   "wojciech-kulik/xcodebuild.nvim",
---   dependencies = {
---     "nvim-telescope/telescope.nvim",
---     "MunifTanjim/nui.nvim",
---     "nvim-neo-tree/neo-tree.nvim", -- (optional) to manage project files
---     "stevearc/oil.nvim", -- (optional) to manage project files
---     "nvim-treesitter/nvim-treesitter", -- (optional) for Quick tests support (required Swift parser)
---   },
---   config = function()
---     require("xcodebuild").setup({
---         -- put some options here or leave it empty to use default settings
---       code_coverage = {
---         enabled = true
---       }
---     })
---
---     vim.keymap.set("n", "<leader>X", "<cmd>XcodebuildPicker<cr>", { desc = "Show Xcodebuild Actions" })
---     vim.keymap.set("n", "<leader>xf", "<cmd>XcodebuildProjectManager<cr>", { desc = "Show Project Manager Actions" })
---
---     vim.keymap.set("n", "<leader>xb", "<cmd>XcodebuildBuild<cr>", { desc = "Build Project" })
---     vim.keymap.set("n", "<leader>xB", "<cmd>XcodebuildBuildForTesting<cr>", { desc = "Build For Testing" })
---     vim.keymap.set("n", "<leader>xr", "<cmd>XcodebuildBuildRun<cr>", { desc = "Build & Run Project" })
---
---     vim.keymap.set("n", "<leader>xt", "<cmd>XcodebuildTest<cr>", { desc = "Run Tests" })
---     vim.keymap.set("v", "<leader>xt", "<cmd>XcodebuildTestSelected<cr>", { desc = "Run Selected Tests" })
---     vim.keymap.set("n", "<leader>xT", "<cmd>XcodebuildTestClass<cr>", { desc = "Run Current Test Class" })
---     vim.keymap.set("n", "<leader>x.", "<cmd>XcodebuildTestRepeat<cr>", { desc = "Repeat Last Test Run" })
---
---     vim.keymap.set("n", "<leader>xl", "<cmd>XcodebuildToggleLogs<cr>", { desc = "Toggle Xcodebuild Logs" })
---     vim.keymap.set("n", "<leader>xc", "<cmd>XcodebuildToggleCodeCoverage<cr>", { desc = "Toggle Code Coverage" })
---     vim.keymap.set("n", "<leader>xC", "<cmd>XcodebuildShowCodeCoverageReport<cr>", { desc = "Show Code Coverage Report" })
---     vim.keymap.set("n", "<leader>xe", "<cmd>XcodebuildTestExplorerToggle<cr>", { desc = "Toggle Test Explorer" })
---     vim.keymap.set("n", "<leader>xs", "<cmd>XcodebuildFailingSnapshots<cr>", { desc = "Show Failing Snapshots" })
---
---     vim.keymap.set("n", "<leader>xd", "<cmd>XcodebuildSelectDevice<cr>", { desc = "Select Device" })
---     vim.keymap.set("n", "<leader>xp", "<cmd>XcodebuildSelectTestPlan<cr>", { desc = "Select Test Plan" })
---     vim.keymap.set("n", "<leader>xq", "<cmd>Telescope quickfix<cr>", { desc = "Show QuickFix List" })
---
---     vim.keymap.set("n", "<leader>xx", "<cmd>XcodebuildQuickfixLine<cr>", { desc = "Quickfix Line" })
---     vim.keymap.set("n", "<leader>xa", "<cmd>XcodebuildCodeActions<cr>", { desc = "Show Code Actions" })
---   end,
--- }