moved config files to single location

nvim/lua/lilJ/completions.lua

@@ -0,0 +1,63 @@
+local luasnip = require "luasnip"
+luasnip.config.setup {
+    history = false,
+    updateevents = "TextChanged,TextChangedI",
+}
+
+local lspkind = require "lspkind"
+lspkind.init {}
+
+local cmp = require "cmp"
+cmp.setup {
+    sources = {
+        { name = "nvim_lsp" },
+        { name = "path" },
+        { name = "buffer" },
+    },
+    completion = { completeopt = "menu, menuone, noinsert, noselect" },
+
+    -- No, but seriously. Please read `:help ins-completion`, it is really good!
+    mapping = cmp.mapping.preset.insert {
+        ["<C-n>"] = cmp.mapping.select_next_item(),
+        ["<C-p>"] = cmp.mapping.select_prev_item(),
+
+        ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+        ["<C-f>"] = cmp.mapping.scroll_docs(4),
+
+        ["<C-y>"] = cmp.mapping.confirm { select = true },
+
+        ["<C-Space>"] = cmp.mapping.complete {},
+
+        -- Think of <c-l> as moving to the right of your snippet expansion.
+        --  So if you have a snippet that's like:
+        --  function $name($args)
+        --    $body
+        --  end
+        --
+        -- <c-l> will move you to the right of each of the expansion locations.
+        -- <c-h> is similar, except moving you backwards.
+        ["<C-l>"] = cmp.mapping(function()
+            if luasnip.expand_or_locally_jumpable() then
+                luasnip.expand_or_jump()
+            end
+        end, { "i", "s" }),
+        ["<C-h>"] = cmp.mapping(function()
+            if luasnip.locally_jumpable(-1) then
+                luasnip.jump(-1)
+            end
+        end, { "i", "s" }),
+    },
+
+    snippet = {
+        expand = function(args)
+            require("luasnip").lsp_expand(args.body)
+        end,
+    },
+}
+
+cmp.setup.filetype({ "sql" }, {
+    sources = {
+        { name = "vim-dadbod-completion" },
+        { name = "buffer" },
+    },
+})

nvim/lua/lilJ/health.lua

@@ -0,0 +1,52 @@
+--[[
+--
+-- This file is not required for your own configuration,
+-- but helps people determine if their system is setup correctly.
+--
+--]]
+
+local check_version = function()
+	local verstr = string.format("%s.%s.%s", vim.version().major, vim.version().minor, vim.version().patch)
+	if not vim.version.cmp then
+		vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
+		return
+	end
+
+	if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
+		vim.health.ok(string.format("Neovim version is: '%s'", verstr))
+	else
+		vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
+	end
+end
+
+local check_external_reqs = function()
+	-- Basic utils: `git`, `make`, `unzip`
+	for _, exe in ipairs({ "git", "make", "unzip", "rg" }) do
+		local is_executable = vim.fn.executable(exe) == 1
+		if is_executable then
+			vim.health.ok(string.format("Found executable: '%s'", exe))
+		else
+			vim.health.warn(string.format("Could not find executable: '%s'", exe))
+		end
+	end
+
+	return true
+end
+
+return {
+	check = function()
+		vim.health.start("kickstart.nvim")
+
+		vim.health.info([[NOTE: Not every warning is a 'must-fix' in `:checkhealth`
+
+  Fix only warnings for plugins and languages you intend to use.
+    Mason will give warnings for languages that are not installed.
+    You do not need to install, unless you want to use those languages!]])
+
+		local uv = vim.uv or vim.loop
+		vim.health.info("System Information: " .. vim.inspect(uv.os_uname()))
+
+		check_version()
+		check_external_reqs()
+	end,
+}

nvim/lua/lilJ/plugins/catppuccin.lua

@@ -0,0 +1,15 @@
+return {
+    "catppuccin/nvim",
+    name = "catpuccin",
+    priority = 1000,
+    init = function()
+        require("catppuccin").setup {
+            transparent_background = true,
+        }
+        vim.cmd.colorscheme "catppuccin"
+
+        vim.cmd.hi "Comment gui=none"
+        vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+        vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+    end,
+}

nvim/lua/lilJ/plugins/comment.lua

@@ -0,0 +1,4 @@
+return {
+    "numToStr/Comment.nvim",
+    opts = {},
+}

nvim/lua/lilJ/plugins/completions.lua

