feat: Centralize and cleanup

.gitignore

@@ -1,3 +1,23 @@
-.elixir-tools
+# Elixir tools (auto-generated)
+.elixir-tools/
+lua/plugins/.elixir-tools/
 erl_crash.dump
-lazy-lock.json
+
+# Neovim generated
+plugin/packer_compiled.lua
+spell/
+
+# Caches
+.aider.tags.cache.v4/
+.luac
+*.swp
+*.swo
+*~
+tags
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Profiling output
+profile.json

.pre-commit-config.yaml

@@ -39,7 +39,7 @@ repos:
     hooks:
       - id: detect-secrets
         args: [--baseline, .secrets.baseline]
-        exclude: package.lock.json
+        exclude: (package.lock.json|lazy-lock.json)
 
   # Neovim config validation
   - repo: local

init.lua

@@ -1,5 +1,6 @@
 -- set leader key to space (must be before lazy setup)
 vim.g.mapleader = " "
+vim.g.maplocalleader = ","
 
 require("config.options")
 require("config.lazy")

install.sh

@@ -170,8 +170,8 @@ install_dependencies() {
             sudo apt install -y gh
 
             log_info "Installing GitLab CLI..."
-            GLAB_VERSION=$(curl -s "https://api.github.com/repos/profclems/glab/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
-            curl -Lo glab.tar.gz "https://github.com/profclems/glab/releases/latest/download/glab_${GLAB_VERSION}_Linux_x86_64.tar.gz"
+            GLAB_VERSION=$(curl -s "https://api.github.com/repos/gitlab-org/cli/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
+            curl -Lo glab.tar.gz "https://github.com/gitlab-org/cli/releases/latest/download/glab_${GLAB_VERSION}_Linux_x86_64.tar.gz"
             tar xf glab.tar.gz bin/glab
             sudo install bin/glab /usr/local/bin
             rm -rf glab.tar.gz bin

lazy-lock.json

@@ -0,0 +1,88 @@
+{
+  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
+  "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
+  "aerial.nvim": { "branch": "master", "commit": "645d108a5242ec7b378cbe643eb6d04d4223f034" },
+  "amp.nvim": { "branch": "main", "commit": "3b9ad5ef0328de1b35cc9bfa723a37db5daf9434" },
+  "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
+  "blink.compat": { "branch": "main", "commit": "1454f14a8d855a578ceeba77c62538fa1459a67c" },
+  "catppuccin": { "branch": "main", "commit": "a7788416689dbefea659d9e9415c87926b0ba5d8" },
+  "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
+  "codecompanion.nvim": { "branch": "main", "commit": "66533e86c8948be78096550e0f75d46930c4e296" },
+  "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "elixir-tools.nvim": { "branch": "main", "commit": "b51b48edc668924a6b2f6610f9a0aff34741d20e" },
+  "emoji.nvim": { "branch": "main", "commit": "a79e45d35853bb6446638f4d74c6f778ddebd8e3" },
+  "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "fzf-lua": { "branch": "main", "commit": "c9e7b7bfbd01f949164988ee1684035468e1995c" },
+  "gitlab.nvim": { "branch": "main", "commit": "19c688309a8a101d7506c626ba12a16ac93baf21" },
+  "gitlab.vim": { "branch": "main", "commit": "cb750761acf8dc17f4f1051d1b4ade6c0aaeb432" },
+  "gitsigns.nvim": { "branch": "main", "commit": "50c205548d8b037b7ff6378fca6d21146f0b6161" },
+  "go.nvim": { "branch": "master", "commit": "fe8e1de03157f8a68e9e5b819409368ce33aeb87" },
+  "guihua.lua": { "branch": "master", "commit": "fdca486468a5d94676477917872767b5e67a2b4c" },
+  "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
+  "kulala.nvim": { "branch": "main", "commit": "6656c9d332735ca6a27725e0fb45a1715c4372d9" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "af7e4074d85d785cf6614352ba9ad3b28a1f8a56" },
+  "lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "037398b9ce4a53ba48d5f94765c641a1fd16d906" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "mini.nvim": { "branch": "main", "commit": "af5f75c9ce572a4d1f0c77d6fb4ea764d16c1b3c" },
+  "neoscroll.nvim": { "branch": "master", "commit": "c8d29979cb0cb3a2437a8e0ae683fd82f340d3b8" },
+  "neotest": { "branch": "master", "commit": "72bc8f1ec62a590fb47368c81f89610e0f353e28" },
+  "neotest-elixir": { "branch": "master", "commit": "a242aebeaa6997c1c149138ff77f6cacbe33b6fc" },
+  "neotest-go": { "branch": "main", "commit": "59b50505053f9c45a9febb79e11a56206c3e3901" },
+  "neotest-jest": { "branch": "main", "commit": "3f0cc2cff1ee05394081805c622dc2551b54d8c4" },
+  "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" },
+  "neotest-rust": { "branch": "main", "commit": "2c9941d4a358839918fac21d20fc8fef0e1ad05f" },
+  "neovim-tips": { "branch": "master", "commit": "a43725396a81bd73afcb6a13a94ea3c842bad32f" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "c8c2c19436d33165ec34fa90c975bc0a739fe3fb" },
+  "nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" },
+  "nvim-dap": { "branch": "master", "commit": "4f5deb110d9ff8994d96c21df95e2271d11214f9" },
+  "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
+  "nvim-dap-ui": { "branch": "master", "commit": "f5b6673f374626515401c5bc51b005f784a4f252" },
+  "nvim-devdocs": { "branch": "master", "commit": "668e25f06da43c7b5e95c2419c9864076bb3bd9c" },
+  "nvim-jqx": { "branch": "master", "commit": "07393e80fa8097e82f9038fec05e948fe8a60fd1" },
+  "nvim-lint": { "branch": "master", "commit": "4b03656c09c1561f89b6aa0665c15d292ba9499d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "16812abf0e8d8175155f26143a8504e8253e92b0" },
+  "nvim-man": { "branch": "master", "commit": "7fe6b3b78c71c9ef834c49e3dcbd955f7ed5c6cb" },
+  "nvim-navic": { "branch": "master", "commit": "f5eba192f39b453675d115351808bd51276d9de5" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" },
+  "nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
+  "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
+  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
+  "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
+  "octo.nvim": { "branch": "master", "commit": "b51e52888e678441a266bfd5ae2dc0a02a21d67e" },
+  "overseer.nvim": { "branch": "master", "commit": "a2194447f4c5a1baf95139c5c7b539fa7b0d012f" },
+  "package-info.nvim": { "branch": "master", "commit": "52e407af634cd5d3add0dc916c517865850113a4" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "profile.nvim": { "branch": "master", "commit": "30433d7513f0d14665c1cfcea501c90f8a63e003" },
+  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
+  "refactoring.nvim": { "branch": "master", "commit": "6784b54587e6d8a6b9ea199318512170ffb9e418" },
+  "render-markdown.nvim": { "branch": "main", "commit": "e3c18ddd27a853f85a6f513a864cf4f2982b9f26" },
+  "smart-splits.nvim": { "branch": "master", "commit": "12426763591f06b865c20990d8423345ea96d44f" },
+  "smartcolumn.nvim": { "branch": "main", "commit": "b9cdbdf42f7ac5a659204cd5926017c7ff724a19" },
+  "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
+  "telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" },
+  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" },
+  "venv-selector.nvim": { "branch": "main", "commit": "42e8faadf9b819654f29eb1a785797a3a328f301" },
+  "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "07e92e22114cc5b1ba4938d99897d85b58e20475" },
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
+  "vim-table-mode": { "branch": "master", "commit": "bb025308a45c67c7c8f0763ba37bc2ee3f534df0" },
+  "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
+}

lua/config/keymaps.lua

@@ -1,9 +1,7 @@
 local keymap = vim.keymap -- for conciseness
 
 -- General Keymaps -------------------
-keymap.set("n", "<leader>l", ":Lazy<CR>", { desc = "Lazy" })
--- Removed: conflicts with snacks git keybindings
--- keymap.set("n", "<leader>gl", ":LazyGit<CR>", { desc = "LazyGit" })
+keymap.set("n", "<leader>L", ":Lazy<CR>", { desc = "Lazy" })
 keymap.set("n", "<leader>pm", ":Mason<CR>", { desc = "Mason" })
 
 keymap.set("n", "<leader>cw", ":%s/<C-r><C-w>//g<Left><Left>", { desc = "Change word" })
@@ -15,8 +13,8 @@ keymap.set("i", "jk", "<ESC>", { desc = "Exit insert mode with jk" })
 keymap.set("n", "x", '"_x')
 
 -- increment/decrement numbers
-keymap.set("n", "<leader>+", "<C-a>", { desc = "Increment number" }) -- increment
-keymap.set("n", "<leader>=", "<C-x>", { desc = "Decrement number" }) -- decrement (changed from <leader>- to avoid conflict)
+keymap.set("n", "<leader>+", "<C-a>", { desc = "Increment number" })
+keymap.set("n", "<leader>=", "<C-x>", { desc = "Decrement number" })
 
 -- windows
 keymap.set("n", "<leader>ww", "<C-W>p", { desc = "Other window", remap = true })

lua/config/lazy.lua

@@ -1,5 +1,5 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   vim.fn.system({
     "git",
     "clone",

lua/config/options.lua

@@ -21,12 +21,9 @@ opt.smartcase = true -- if you include mixed case in your search, assumes you wa
 opt.cursorline = true -- highlight the current cursor line
 
 -- appearance
--- turn on termguicolors for nightfly colorscheme to work
--- (have to use iterm2 or any other true color terminal)
 opt.termguicolors = true
 opt.background = "dark" -- colorschemes that can be light or dark will be made dark
 opt.signcolumn = "yes" -- show sign column so that text doesn't shift
-opt.colorcolumn = "80" -- highlight 80th column
 
 -- backspace
 opt.backspace = "indent,eol,start" -- allow backspace on indent, end of line or insert mode start position

lua/plugins/aerial.lua

@@ -1,6 +1,8 @@
 return {
   {
     "stevearc/aerial.nvim",
+    event = "LspAttach",
+    cmd = { "AerialToggle", "AerialNavToggle" },
     dependencies = {
       "nvim-treesitter/nvim-treesitter",
       "nvim-tree/nvim-web-devicons",
@@ -137,8 +139,8 @@ return {
       -- Global keymaps
       vim.keymap.set("n", "<leader>oa", "<cmd>AerialToggle<CR>", { desc = "Toggle Aerial" })
       vim.keymap.set("n", "<leader>oA", "<cmd>AerialNavToggle<CR>", { desc = "Toggle Aerial Navigation" })
-      vim.keymap.set("n", "[s", "<cmd>AerialPrev<CR>", { desc = "Previous symbol" })
-      vim.keymap.set("n", "]s", "<cmd>AerialNext<CR>", { desc = "Next symbol" })
+      vim.keymap.set("n", "[S", "<cmd>AerialPrev<CR>", { desc = "Previous symbol" })
+      vim.keymap.set("n", "]S", "<cmd>AerialNext<CR>", { desc = "Next symbol" })
     end,
   },
 }

lua/plugins/blink-cmp.lua

@@ -80,10 +80,7 @@ return {
     },
 
     signature = {
-      enabled = true,
-      window = {
-        border = "rounded",
-      },
+      enabled = false,
     },
   },
   opts_extend = { "sources.default" },

lua/plugins/catppuccin.lua

@@ -32,19 +32,23 @@ return {
         operators = {},
       },
       integrations = {
-        alpha = true,
-        cmp = true,
+        aerial = true,
+        blink_cmp = true,
+        diffview = true,
+        fidget = true,
         gitsigns = true,
-        nvimtree = {
-          enabled = true,
-          show_root = true,
-        },
+        harpoon = true,
+        lsp_trouble = true,
+        mason = true,
+        neotest = true,
+        snacks = true,
         telescope = {
           enabled = true,
         },
         treesitter = true,
         notify = true,
         semantic_tokens = true,
+        which_key = true,
       },
       custom_highlights = function(colors)
         return {

lua/plugins/cloak.lua

@@ -1,5 +1,6 @@
 return {
   "laytan/cloak.nvim",
+  event = "BufReadPre",
   config = function()
     require("cloak").setup({
       enabled = true,

lua/plugins/conform.lua

@@ -27,7 +27,7 @@ return {
           return nil
         end
         return {
-          lsp_fallback = true,
+          lsp_format = "fallback",
           timeout_ms = 500,
         }
       end,

lua/plugins/diffview.lua

@@ -2,6 +2,7 @@ return {
   {
     -- Advanced git analysis
     "sindrets/diffview.nvim",
+    cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewFileHistory" },
     config = function()
       require("diffview").setup({
         diff_binaries = false,

lua/plugins/emoji.lua

@@ -6,7 +6,6 @@ return {
     "nvim-lua/plenary.nvim",
     "saghen/blink.cmp",
     "nvim-telescope/telescope.nvim",
-    "ibhagwan/fzf-lua",
   },
   opts = {
     enable_cmp_integration = true,

lua/plugins/fidget.lua

@@ -1,5 +1,6 @@
 return {
   "j-hui/fidget.nvim",
+  event = "LspAttach",
   config = function()
     require("fidget").setup({
       progress = {
@@ -73,11 +74,7 @@ return {
           relative = "editor",
         },
       },
-      integration = {
-        ["nvim-tree"] = {
-          enable = true,
-        },
-      },
+      integration = {},
       logger = {
         level = vim.log.levels.WARN,
         max_size = 10000,