added comment.nvim but need to fix visual mode

flake.lock

@@ -1293,11 +1293,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1771439456,
-        "narHash": "sha256-HtQgNJrjYvZdpqpPJddF+TxGCazNyxvA8umbDcjrxT8=",
+        "lastModified": 1771702014,
+        "narHash": "sha256-/P7uAp8q1xFhaw9Z+OG7lUK3wVz1Q/wreAyeiMyyjLI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f84d6f6cd5f17d594439710f40349ba7d0706f4b",
+        "rev": "cceb9213362e92c06b60b50c1e2877bc5fb95887",
         "type": "github"
       },
       "original": {

homes/modules/programs/neovim/init.lua

@@ -22,23 +22,35 @@ local function load_colors()
 	-- ensure the table has enough entries to avoid indexing issues
 	if #new_colors >= 18 then
 		colors = new_colors
-    require('base16-colorscheme').setup({
-      base00 = colors[17], base01 = colors[1], base02 = colors[3], base03 = colors[3],
-      base04 = colors[5], base05 = colors[8], base06 = colors[5], base07 = colors[8],
-      base08 = colors[18], base09 = colors[4], base0A = colors[11], base0B = colors[5],
-      base0C = colors[6], base0D = colors[7], base0E = colors[6], base0F = colors[16],
+		require("base16-colorscheme").setup({
+			base00 = colors[17],
+			base01 = colors[1],
+			base02 = colors[3],
+			base03 = colors[3],
+			base04 = colors[5],
+			base05 = colors[8],
+			base06 = colors[5],
+			base07 = colors[8],
+			base08 = colors[18],
+			base09 = colors[4],
+			base0A = colors[11],
+			base0B = colors[5],
+			base0C = colors[6],
+			base0D = colors[7],
+			base0E = colors[6],
+			base0F = colors[16],
 		})
 
 		-- set colors for blink.cmp's completion menu
-    vim.api.nvim_set_hl(0, 'BlinkCmpMenu', { bg = colors[17] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpMenuBorder', { bg = colors[17], fg = colors[13] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpMenuSelection', { bg = colors[15], fg = colors[17] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpScrollBarThumb', { bg = colors[18] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpKind', { bg = colors[17], fg = colors[14] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpLabel', { bg = colors[17], fg = colors[18] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpLabelMatch', { bg = colors[17], fg = colors[18] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpLabelDetail', { bg = colors[17], fg = colors[18] })
-    vim.api.nvim_set_hl(0, 'BlinkCmpLabelDescription', { bg = colors[17], fg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = colors[17] })
+		vim.api.nvim_set_hl(0, "BlinkCmpMenuBorder", { bg = colors[17], fg = colors[13] })
+		vim.api.nvim_set_hl(0, "BlinkCmpMenuSelection", { bg = colors[15], fg = colors[17] })
+		vim.api.nvim_set_hl(0, "BlinkCmpScrollBarThumb", { bg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpKind", { bg = colors[17], fg = colors[14] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabel", { bg = colors[17], fg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabelMatch", { bg = colors[17], fg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabelDetail", { bg = colors[17], fg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabelDescription", { bg = colors[17], fg = colors[18] })
 	else
 		print("Error: Not enough colors in file")
 	end
@@ -66,4 +78,3 @@ local function watch_colorscheme()
 end
 
 watch_colorscheme()
-

homes/modules/programs/neovim/lua/lsp/capabilities.lua

@@ -6,53 +6,60 @@ function M.on_attach(_, bufnr)
 
 	local nmap = function(keys, func, desc)
 		if desc then
-      desc = 'LSP: ' .. desc
+			desc = "LSP: " .. desc
 		end
 
-    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
+		vim.keymap.set("n", keys, func, { buffer = bufnr, desc = desc })
 	end
 
-  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
+	nmap("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
+	nmap("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction")
 
-  nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
+	nmap("gd", vim.lsp.buf.definition, "[G]oto [D]efinition")
 
 	-- NOTE: why are these functions that call the telescope builtin?
 	-- because otherwise they would load telescope eagerly when this is defined.
 	-- due to us using the on_require handler to make sure it is available.
-  if nixCats('general.telescope') then
-    nmap('gr', function() require('telescope.builtin').lsp_references() end, '[G]oto [R]eferences')
-    nmap('gI', function() require('telescope.builtin').lsp_implementations() end, '[G]oto [I]mplementation')
-    nmap('<leader>ds', function() require('telescope.builtin').lsp_document_symbols() end, '[D]ocument [S]ymbols')
-    nmap('<leader>ws', function() require('telescope.builtin').lsp_dynamic_workspace_symbols() end, '[W]orkspace [S]ymbols')
-    nmap('<leader>dd', "<cmd>Telescope diagnostics bufnr=0<CR>", '[D]ocument [D]iagnostics')
-    nmap('<leader>wd', "<cmd>Telescope diagnostics<CR>", '[W]orkspace [D]iagnostics')
+	if nixCats("general.telescope") then
+		nmap("gr", function()
+			require("telescope.builtin").lsp_references()
+		end, "[G]oto [R]eferences")
+		nmap("gI", function()
+			require("telescope.builtin").lsp_implementations()
+		end, "[G]oto [I]mplementation")
+		nmap("<leader>ds", function()
+			require("telescope.builtin").lsp_document_symbols()
+		end, "[D]ocument [S]ymbols")
+		nmap("<leader>ws", function()
+			require("telescope.builtin").lsp_dynamic_workspace_symbols()
+		end, "[W]orkspace [S]ymbols")
+		nmap("<leader>dd", "<cmd>Telescope diagnostics bufnr=0<CR>", "[D]ocument [D]iagnostics")
+		nmap("<leader>wd", "<cmd>Telescope diagnostics<CR>", "[W]orkspace [D]iagnostics")
 	end -- TODO: someone who knows the builtin versions of these to do instead help me out please.
 
-  nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
-  nmap('<leader>e', vim.diagnostic.open_float, 'Show [E]rror')
+	nmap("<leader>D", vim.lsp.buf.type_definition, "Type [D]efinition")
+	nmap("<leader>e", vim.diagnostic.open_float, "Show [E]rror")
 
 	-- See `:help K` for why this keymap
-  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+	nmap("K", vim.lsp.buf.hover, "Hover Documentation")
+	nmap("<C-k>", vim.lsp.buf.signature_help, "Signature Documentation")
 
 	-- Lesser used LSP functionality
-  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-  nmap('<leader>wl', function()
+	nmap("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
+	nmap("<leader>wa", vim.lsp.buf.add_workspace_folder, "[W]orkspace [A]dd Folder")
+	nmap("<leader>wr", vim.lsp.buf.remove_workspace_folder, "[W]orkspace [R]emove Folder")
+	nmap("<leader>wl", function()
 		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, '[W]orkspace [L]ist Folders')
+	end, "[W]orkspace [L]ist Folders")
 
 	-- Create a command `:Format` local to the LSP buffer
-  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
+	vim.api.nvim_buf_create_user_command(bufnr, "Format", function(_)
 		vim.lsp.buf.format()
-  end, { desc = 'Format current buffer with LSP' })
-
+	end, { desc = "Format current buffer with LSP" })
 end
 
 function M.get(server_name)
-  local capabilities = require('blink.cmp').get_lsp_capabilities()
+	local capabilities = require("blink.cmp").get_lsp_capabilities()
 
 	return capabilities
 end

homes/modules/programs/neovim/lua/lsp/completion.lua

@@ -7,42 +7,42 @@ return {
 		"blink.cmp",
 		event = { "InsertEnter", "CmdlineEnter" },
 		on_require = "blink",
-    load = function (name)
+		load = function(name)
 			vim.cmd.packadd(name)
 		end,
 		after = function(plugin)
-      local blink = require('blink.cmp')
+			local blink = require("blink.cmp")
 
 			blink.setup({
 				keymap = {
-	  preset = 'default',
+					preset = "default",
 				},
 
 				appearance = {
-	  nerd_font_variant = 'mono',
+					nerd_font_variant = "mono",
 				},
 
 				sources = {
-	  default = { 'lsp', 'path', 'snippets', 'buffer' },
+					default = { "lsp", "path", "snippets", "buffer" },
 					providers = {
 						lsp = {
-	      name = 'LSP',
-	      module = 'blink.cmp.sources.lsp',
+							name = "LSP",
+							module = "blink.cmp.sources.lsp",
 							enabled = true,
 						},
 						path = {
-	      name = 'Path',
-	      module = 'blink.cmp.sources.path',
+							name = "Path",
+							module = "blink.cmp.sources.path",
 							enabled = true,
 						},
 						snippets = {
-	      name = 'Snippets',
-	      module = 'blink.cmp.sources.snippets',
+							name = "Snippets",
+							module = "blink.cmp.sources.snippets",
 							enabled = true,
 						},
 						buffer = {
-	      name = 'Buffer',
-	      module = 'blink.cmp.sources.buffer',
+							name = "Buffer",
+							module = "blink.cmp.sources.buffer",
 							enabled = true,
 						},
 					},
@@ -56,14 +56,14 @@ return {
 					},
 
 					menu = {
-	    border = 'rounded',
+						border = "rounded",
 						max_height = 12,
 						scrolloff = 2,
 
 						draw = {
 							columns = {
-		{ "kind_icon", gap = 1, },
-	        { "label", "label_description", gap = 1, },
+								{ "kind_icon", gap = 1 },
+								{ "label", "label_description", gap = 1 },
 							},
 						},
 					},
@@ -71,7 +71,7 @@ return {
 					documentation = {
 						auto_show = false,
 						window = {
-	      border = 'rounded',
+							border = "rounded",
 						},
 					},
 				},
@@ -79,10 +79,10 @@ return {
 				signature = {
 					enabled = true,
 					window = {
-	    border = 'rounded',
+						border = "rounded",
 					},
 				},
 			})
-    end
+		end,
 	},
 }

homes/modules/programs/neovim/lua/lsp/init.lua

@@ -1,6 +1,6 @@
-require("lze").load {
-  { import = "lsp.completion", },
-}
+require("lze").load({
+	{ import = "lsp.completion" },
+})
 
 require("lsp.indentation")
 require("lsp.lsp")

homes/modules/programs/neovim/lua/lsp/lsp.lua

@@ -8,7 +8,7 @@ servers.lua_ls = {
 			},
 			signatureHelp = { enable = true },
 			diagnostics = {
-	globals = { 'nixCats', 'vim' },
+				globals = { "nixCats", "vim" },
 				-- disable = { 'missing-fields' },
 			},
 			workspace = {
@@ -67,7 +67,7 @@ local java_home = os.getenv("JAVA_HOME")
 servers.jdtls = {
 	settings = {
 		java = {
-      contentProvider = { preferred = 'fernflower' },
+			contentProvider = { preferred = "fernflower" },
 			configuration = {
 				runtimes = {
 					{
@@ -78,10 +78,10 @@ servers.jdtls = {
 						name = "OpenJDK 21",
 						path = os.getenv("OPENJDK_21"),
 					},
-	}
-      }
 				},
-  }
+			},
+		},
+	},
 }
 
 -- Taken from nixCats example:
@@ -90,14 +90,14 @@ servers.jdtls = {
 -- nvim-lspconfig, it would do the same thing.
 -- come to think of it, it might be better because then lspconfig doesnt have to be called before lsp attach?
 -- but you would still end up triggering on a FileType event anyway, so, it makes little difference.
-vim.api.nvim_create_autocmd('LspAttach', {
-  group = vim.api.nvim_create_augroup('nixCats-lsp-attach', { clear = true }),
+vim.api.nvim_create_autocmd("LspAttach", {
+	group = vim.api.nvim_create_augroup("nixCats-lsp-attach", { clear = true }),
 	callback = function(event)
-    require('lsp.capabilities').on_attach(vim.lsp.get_client_by_id(event.data.client_id), event.buf)
-  end
+		require("lsp.capabilities").on_attach(vim.lsp.get_client_by_id(event.data.client_id), event.buf)
+	end,
 })
 
-require("lze").load {
+require("lze").load({
 	{
 		"nvim-lspconfig",
 		event = "FileType",
@@ -105,7 +105,7 @@ require("lze").load {
 			-- Just register configs, don't enable yet
 			for server_name, cfg in pairs(servers) do
 				vim.lsp.config(server_name, {
-          capabilities = require('lsp.capabilities').get(server_name),
+					capabilities = require("lsp.capabilities").get(server_name),
 					settings = (cfg or {}).settings,
 					filetypes = (cfg or {}).filetypes,
 					cmd = (cfg or {}).cmd,
@@ -117,7 +117,7 @@ require("lze").load {
 			for server_name, cfg in pairs(servers) do
 				local filetypes = cfg.filetypes or vim.lsp.config[server_name].filetypes
 				if filetypes then
-          vim.api.nvim_create_autocmd('FileType', {
+					vim.api.nvim_create_autocmd("FileType", {
 						pattern = filetypes,
 						callback = function()
 							vim.lsp.enable(server_name)
@@ -127,4 +127,4 @@ require("lze").load {
 			end
 		end,
 	},
-}
+})

homes/modules/programs/neovim/lua/plugins/comment.lua

@@ -0,0 +1,23 @@
+return {
+	{
+		"comment.nvim",
+		event = { "BufReadPost", "BufNewFile" },
+		after = function(plugin)
+			require("Comment").setup({
+				toggler = {
+					line = "<leader>cc",
+					block = "<leader>bc",
+				},
+				opLeader = {
+					line = "<leader>c",
+					block = "<leader>b",
+				},
+				extra = {
+					above = "<leader>c0",
+					below = "<leader>bo",
+					eol = "<leader>cA",
+				},
+			})
+		end,
+	},
+}

homes/modules/programs/neovim/lua/plugins/dressing.lua

@@ -1,5 +1,5 @@
 return {
 	{
-    "dressing.nvim"
+		"dressing.nvim",
 	},
 }

homes/modules/programs/neovim/lua/plugins/format.lua

@@ -0,0 +1,33 @@
+-- docs -> https://github.com/stevearc/conform.nvim
+return {
+	{
+		"conform.nvim",
+		enabled = nixCats("format") or false,
+		keys = {
+			{ "<leader>p", desc = "Format File (pretty :3)" },
+		},
+		after = function(plugin)
+			local conform = require("conform")
+
+			conform.setup({
+				formatters_by_ft = {
+					lua = nixCats("lang.lua.format") and { "stylua" } or nil,
+					nix = nixCats("lang.nix.format") and { "nixfmt" } or nil,
+					rust = nixCats("lang.rust.format") and { "rustfmt", lsp_format = "fallback" } or nil,
+					haskell = nixCats("lang.haskell.format") and { "ormolu" } or nil,
+				},
+				format_on_save = {
+					timeout_ms = 500,
+				},
+			})
+
+			vim.keymap.set({ "n", "v" }, "<leader>p", function()
+				conform.format({
+					lsp_fallback = false,
+					async = false,
+					timeout_ms = 1000,
+				})
+			end, { desc = "Format File (pretty :3)" })
+		end,
+	},
+}

homes/modules/programs/neovim/lua/plugins/fyler.lua

@@ -3,9 +3,16 @@ return {
 		"fyler.nvim",
 		cmd = { "Fyler" },
 		keys = {
-      { "<leader>tf", function() return require('fyler').toggle({ kind = "split_right" }) end, mode = {"n"}, desc = 'Open [F]yler' },
+			{
+				"<leader>tf",
+				function()
+					return require("fyler").toggle({ kind = "split_right" })
+				end,
+				mode = { "n" },
+				desc = "Open [F]yler",
 			},
-    load = function (name)
+		},
+		load = function(name)
 			vim.cmd.packadd(name)
 		end,
 		after = function(plugin)

homes/modules/programs/neovim/lua/plugins/init.lua

@@ -1,7 +1,9 @@
-require("lze").load {
-  { import = "plugins.dressing", },
-  { import = "plugins.telescope", },
-  { import = "plugins.treesitter", },
-  { import = "plugins.fyler", },
-  { import = "plugins.mini-hipatterns", },
-}
+require("lze").load({
+	{ import = "plugins.dressing" },
+	{ import = "plugins.telescope" },
+	{ import = "plugins.treesitter" },
+	{ import = "plugins.fyler" },
+	{ import = "plugins.mini-hipatterns" },
+	{ import = "plugins.format" },
+	{ import = "plugins.comment" },
+})

homes/modules/programs/neovim/lua/plugins/mini-hipatterns.lua

@@ -9,9 +9,9 @@ return {
 			---@param match string
 			---@return string
 			local hex_color_short = function(_, match)
-        local style = 'fg' -- 'fg' or 'bg', for extmark_opts_inline use 'fg'
+				local style = "fg" -- 'fg' or 'bg', for extmark_opts_inline use 'fg'
 				local r, g, b = match:sub(2, 2), match:sub(3, 3), match:sub(4, 4)
-        local hex = string.format('#%s%s%s%s%s%s', r, r, g, g, b, b)
+				local hex = string.format("#%s%s%s%s%s%s", r, r, g, g, b, b)
 				return hipatterns.compute_hex_color_group(hex, style)
 			end
 
@@ -20,9 +20,9 @@ return {
 			---@param match string
 			---@return string
 			local hex_color_alpha = function(_, match)
-        local style = 'fg' -- 'fg' or 'bg', for extmark_opts_inline use 'fg'
+				local style = "fg" -- 'fg' or 'bg', for extmark_opts_inline use 'fg'
 				local r, g, b = match:sub(2, 3), match:sub(4, 5), match:sub(6, 7)
-        local hex = string.format('#%s%s%s', r, g, b)
+				local hex = string.format("#%s%s%s", r, g, b)
 				return hipatterns.compute_hex_color_group(hex, style)
 			end
 
@@ -32,8 +32,8 @@ return {
 			---@return table
 			local extmark_opts_inline = function(_, _, data)
 				return {
-          virt_text = { { '󰧞', data.hl_group } },
-          virt_text_pos = 'inline',
+					virt_text = { { "󰧞", data.hl_group } },
+					virt_text_pos = "inline",
 					right_gravity = false,
 				}
 			end
@@ -44,8 +44,8 @@ return {
 			---@return table
 			local extmark_opts_inline_alpha = function(_, _, data)
 				return {
-          virt_text = { { '󱡓', data.hl_group } },
-          virt_text_pos = 'inline',
+					virt_text = { { "󱡓", data.hl_group } },
+					virt_text_pos = "inline",
 					right_gravity = false,
 				}
 			end
@@ -55,7 +55,7 @@ return {
 					-- #rrggbb
 					hex_color = hipatterns.gen_highlighter.hex_color({
 						style = "inline",
-            inline_text = '󰧞',
+						inline_text = "󰧞",
 					}),
 					-- #rgb
 					hex_color_short = {

homes/modules/programs/neovim/lua/plugins/telescope.lua

@@ -3,14 +3,56 @@ return {
 		"telescope.nvim",
 		cmd = { "Telescope" },
 		keys = {
-      { "<leader>f", function() return require('telescope.builtin').find_files() end, mode = {"n"}, desc = 'Telescope search [F]iles' },
-      { "<leader>tr", function() return require('telescope.builtin').oldfiles() end, mode = {"n"}, desc = '[T]elescope search [R]ecent files' },
-      { "<leader>ts", function() return require('telescope.builtin').live_grep() end, mode = {"n"}, desc = '[T]elescope [S]earch cwd with grep' },
-      { "<leader>tw", function() return require('telescope.builtin').grep_string() end, mode = {"n"}, desc = '[T]elescope search current [W]ord' },
-      { "<leader>tk", function() return require('telescope.builtin').keymaps() end, mode = {"n"}, desc = '[T]elescope search [K]eymaps' },
-      { "<leader>tb", function() return require('telescope.builtin').buffers() end, mode = {"n"}, desc = '[T]elescope search [B]uffers' },
+			{
+				"<leader>f",
+				function()
+					return require("telescope.builtin").find_files()
+				end,
+				mode = { "n" },
+				desc = "Telescope search [F]iles",
 			},
-    load = function (name)
+			{
+				"<leader>tr",
+				function()
+					return require("telescope.builtin").oldfiles()
+				end,
+				mode = { "n" },
+				desc = "[T]elescope search [R]ecent files",
+			},
+			{
+				"<leader>ts",
+				function()
+					return require("telescope.builtin").live_grep()
+				end,
+				mode = { "n" },
+				desc = "[T]elescope [S]earch cwd with grep",
+			},
+			{
+				"<leader>tw",
+				function()
+					return require("telescope.builtin").grep_string()
+				end,
+				mode = { "n" },
+				desc = "[T]elescope search current [W]ord",
+			},
+			{
+				"<leader>tk",
+				function()
+					return require("telescope.builtin").keymaps()
+				end,
+				mode = { "n" },
+				desc = "[T]elescope search [K]eymaps",
+			},
+			{
+				"<leader>tb",
+				function()
+					return require("telescope.builtin").buffers()
+				end,
+				mode = { "n" },
+				desc = "[T]elescope search [B]uffers",
+			},
+		},
+		load = function(name)
 			vim.cmd.packadd(name)
 			vim.cmd.packadd("telescope-fzf-native.nvim")
 		end,
@@ -18,17 +60,17 @@ return {
 			local telescope = require("telescope")
 			local actions = require("telescope.actions")
 
-      telescope.setup {
+			telescope.setup({
 				defaults = {
 					mappings = {
 						i = {
 							["<C-k>"] = actions.move_selection_previous, -- move to prev result
 							["<C-j>"] = actions.move_selection_next, -- move to next result
-	      ["<C-q>"] = actions.send_selected_to_qflist + actions.open_qflist
-	    }
-	  }
-	}
-      }
+							["<C-q>"] = actions.send_selected_to_qflist + actions.open_qflist,
+						},
+					},
+				},
+			})
 
 			pcall(telescope.load_extension, "fzf")
 		end,

homes/modules/programs/neovim/lua/plugins/treesitter.lua

@@ -5,7 +5,7 @@ return {
 	{
 		"nvim-treesitter",
 		lazy = false,
-    after = function (plugin)
+		after = function(plugin)
 			--@param buf integer
 			--@param language string
 			local function treesitter_try_attach(buf, language)
@@ -58,33 +58,33 @@ return {
 			vim.g.no_plugin_maps = true
 		end,
 		after = function(plugin)
-      require("nvim-treesitter-textobjects").setup {
+			require("nvim-treesitter-textobjects").setup({
 				select = {
 					lookahead = true,
 					selection_modes = {
-	    ['@parameter.outer'] = 'v', -- charwise
-	    ['@function.outer'] = 'V', -- linewise
+						["@parameter.outer"] = "v", -- charwise
+						["@function.outer"] = "V", -- linewise
 					},
 					include_surrounding_whitespace = false,
 				},
-      }
+			})
 
 			-- keymaps
 			vim.keymap.set({ "x", "o" }, "am", function()
-        require "nvim-treesitter-textobjects.select".select_textobject("@function.outer", "textobjects")
+				require("nvim-treesitter-textobjects.select").select_textobject("@function.outer", "textobjects")
 			end)
 			vim.keymap.set({ "x", "o" }, "im", function()
-        require "nvim-treesitter-textobjects.select".select_textobject("@function.inner", "textobjects")
+				require("nvim-treesitter-textobjects.select").select_textobject("@function.inner", "textobjects")
 			end)
 			vim.keymap.set({ "x", "o" }, "ac", function()
-        require "nvim-treesitter-textobjects.select".select_textobject("@class.outer", "textobjects")
+				require("nvim-treesitter-textobjects.select").select_textobject("@class.outer", "textobjects")
 			end)
 			vim.keymap.set({ "x", "o" }, "ic", function()
-        require "nvim-treesitter-textobjects.select".select_textobject("@class.inner", "textobjects")
+				require("nvim-treesitter-textobjects.select").select_textobject("@class.inner", "textobjects")
 			end)
 			-- You can also use captures from other query groups like `locals.scm`
 			vim.keymap.set({ "x", "o" }, "as", function()
-        require "nvim-treesitter-textobjects.select".select_textobject("@local.scope", "locals")
+				require("nvim-treesitter-textobjects.select").select_textobject("@local.scope", "locals")
 			end)
 
 			-- NOTE: for more textobjects options, see the following link.

homes/modules/programs/neovim/nixcats.nix

@@ -1,14 +1,17 @@
+# TODO: look into changing to this:
+# https://github.com/BirdeeHub/nix-wrapper-modules
 {
   inputs,
   spkgs,
   mpkgs,
   ...
-}: let
-  inherit
-    (inputs.nixcats)
+}:
+let
+  inherit (inputs.nixcats)
     utils
     ;
-in {
+in
+{
   imports = [
     inputs.nixcats.homeModule
   ];
@@ -23,22 +26,21 @@ in {
       # add any plugins in inputs named "plugins-pluginName" to pkgs.neovimPlugins
       # It will not apply to overall system, just nixCats.
       addOverlays =
-        /*
-        (import ./overlays inputs) ++
-        */
+        # (import ./overlays inputs) ++
         [
           (utils.standardPluginOverlay inputs)
         ];
       # see the packageDefinitions below.
       # This says which of those to install.
-      packageNames = ["auroranvim"];
+      packageNames = [ "auroranvim" ];
 
       luaPath = "${./.}";
 
       # the .replace vs .merge options are for modules based on existing configurations,
       # they refer to how multiple categoryDefinitions get merged together by the module.
       # for useage of this section, refer to :h nixCats.flake.outputs.categories
-      categoryDefinitions.replace = {
+      categoryDefinitions.replace =
+        {
           pkgs,
           settings,
           categories,
@@ -46,41 +48,49 @@ in {
           name,
           mkNvimPlugin,
           ...
-      } @ packageDef: {
-        lspsAndRuntimeDeps = {
-          general = with pkgs; [
+        }@packageDef:
+        {
+          lspsAndRuntimeDeps = with pkgs; {
+            general = [
               ripgrep
               fd
             ];
-          treesitter = with pkgs; [
+            treesitter = [
               tree-sitter
             ];
-          lang = with pkgs; {
-            lua = [
-              lua-language-server
-            ];
-            nix = [
+            lang = {
+              lua = {
+                lsp = [ lua-language-server ];
+                format = [ stylua ];
+              };
+              nix = {
+                lsp = [
                   nil
-              nix-doc
+                  nix-doc # TODO: i forgot what this is for
                 ];
-            rust = with pkgs; [
+                format = [ nixfmt ];
+              };
+              rust = {
+                lsp = [
                   cargo
                   mpkgs.rust-analyzer
                 ];
-            zig = with pkgs; [
+                format = [ rustfmt ];
+              };
+              zig = [
                 spkgs.zls # FIX: using spkgs version as zls is broken rn ;-;
               ];
-            elixir = with pkgs; [
+              elixir = [
                 elixir-ls
               ];
-            gleam = with pkgs; [
+              gleam = [
                 gleam
               ];
-            haskell = with pkgs; [
-              haskell-language-server
-              ormolu
-            ];
-            java = with pkgs; [
+              haskell = {
+                lsp = [ haskell-language-server ];
+                format = [ ormolu ];
+              };
+              java = [
                 jdt-language-server
                 javaPackages.compiler.openjdk17
                 javaPackages.compiler.openjdk21
@@ -88,8 +98,8 @@ in {
             };
           };
 
-        startupPlugins = {
-          general = with pkgs.vimPlugins; [
+          startupPlugins = with pkgs.vimPlugins; {
+            general = [
               lze
               plenary-nvim
               nvim-notify
@@ -97,33 +107,34 @@ in {
               base16-nvim
               mini-nvim
             ];
-          treesitter = with pkgs.vimPlugins; [
+            treesitter = [
               nvim-treesitter-textobjects
               nvim-treesitter.withAllGrammars
             ];
           };
-        optionalPlugins = {
-          general = with pkgs.vimPlugins; [
+
+          optionalPlugins = with pkgs.vimPlugins; {
+            general = [
             ];
-          ui = with pkgs.vimPlugins; [
+            ui = [
               dressing-nvim
             ];
-          qol = with pkgs.vimPlugins; [
+            qol = [
               undotree
               mini-hipatterns
             ];
-          telescope = with pkgs.vimPlugins; [
+            telescope = [
               telescope-nvim
               telescope-fzf-native-nvim
               telescope-ui-select-nvim
             ];
-          fyler = with pkgs.vimPlugins; [
+            fyler = [
               fyler-nvim
             ];
-          lsp = with pkgs.vimPlugins; [
+            lsp = [
               nvim-lspconfig
             ];
-          completion = with pkgs.vimPlugins; [
+            completion = [
               blink-cmp
               nvim-cmp
               luasnip
@@ -138,7 +149,13 @@ in {
               cmp-cmdline-history
               lspkind-nvim
             ];
-          lang = with pkgs.vimPlugins; {
+            format = [
+              conform-nvim
+            ];
+            comment = [
+              comment-nvim
+            ];
+            lang = {
               java = [
                 nvim-jdtls
               ];
@@ -152,23 +169,25 @@ in {
               # libgit2
             ];
           };
+
           environmentVariables = {
             lang = {
-            rust = {
+              rust.lsp = {
                 # it literally won't see the rust-analyzer provided to it
                 # if you don't use an envrionment variable to tell it
-              RUST_ANALYZER_CMD = "${pkgs.rust-analyzer}/bin/rust-analyzer";
+                RUST_ANALYZER_CMD = "${mpkgs.rust-analyzer}/bin/rust-analyzer";
               };
-            elixir = {
+              elixir.lsp = {
                 ELIXIR_LS_CMD = "${pkgs.elixir-ls}/scripts/language_server.sh";
               };
-            java = {
+              java.lsp = {
                 JAVA_HOME = "${pkgs.javaPackages.compiler.openjdk17}";
                 OPENJDK_17 = "${pkgs.javaPackages.compiler.openjdk17}";
                 OPENJDK_21 = "${pkgs.javaPackages.compiler.openjdk21}";
               };
             };
           };
+
           extraWrapperArgs = {
             test = [
               ''--set CATTESTVAR2 "It worked again!"''
@@ -182,11 +201,11 @@ in {
           # vim.g.python3_host_prog
           # or run from nvim terminal via :!<packagename>-python3
           extraPython3Packages = {
-          test = _: [];
+            test = _: [ ];
           };
           # populates $LUA_PATH and $LUA_CPATH
           extraLuaPackages = {
-          test = [(_: [])];
+            test = [ (_: [ ]) ];
           };
         };
 
@@ -194,14 +213,23 @@ in {
       packageDefinitions.replace = {
         # these are the names of your packages
         # you can include as many as you wish.
-        auroranvim = {pkgs, ...}: {
+        auroranvim =
+          { pkgs, ... }:
+          {
             # they contain a settings set defined above
             # see :help nixCats.flake.outputs.settings
             settings = {
               wrapRc = true;
               # IMPORTANT:
               # your alias may not conflict with your other packages.
-            aliases = ["auroravim" "auravim" "foxyvim" "avix" "fvix" "auim"];
+              aliases = [
+                "auroravim"
+                "auravim"
+                "foxyvim"
+                "avix"
+                "fvix"
+                "auim"
+              ];
             };
             # and a set of categories that you want
             # (and other information to pass to lua)
@@ -215,15 +243,29 @@ in {
               lsp = true;
               completion = true;
               treesitter = true;
+              format = true;
+              comment = true;
 
               lang = {
-              lua = true;
-              nix = true;
-              rust = true;
+                lua = {
+                  lsp = true;
+                  format = true;
+                };
+                nix = {
+                  lsp = true;
+                  format = true;
+                };
+                rust = {
+                  lsp = true;
+                  format = true;
+                };
                 zig = true;
                 elixir = true;
                 gleam = true;
-              haskell = true;
+                haskell = {
+                  lsp = true;
+                  format = true;
+                };
                 java = true;
               };
             };

hosts/arcturus/default.nix

@@ -23,6 +23,7 @@
 
   networking = {
     useNetworkd = false;
+    networkmanager.enable = false;
     useDHCP = false;
 
     nftables.enable = true;
@@ -92,6 +93,7 @@
           Gateway = "10.16.1.1";
           DNS = ["10.16.1.1"];
           LinkLocalAddressing = "no";
+          DHCP = "no";
         };
         linkConfig.RequiredForOnline = "routable";
       };

snow.nix

@@ -75,11 +75,11 @@ cerulean.mkNexus ./. (self: {
                     ];
 
                     volumes = [
-                      {
-                        image = "/var/lib/microvms/home-assistant/data.img";
-                        mountPoint = "/var/lib/hass";
-                        size = 16384; # 16GB
-                      }
+                      #{
+                      #image = "/var/lib/microvms/home-assistant/data.img";
+                      #mountPoint = "/var/lib/hass";
+                      #autoCreate = false;
+                      #}
                     ];
                   };
 

vms/home-assistant/default.nix

@@ -2,7 +2,7 @@
 {
   services.home-assistant = {
     enable = true;
-    configDir = "/var/lib/hass";
+    configDir = "/var/lib/hass/hass";
 
     # disables config generation, i don't wanna configure home assistant
     # through nix at the moment
@@ -16,15 +16,32 @@
 
     extraPackages = python3Packages: with python3Packages; [
       getmac
+      aiohue
+      numpy
+      aiodhcpwatcher
+      async-upnp-client
+      gtts
+      numpy
+      plexapi
+      pyipp
+      paho-mqtt
+      pyturbojpeg
     ];
   };
 
-  systemd.tmpfiles.rules = [
   # configures the config directory to be mounted
-    # correclty with the right permissions
-    "z /var/lib/hass 0755 hass hass -"
-    "z /var/lib/hass/lost+found 0755 hass hass -"
-  ];
+  # correctly with the right permissions
+  systemd.services.hass-permissions = {
+    wantedBy = [ "multi-user.target" ];
+    after = [ "var-lib-hass.mount" ];
+    requires = [ "var-lib-hass.mount" ];
+    before = [ "home-assistant.service" ];
+    serviceConfig = {
+      Type = "oneshot";
+      ExecStart = "${pkgs.bash}/bin/bash -c 'mkdir -p /var/lib/hass/hass && chown hass:hass /var/lib/hass/hass'";
+      RemainAfterExit = true;
+    };
+  };
 
   networking = {
     nftables.enable = true;