@@ -0,0 +1,27 @@
+return {
+    "hrsh7th/nvim-cmp",
+    event = "InsertEnter",
+    dependencies = {
+        "onsails/lspkind.nvim",
+        "hrsh7th/cmp-nvim-lsp",
+        "hrsh7th/cmp-path",
+        "hrsh7th/cmp-buffer",
+        {
+            "L3MON4D3/LuaSnip",
+            build = "make install_jsregexp",
+            dependencies = {
+                --    https://github.com/rafamadriz/friendly-snippets
+                {
+                    "rafamadriz/friendly-snippets",
+                    config = function()
+                        require("luasnip.loaders.from_vscode").lazy_load()
+                    end,
+                },
+            },
+        },
+        "saadparwaiz1/cmp_luasnip",
+    },
+    config = function()
+        require "lilJ.completions"
+    end,
+}

nvim/lua/lilJ/plugins/conform.lua

@@ -0,0 +1,18 @@
+return {
+	"stevearc/conform.nvim",
+	opts = {
+		notify_on_error = false,
+		format_on_save = function(bufnr)
+		local disable_filetypes = {}
+			return {
+				timeout_ms = 500,
+				lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
+			}
+		end,
+		formatters_by_ft = {
+			c = { "clang-format" },
+			go = { "gofumpt", "goimports_reviser" },
+		    lua = { "stylua" },
+		},
+	},
+}

nvim/lua/lilJ/plugins/dadbod.lua

@@ -0,0 +1,5 @@
+return {
+    "tpope/vim-dadbod",
+    "kristijanhusak/vim-dadbod-completion",
+    "kristijanhusak/vim-dadbod-ui",
+}

nvim/lua/lilJ/plugins/debug.lua

@@ -0,0 +1,81 @@
+-- debug.lua
+--
+-- Shows how to use the DAP plugin to debug your code.
+--
+-- Primarily focused on configuring the debugger for Go, but can
+-- be extended to other languages as well. That's why it's called
+-- kickstart.nvim and not kitchen-sink.nvim ;)
+
+return {
+    "mfussenegger/nvim-dap",
+    dependencies = {
+        "rcarriga/nvim-dap-ui",
+        "nvim-neotest/nvim-nio",
+        "williamboman/mason.nvim",
+        "jay-babu/mason-nvim-dap.nvim",
+
+        -- GO DEBUG
+        "leoluz/nvim-dap-go",
+    },
+    config = function()
+        local dap = require "dap"
+        local dapui = require "dapui"
+
+        require("mason-nvim-dap").setup {
+            -- Makes a best effort to setup the various debuggers with
+            -- reasonable debug configurations
+            automatic_setup = true,
+
+            automatic_installation = true,
+
+            -- You can provide additional configuration to the handlers,
+            -- see mason-nvim-dap README for more information
+            handlers = {},
+
+            -- You'll need to check that you have the required things installed
+            -- online, please don't ask me how to install them :)
+            ensure_installed = {
+                -- Update this to ensure that you have the debuggers for the langs you want
+                "delve",
+            },
+        }
+
+        -- Basic debugging keymaps, feel free to change to your liking!
+        vim.keymap.set("n", "<F5>", dap.continue, { desc = "Debug: Start/Continue" })
+        vim.keymap.set("n", "<F1>", dap.step_into, { desc = "Debug: Step Into" })
+        vim.keymap.set("n", "<F2>", dap.step_over, { desc = "Debug: Step Over" })
+        vim.keymap.set("n", "<F3>", dap.step_out, { desc = "Debug: Step Out" })
+        vim.keymap.set("n", "<leader>b", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })
+        vim.keymap.set("n", "<leader>B", function()
+            dap.set_breakpoint(vim.fn.input "Breakpoint condition: ")
+        end, { desc = "Debug: Set Breakpoint" })
+
+        -- Dap UI setup
+        -- For more information, see |:help nvim-dap-ui|
+        dapui.setup {
+            icons = { expanded = "▾", collapsed = "▸", current_frame = "*" },
+            controls = {
+                icons = {
+                    pause = "⏸",
+                    play = "▶",
+                    step_into = "⏎",
+                    step_over = "⏭",
+                    step_out = "⏮",
+                    step_back = "b",
+                    run_last = "▶▶",
+                    terminate = "⏹",
+                    disconnect = "⏏",
+                },
+            },
+        }
+
+        -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+        vim.keymap.set("n", "<F7>", dapui.toggle, { desc = "Debug: See last session result." })
+
+        dap.listeners.after.event_initialized["dapui_config"] = dapui.open
+        dap.listeners.before.event_terminated["dapui_config"] = dapui.close
+        dap.listeners.before.event_exited["dapui_config"] = dapui.close
+
+        require("dap-go").setup()
+    end,
+}

nvim/lua/lilJ/plugins/gitsigns.lua

