Update .config/nvim/init.lua

Update .config/nvim/lazy-lock.json
Update .config/nvim/lua/config/10_opts.lua
Update .config/nvim/lua/config/20_keymaps.lua
Update .config/nvim/lua/plugin/00_colorscheme.lua
Update .config/nvim/lua/plugin/01_whichkey.lua
Update .config/nvim/lua/plugin/03_treesitter.lua
Update .config/nvim/lua/plugin/05_fzf.lua
Update .config/nvim/lua/plugin/15_lsp.lua
Add .config/nvim/lua/plugin/25_git.lua
Add .config/nvim/lua/plugin/30_formatting.lua
Add .config/nvim/stylua.toml

private_dot_config/nvim/lua/plugin/00_colorscheme.lua

@@ -1,8 +1,14 @@
 return {
-	{
-		'oneslash/helix-nvim', version = "*",
-		config = function ()
-			vim.cmd.colorscheme("helix")
-		end,
-	}
+  {
+    "oneslash/helix-nvim",
+    vsersion = "*",
+    config = function()
+      vim.cmd.colorscheme("helix")
+    end,
+  },
+  {
+    "catgoose/nvim-colorizer.lua",
+    event = "BufReadPre",
+    opts = {},
+  },
 }

private_dot_config/nvim/lua/plugin/01_whichkey.lua

@@ -1,18 +1,32 @@
 return {
   {
-    'folke/which-key.nvim',
+    "folke/which-key.nvim",
     event = "VeryLazy",
     opts = {
       preset = "helix",
-      delay = function(ctx) return ctx.plugin and 0 or 20 end,
-      spec = { 
-	{ "<leader>f", group = "fzf" },
-	{ "<leader>s", group = "snippet" },
-	{ "<leader>e", group = "edit config" },
+      delay = function(ctx)
+        return ctx.plugin and 0 or 20
+      end,
+      spec = {
+        { "<leader>f", group = "find" },
+        { "<leader>a", group = "lsp action" },
+        { "<leader>s", group = "snippet" },
+        { "<leader>e", group = "edit config" },
       },
     },
     keys = {
-	{ "<leader>?", function() require("which-key").show({ global = true }) end, desc = "buffer local keymaps" }
-    }
+      {
+        "<leader>?",
+        function()
+          require("which-key").show({ global = true })
+        end,
+        desc = "buffer local keymaps",
+      },
+    },
+  },
+  {
+    "folke/trouble.nvim",
+    dependencies = { "mini-nvim/mini.icons" },
+    opts = {},
   },
 }

private_dot_config/nvim/lua/plugin/03_treesitter.lua

@@ -5,4 +5,11 @@ return {
     lazy = false,
     build = ":TSUpdate"
   },
+  {
+    'nvim-treesitter/nvim-treesitter-context',
+    dependencies = { 'nvim-treesitter/nvim-treesitter' },
+    config = function()
+      require("treesitter-context").setup()
+    end,
+  }
 }

private_dot_config/nvim/lua/plugin/05_fzf.lua

@@ -1,19 +1,31 @@
 return {
   {
-    'ibhagwan/fzf-lua',
-    dependencies = { { 'nvim-mini/mini.icons' }, },
-    opts = {
+    "ibhagwan/fzf-lua",
+    dependencies = { { "nvim-mini/mini.icons" } },
+    epts = {
       winopts = {
         preview = {
           vertical = "down:65%",
-          flip_columns = 120
-        }
+          flip_columns = 120,
+        },
       },
-      files = { git_icons = true, },
+      files = { git_icons = true },
     },
+    -- stylua: ignore
     keys = {
-      { "f", "<cmd>FzfLua global<CR>", mode = { "n" }, desc = "Fzf everything" },
-      { "<leader>fg", "<cmd>FzfLua global<CR>", mode = { "n" }, desc = "Fzf everything" },
+      { '<leader>f"', "<cmd>FzfLua registers<CR>",       mode = { "n" }, desc = "fzf registers" },
+      { "<leader>fb", "<cmd>FzfLua buffers<CR>",         mode = { "n" }, desc = "fzf buffers" },
+      { "<leader>fc", "<cmd>FzfLua commands<CR>",        mode = { "n" }, desc = "fzf commands" },
+      { "<leader>fe", "<cmd>FzfLua changes<CR>",         mode = { "n" }, desc = "fzf edits" },
+      { "<leader>ff", "<cmd>FzfLua files<CR>",           mode = { "n" }, desc = "fzf files" },
+      { "<leader>fg", "<cmd>FzfLua live_grep<CR>",       mode = { "n" }, desc = "fzf grep" },
+      { "<leader>fh", "<cmd>FzfLua command_history<CR>", mode = { "n" }, desc = "fzf cmd history" },
+      -- <leader>fi --> lsp find implementation
+      { "<leader>fk", "<cmd>FzfLua keymaps<CR>",         mode = { "n" }, desc = "fzf keymaps" },
+      { "<leader>fl", "<cmd>FzfLua blines<CR>",          mode = { "n" }, desc = "fzf bufferlines" },
+      { "<leader>fo", "<cmd>FzfLua oldfiles<CR>",        mode = { "n" }, desc = "fzf oldfiles" },
+      -- <leader>fr --> lsp find references
+      { "<leader>fs", "<cmd>FzfLua<CR>",                 mode = { "n" }, desc = "fzf something else" },
     },
   },
 }

private_dot_config/nvim/lua/plugin/15_lsp.lua

@@ -1,10 +1,19 @@
 return {
   {
-    'mason-org/mason-lspconfig.nvim',
+    "mason-org/mason-lspconfig.nvim",
     opts = {},
     dependencies = {
-      { 'mason-org/mason.nvim', opts = {} },
-      { 'neovim/nvim-lspconfig' },
-    }
+      { "mason-org/mason.nvim", opts = {} },
+      { "neovim/nvim-lspconfig" },
+      {
+        "folke/lazydev.nvim",
+        ft = "lua",
+        opts = {
+          library = {
+            { path = "${3rd}/luv/library", words = { "vim%.uv" } },
+          },
+        },
+      },
+    },
   },
 }

private_dot_config/nvim/lua/plugin/25_git.lua

@@ -0,0 +1,5 @@
+return {
+  {
+    'lewis6991/gitsigns.nvim',
+  },
+}

private_dot_config/nvim/lua/plugin/30_formatting.lua

@@ -0,0 +1,39 @@
+return {
+  {
+    "tpope/vim-sleuth",
+  },
+  {
+    "stevearc/conform.nvim",
+    event = { "BufWritePre" },
+    cmd = { "ConformInfo" },
+    keys = {
+      {
+        "<leader>af",
+        function()
+          require("conform").format({ async = true })
+        end,
+        mode = "",
+        desc = "format buffer",
+      },
+    },
+    opts = {
+      formatters_by_ft = {
+        lua = { "stylua" },
+        python = { "isort", "black" },
+        javascript = { "prettierd", "prettier", stop_after_first = true },
+      },
+      default_format_opts = {
+        lsp_format = "fallback",
+      },
+      format_on_save = { timeout_ms = 500 },
+      formatters = {
+        shfmt = {
+          append_args = { "-i", "2" },
+        },
+      },
+    },
+    init = function()
+      vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
+    end,
+  },
+}