@@ -0,0 +1,12 @@
+return {
+    "lewis6991/gitsigns.nvim",
+    opts = {
+        signs = {
+            add = { text = "+" },
+            change = { text = "~" },
+            delete = { text = "_" },
+            topdelete = { text = "‾" },
+            changedelete = { text = "~" },
+        },
+    },
+}

nvim/lua/lilJ/plugins/indent_line.lua

@@ -0,0 +1,10 @@
+return {
+    {
+        "lukas-reineke/indent-blankline.nvim",
+        main = "ibl",
+        opts = {
+            indent = { char = "┊" },
+            whitespace = { highlight = { "Whitespace", "NonText" } },
+        },
+    },
+}

nvim/lua/lilJ/plugins/lint.lua

@@ -0,0 +1,42 @@
+return {
+    {
+        "mfussenegger/nvim-lint",
+        event = { "BufReadPre", "BufNewFile" },
+        config = function()
+            local lint = require "lint"
+
+            lint.linters_by_ft = {
+                python = { "ruff", "mypy" },
+            }
+
+            -- To allow other plugins to add linters to require('lint').linters_by_ft,
+            -- instead set linters_by_ft like this:
+            -- lint.linters_by_ft = lint.linters_by_ft or {}
+            -- lint.linters_by_ft['markdown'] = { 'markdownlint' }
+            --
+            -- However, note that this will enable a set of default linters,
+            -- which will cause errors unless these tools are available:
+            -- {
+            --   dockerfile = { "hadolint" },
+            --   json = { "jsonlint" },
+            --   markdown = { "vale" },
+            --   text = { "vale" }
+            -- }
+            --
+            -- You can disable the default linters by setting their filetypes to nil:
+            -- lint.linters_by_ft['dockerfile'] = nil
+            -- lint.linters_by_ft['json'] = nil
+            -- lint.linters_by_ft['text'] = nil
+
+            -- Create autocommand which carries out the actual linting
+            -- on the specified events.
+            local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
+            vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
+                group = lint_augroup,
+                callback = function()
+                    require("lint").try_lint()
+                end,
+            })
+        end,
+    },
+}

nvim/lua/lilJ/plugins/lsp.lua

@@ -0,0 +1,143 @@
+return {
+    "neovim/nvim-lspconfig",
+
+    dependencies = {
+        "williamboman/mason.nvim",
+        "williamboman/mason-lspconfig.nvim",
+        "WhoIsSethDaniel/mason-tool-installer.nvim",
+
+        { "j-hui/fidget.nvim", opts = {} },
+
+        { "folke/neodev.nvim", opts = {} },
+
+        "b0o/SchemaStore.nvim",
+    },
+
+    config = function()
+        local capabilities = nil
+        if pcall(require, "cmp_nvim_lsp") then
+            capabilities = require("cmp_nvim_lsp").default_capabilities()
+        end
+
+        -- Enable the following language servers
+        local servers = {
+            clangd = {},
+            gopls = {
+                filetypes = { "go", "gomod", "gowork", "gotmpl" },
+            },
+            jsonls = {
+                settings = {
+                    json = {
+                        schemas = require("schemastore").json.schemas(),
+                        validate = { enable = true },
+                    },
+                },
+            },
+            pyright = {},
+            tsserver = {},
+            lua_ls = {
+                -- cmd = {...},
+                -- filetypes = { ...},
+                -- capabilities = {},
+                settings = {
+                    Lua = {
+                        completion = {
+                            callSnippet = "Replace",
+                        },
+                        -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+                        -- diagnostics = { disable = { 'missing-fields' } },
+                    },
+                },
+            },
+        }
+
+        require("mason").setup()
+
+        local ensure_installed = vim.tbl_keys(servers or {})
+        vim.list_extend(ensure_installed, {
+            "clang-format",
+            "gofumpt",
+            "goimports-reviser",
+            "mypy",
+            "prettier",
+            "ruff",
+            "stylua",
+        })
+        require("mason-tool-installer").setup { ensure_installed = ensure_installed }
+
+        require("mason-lspconfig").setup {
+            handlers = {
+                function(server_name)
+                    local server = servers[server_name] or {}
+                    server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {})
+                    require("lspconfig")[server_name].setup(server)
+                end,
+            },
+        }
+
+        vim.api.nvim_create_autocmd("LspAttach", {
+            group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }),
+            callback = function(event)
+                local map = function(keys, func, desc)
+                    vim.keymap.set("n", keys, func, { buffer = event.buf, desc = "LSP: " .. desc })
+                end
+
+                -- Jump to the definition of the word under your cursor.
+                --  This is where a variable was first declared, or where a function is defined, etc.
+                --  To jump back, press <C-t>.
+                map("gd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition")
+
+                -- Find references for the word under your cursor.
+                map("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
+
+                -- Jump to the implementation of the word under your cursor.
+                --  Useful when your language has ways of declaring types without an actual implementation.
+                map("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation")
+
+                -- Jump to the type of the word under your cursor.
+                --  Useful when you're not sure what type a variable is and you want to see
+                --  the definition of its *type*, not where it was *defined*.
+                map("<leader>D", require("telescope.builtin").lsp_type_definitions, "Type [D]efinition")
+
+                -- Fuzzy find all the symbols in your current document.
+                --  Symbols are things like variables, functions, types, etc.
+                map("<leader>ds", require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]ymbols")
+
+                -- Fuzzy find all the symbols in your current workspace.
+                --  Similar to document symbols, except searches over your entire project.
+                map("<leader>ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]ymbols")
+
+                -- Rename the variable under your cursor.
+                --  Most Language Servers support renaming across files, etc.
+                map("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
+
+                -- Execute a code action, usually your cursor needs to be on top of an error
+                -- or a suggestion from your LSP for this to activate.
+                map("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction")
+
+                -- Opens a popup that displays documentation about the word under your cursor
+                --  See `:help K` for why this keymap.
+                map("K", vim.lsp.buf.hover, "Hover Documentation")
+
+                -- WARN: This is not Goto Definition, this is Goto Declaration.
+                --  For example, in C this would take you to the header.
+                map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
+
+                -- The following two autocommands are used to highlight references of the
+                -- word under your cursor when your cursor rests there for a little while.
+                local client = vim.lsp.get_client_by_id(event.data.client_id)
+                if client and client.server_capabilities.documentHighlightProvider then
+                    vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
+                        buffer = event.buf,
+                        callback = vim.lsp.buf.document_highlight,
+                    })
+
+                    vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
+                        buffer = event.buf,
+                        callback = vim.lsp.buf.clear_references,
+                    })
+                end
+            end,
+        })
+    end,
+}

nvim/lua/lilJ/plugins/mini.lua

@@ -0,0 +1,29 @@
+return {
+    "echasnovski/mini.nvim",
+    config = function()
+        -- Better Around/Inside textobjects
+        --
+        -- Examples:
+        --  - va)  - [V]isually select [A]round [)]paren
+        --  - yinq - [Y]ank [I]nside [N]ext [']quote
+        --  - ci'  - [C]hange [I]nside [']quote
+        require("mini.ai").setup { n_lines = 500 }
+
+        -- Add/delete/replace surroundings (brackets, quotes, etc.)
+        --
+        -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
+        -- - sd'   - [S]urround [D]elete [']quotes
+        -- - sr)'  - [S]urround [R]eplace [)] [']
+        require("mini.surround").setup()
+
+        local statusline = require "mini.statusline"
+        statusline.setup { use_icons = vim.g.have_nerd_font }
+
+        ---@diagnostic disable-next-line: duplicate-set-field
+        statusline.section_location = function()
+            return "%2l:%-2v"
+        end
+
+        --  Check out: https://github.com/echasnovski/mini.nvim
+    end,
+}

nvim/lua/lilJ/plugins/telescope.lua

@@ -0,0 +1,24 @@
+return {
+    "nvim-telescope/telescope.nvim",
+    event = "VimEnter",
+    branch = "0.1.x",
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+        {
+            "nvim-telescope/telescope-fzf-native.nvim",
+
+            build = "make",
+
+            cond = function()
+                return vim.fn.executable "make" == 1
+            end,
+        },
+        { "nvim-telescope/telescope-ui-select.nvim" },
+
+        { "nvim-tree/nvim-web-devicons", enabled = vim.g.have_nerd_font },
+    },
+
+    config = function()
+        require "lilJ.telescope"
+    end,
+}

nvim/lua/lilJ/plugins/tmux-navigator.lua

@@ -0,0 +1,20 @@
+return {
+    "alexghergh/nvim-tmux-navigation",
+
+    lazy = false,
+
+    config = function()
+        local nvim_tmux_nav = require "nvim-tmux-navigation"
+
+        nvim_tmux_nav.setup {
+            disable_when_zoomed = true,
+        }
+
+        vim.keymap.set("n", "<C-h>", nvim_tmux_nav.NvimTmuxNavigateLeft)
+        vim.keymap.set("n", "<C-j>", nvim_tmux_nav.NvimTmuxNavigateDown)
+        vim.keymap.set("n", "<C-k>", nvim_tmux_nav.NvimTmuxNavigateUp)
+        vim.keymap.set("n", "<C-l>", nvim_tmux_nav.NvimTmuxNavigateRight)
+        vim.keymap.set("n", "<C-space>", nvim_tmux_nav.NvimTmuxNavigateLastActive)
+        vim.keymap.set("n", "<C-//>", nvim_tmux_nav.NvimTmuxNavigateNext)
+    end,
+}

nvim/lua/lilJ/plugins/todo-comments.lua

@@ -0,0 +1,6 @@
+return {
+    "folke/todo-comments.nvim",
+    event = "VimEnter",
+    dependencies = { "nvim-lua/plenary.nvim" },
+    opts = { signs = false },
+}

nvim/lua/lilJ/plugins/treesitter.lua

@@ -0,0 +1,20 @@
+return {
+    "nvim-treesitter/nvim-treesitter",
+    build = ":TSUpdate",
+    dependencies = {
+        "nvim-treesitter/nvim-treesitter-textobjects",
+    },
+    opts = {
+        ensure_installed = { "c", "go", "html", "javascript", "lua", "python" },
+        auto_install = true,
+        highlight = {
+            enable = true,
+            additional_vim_regex_highlighting = { "ruby" },
+        },
+        indent = { enable = true, disable = { "ruby" } },
+    },
+    config = function(_, opts)
+        ---@diagnostic disable-next-line: missing-fields
+        require("nvim-treesitter.configs").setup(opts)
+    end,
+}

nvim/lua/lilJ/telescope.lua

@@ -0,0 +1,68 @@
+-- Telescope is a fuzzy finder that comes with a lot of different things that
+-- it can fuzzy find! It's more than just a "file finder", it can search
+-- many different aspects of Neovim, your workspace, LSP, and more!
+--
+-- Two important keymaps to use while in Telescope are:
+--  - Insert mode: <c-/>
+--  - Normal mode: ?
+--
+-- This opens a window that shows you all of the keymaps for the current
+-- Telescope picker. This is really useful to discover what Telescope can
+-- do as well as how to actually do it!
+
+require("telescope").setup {
+    defaults = {
+        file_ignore_patterns = { ".git/", "node%_modules/.*" },
+        prompt_prefix = "🔭 ",
+        selection_caret = " ",
+        -- initial_mode = "normal",
+    },
+
+    extensions = {
+        ["ui-select"] = {
+            require("telescope.themes").get_dropdown(),
+        },
+        fzf = {},
+        wrap_results = true,
+    },
+}
+
+-- Enable Telescope extensions if they are installed
+pcall(require("telescope").load_extension, "fzf")
+pcall(require("telescope").load_extension, "ui-select")
+
+local builtin = require "telescope.builtin"
+
+vim.keymap.set("n", "<leader>sf", builtin.find_files, { desc = "[S]earch [F]iles" })
+vim.keymap.set("n", "<leader>sh", builtin.help_tags, { desc = "[S]earch [H]elp" })
+vim.keymap.set("n", "<leader>sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" })
+vim.keymap.set("n", "<leader>ss", builtin.builtin, { desc = "[S]earch [S]elect Telescope" })
+
+-- IDK how to make grep work on my machine... (skill issues tbh)
+vim.keymap.set("n", "<leader>sw", builtin.grep_string, { desc = "[S]earch current [W]ord" })
+vim.keymap.set("n", "<leader>sg", builtin.live_grep, { desc = "[S]earch by [G]rep" })
+
+vim.keymap.set("n", "<leader>sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" })
+vim.keymap.set("n", "<leader>sr", builtin.resume, { desc = "[S]earch [R]esume" })
+vim.keymap.set("n", "<leader>s.", builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
+vim.keymap.set("n", "<leader><leader>", builtin.buffers, { desc = "[ ] Find existing buffers" })
+
+-- Slightly advanced example of overriding default behavior and theme
+vim.keymap.set("n", "<leader>/", function()
+    builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown {
+        winblend = 50,
+        previewer = false,
+    })
+end, { desc = "[/] Fuzzily search in current buffer" })
+
+vim.keymap.set("n", "<leader>s/", function()
+    builtin.live_grep {
+        grep_open_files = true,
+        prompt_title = "Live Grep in Open Files",
+    }
+end, { desc = "[S]earch [/] in Open Files" })
+
+-- Shortcut for searching your Neovim configuration files
+vim.keymap.set("n", "<leader>sn", function()
+    builtin.find_files { cwd = vim.fn.stdpath "config" }
+end, { desc = "[S]earch [N]eovim files" })