fugitive keymaps

remove diffopt to avoid bad experience in 3-way merges

.gitignore

@@ -0,0 +1,2 @@
+lua/testing
+

after/ftplugin/json.lua

@@ -0,0 +1,7 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
+vim.opt_local.softtabstop = 2
+vim.opt_local.expandtab = true
+
+vim.opt_local.conceallevel = 0
+

after/ftplugin/markdown.lua

@@ -1,2 +1,3 @@
 vim.opt_local.conceallevel = 2
+vim.opt.wrap = true
 

lazy-lock.json

@@ -1,43 +1,50 @@
 {
   "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "12fb7348cf9d32a0ed2e3ab4960d561632e57ba4" },
-  "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
+  "blink-ripgrep.nvim": { "branch": "main", "commit": "0c0d9db740ca70aa739e40f50589b01e537ade6d" },
+  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
+  "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "fzf-lua": { "branch": "main", "commit": "c53ba4f40f0514a5038646fb1e9ce05872b18eb1" },
-  "gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
-  "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
+  "fzf-lua": { "branch": "main", "commit": "83e4080ae886a42ec48c5c26ce5892ceb557c425" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
+  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
-  "hererocks": { "branch": "master", "commit": "4ce92131e9858950440ab99a25db9a9b43db8cd4" },
+  "hererocks": { "branch": "master", "commit": "160228946bed9998f5e3b168bd0b66ba2690f8f3" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "f54e3c11fc9ebfcfc27e696182b0295b071d0811" },
-  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
-  "mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" },
-  "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
+  "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
+  "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
+  "lualine.nvim": { "branch": "master", "commit": "e533fac71bc361768f90004af695cd1f1aa1900a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" },
+  "none-ls.nvim": { "branch": "main", "commit": "a96172f673f720cd4f3572e1fcd08400ed3eb25d" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
-  "nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" },
+  "nvim-navic": { "branch": "master", "commit": "099b4c8cdc3e9ea026ea6b2a0d315e2d28362242" },
   "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
-  "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-ufo": { "branch": "main", "commit": "80fe8215ba566df2fbf3bf4d25f59ff8f41bc0e1" },
-  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
-  "obsidian.nvim": { "branch": "main", "commit": "2f0222b3eb20382cadf3e1d91f368318b768771c" },
-  "oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
-  "parrot.nvim": { "branch": "main", "commit": "0477748832812707e53db078d0180299a0c15d6c" },
-  "plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
+  "nvim-treesitter": { "branch": "main", "commit": "0606c7a9dcaa5c5beee0b0f09043e9fdd1ba0a68" },
+  "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
+  "obsidian.nvim": { "branch": "main", "commit": "6b2a22a74d1c883e797764c28f75aa6b532a1ae4" },
+  "oil.nvim": { "branch": "master", "commit": "200df01e4b92d0010a3bfbde92b91a4ef5a5c9db" },
+  "parrot.nvim": { "branch": "main", "commit": "dcae923c7070431c8cb628b19594ab640168684c" },
+  "plenary": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
+  "render-markdown.nvim": { "branch": "main", "commit": "691651de4e02cbea9ff50c62d7d3a679abc95564" },
   "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
   "statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" },
+  "tabby.nvim": { "branch": "main", "commit": "b3affa6db7eab80fca2a2db5b73b473144507039" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
-  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
-  "vim-helm": { "branch": "master", "commit": "cc5ac22444332381f38084a6c7f023c25eef6201" }
+  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
+  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" },
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "vim-helm": { "branch": "master", "commit": "2c8525fd98e57472769d137317bca83e477858ce" },
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }
 }

lua/crentist/autocmd.lua

@@ -3,57 +3,85 @@ local augroup = vim.api.nvim_create_augroup
 
 local CrentistGroup = augroup('Crentist', {})
 local OnSaveGroup = augroup('CrentistOnSave', {})
+local CrentistTreeSitter = augroup('CrentistTreeSitter', {})
 
 local builtin = require('telescope.builtin')
 
 autocmd('LspAttach', {
-    group = CrentistGroup,
-    callback = function(e)
-        local opts = { buffer = e.buf }
-        vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-        vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-        vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-        vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
-        vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-        vim.keymap.set("n", "<leader>vrr", function() builtin.lsp_references() end, opts)
-        vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-        vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-        vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
-        vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
-        vim.keymap.set("n", "<M-F>", function() vim.lsp.buf.format() end, opts)
-    end
+  group = CrentistGroup,
+  callback = function(e)
+    local opts = { buffer = e.buf }
+    vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
+    vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
+    vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
+    vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
+    vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
+    vim.keymap.set("n", "<leader>vrr", function() builtin.lsp_references() end, opts)
+    vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
+    vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+    vim.keymap.set("n", "[d", function() vim.diagnostic.jump({ count = 1 }) end, opts)
+    vim.keymap.set("n", "]d", function() vim.diagnostic.jump({ count = -1 }) end, opts)
+    vim.keymap.set("n", "<M-F>", function() vim.lsp.buf.format() end, opts)
+  end
 })
 
 -- Add new line to the end of the file
 autocmd({ 'BufWritePre' }, {
-    group = OnSaveGroup,
-    pattern = '*',
-    callback = function()
-        local n_lines = vim.api.nvim_buf_line_count(0)
-        local last_nonblank = vim.fn.prevnonblank(n_lines)
-        if last_nonblank <= n_lines then
-            vim.api.nvim_buf_set_lines(0,
-                last_nonblank, n_lines, true, { '' })
-        end
-    end,
+  group = OnSaveGroup,
+  pattern = '*',
+  callback = function()
+    local n_lines = vim.api.nvim_buf_line_count(0)
+    local last_nonblank = vim.fn.prevnonblank(n_lines)
+    if last_nonblank <= n_lines then
+      vim.api.nvim_buf_set_lines(0,
+        last_nonblank, n_lines, true, { '' })
+    end
+  end,
 })
 
 -- Remove trailing spaces
 autocmd({ 'BufWritePre' }, {
-    group = OnSaveGroup,
-    pattern = { "*" },
-    callback = function()
-        local save_cursor = vim.fn.winsaveview()
-        pcall(function() vim.cmd [[%s/\s\+$//e]] end)
-        vim.fn.winrestview(save_cursor)
-    end,
+  group = OnSaveGroup,
+  pattern = { "*" },
+  callback = function()
+    local save_cursor = vim.fn.winsaveview()
+    pcall(function() vim.cmd [[%s/\s\+$//e]] end)
+    vim.fn.winrestview(save_cursor)
+  end,
 })
 
-autocmd({'FileType'}, {
-    group = CrentistGroup,
-    pattern = { 'json' },
-    callback = function (e)
-        vim.keymap.set("n", "<M-F>", function() vim.cmd('silent %!jq .') end, {buffer = e.buf})
-    end
+autocmd({ 'FileType' }, {
+  group = CrentistGroup,
+  pattern = { 'json' },
+  callback = function(e)
+    vim.keymap.set("n", "<M-F>", function() vim.cmd('silent %!jq .') end, { buffer = e.buf })
+  end
+})
+
+autocmd({ 'FileType' }, {
+  group = CrentistTreeSitter,
+  pattern = {
+    'sh',
+    'javascript',
+    'typescript',
+    'python',
+    'go',
+    'terraform*',
+    'yaml',
+    'helm',
+    'tmux',
+    'lua',
+    'vim',
+    'vimdoc',
+    'latex',
+    'json',
+    'yaml*',
+    'git.+',
+    'make',
+    'markdown*',
+  },
+  callback = function(e)
+    vim.treesitter.start(e.buf)
+  end
 })
 

lua/crentist/init.lua

@@ -3,6 +3,6 @@ require("crentist.set")
 require("crentist.lazy_init")
 require("crentist.autocmd")
 require("crentist.filetype")
-require("crentist.luasnip")
+require("crentist.snippets")
 require("crentist.null-ls")
 

lua/crentist/lazy/colors.lua

@@ -5,7 +5,9 @@ return {
         config = function()
             local gruvbox = require('gruvbox')
 
-            gruvbox.setup({
+            ---@module 'gruvbox'
+            ---@type GruvboxConfig
+            local gruvbox_settings = {
                 transparent_mode = false,
                 italic = {
                     strings = false,
@@ -24,7 +26,9 @@ return {
                     GruvboxAquaSign = { bg = '' },
                     GruvboxOrangeSign = { bg = '' },
                 }
-            })
+            }
+
+            gruvbox.setup(gruvbox_settings)
             vim.cmd('colorscheme gruvbox')
 
             vim.api.nvim_set_hl(0, 'SignColumn', { link = 'FoldColumn' })

lua/crentist/lazy/completion.lua

@@ -7,13 +7,25 @@ return {
         { 'L3MON4D3/LuaSnip', version = 'v2.*' }
     },
     -- use a release tag to download pre-built binaries
-    version = 'v1.4.*',
+    version = 'v1.7.*',
 
+    ---@module 'blink-cmp'
+    ---@type blink.cmp.Config
     opts = {
         fuzzy = { implementation = 'prefer_rust_with_warning' },
 
         snippets = {
             preset = 'luasnip',
+            active = function(filter)
+                local snippet = require('luasnip')
+                local blink = require('blink.cmp')
+                if snippet.in_snippet() and not blink.is_visible() then
+                    return true
+                else
+                    if not snippet.in_snippet() and vim.fn.mode() == 'n' then snippet.unlink_current() end
+                    return false
+                end
+            end
         },
 
         cmdline = {
@@ -36,6 +48,10 @@ return {
 
         sources = {
             default = { 'lazydev', 'lsp', 'snippets', 'ripgrep', 'path', 'buffer' },
+            per_filetype = {
+                sql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' },
+                mysql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' },
+            },
             providers = {
                 lazydev = {
                     name = 'LazyDev',
@@ -46,25 +62,25 @@ return {
                 ripgrep = {
                     module = 'blink-ripgrep',
                     name = 'Ripgrep',
-                    score_offset = -2,
+                    score_offset = -5,
                     -- the options below are optional, some default values are shown
                     ---@module 'blink-ripgrep'
                     ---@type blink-ripgrep.Options
                     opts = {
-                        max_filesize = '1M',
-                        project_root_marker = '.git',
-                        project_root_fallback = true,
-                        search_casing = '--ignore-case',
-                        additional_rg_options = {},
-                        fallback_to_regex_highlighting = true,
-                        ignore_paths = {},
-                        additional_paths = {},
-                        future_features = {
-                            backend = {
-                                use = 'ripgrep',
-                            },
+                        backend = {
+                            use = 'ripgrep',
                         },
-                        debug = false,
+                        ripgrep = {
+                            ignore_paths = {},
+                            additional_paths = {},
+                            additional_rg_options = {},
+                            max_filesize = '1M',
+                            project_root_fallback = true,
+                            search_casing = '--ignore-case',
+                        },
+                        project_root_marker = '.git',
+                        fallback_to_regex_highlighting = true,
+                        toggles = { debug = nil, },
                     },
                     transform_items = function(_, items)
                         for _, item in ipairs(items) do
@@ -76,6 +92,9 @@ return {
                         return items
                     end,
                 },
+                dadbod = {
+                    name = 'Dadbod', module = 'vim_dadbod_completion.blink'
+                },
             },
         },
 

lua/crentist/lazy/dadbod.lua

@@ -0,0 +1,20 @@
+return {
+  'kristijanhusak/vim-dadbod-ui',
+  dependencies = {
+    { 'tpope/vim-dadbod', lazy = true },
+    { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true }, -- Optional
+  },
+  cmd = {
+    'DBUI',
+    'DBUIToggle',
+    'DBUIAddConnection',
+    'DBUIFindBuffer',
+  },
+  init = function()
+    -- Your DBUI configuration
+    vim.g.db_ui_use_nerd_fonts = 1
+    vim.g.db_ui_auto_execute_table_helpers = 1
+    vim.g.db_ui_win_position = 'left'
+  end,
+}
+

lua/crentist/lazy/decrypt.lua

@@ -1,9 +0,0 @@
-return {}
--- return {
---     { dir = "~/.dotfiles/nvim-plugins/decrypt.nvim" },
---     -- config = function()
---     --     require "decrypt"
---     -- end
--- }
---
-

lua/crentist/lazy/dressing.lua

@@ -1,4 +1,7 @@
 return {
   'stevearc/dressing.nvim',
+  ---@module 'dressing'
+  ---@type dressing.InputConfig
   opts = {},
 }
+

lua/crentist/lazy/fugitive.lua

@@ -1,34 +1,34 @@
 return {
-    "tpope/vim-fugitive",
-    config = function() 
-        vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
+    'tpope/vim-fugitive',
+    config = function()
+        vim.keymap.set('n', "<leader>gs", vim.cmd.Git)
+        vim.keymap.set('n', "<leader><leader>gl", function () vim.cmd.Git({ 'pull' }) end)
 
-        local Crentist_Fugitive = vim.api.nvim_create_augroup("Crentist_Fugitive", {})
+        vim.api.nvim_create_user_command('Gcm', function() vim.cmd.Git({ 'switch main' }) end, {})
+
+        local Crentist_Fugitive = vim.api.nvim_create_augroup('Crentist_Fugitive', {})
 
         local autocmd = vim.api.nvim_create_autocmd
-        autocmd("BufWinEnter", {
+        autocmd('BufWinEnter', {
             group = Crentist_Fugitive,
-            pattern = "*",
+            pattern = '*',
             callback = function()
-                if vim.bo.ft ~= "fugitive" then
+                if vim.bo.ft ~= 'fugitive' then
                     return
                 end
 
-                local bufnr = vim.api.nvim_get_current_buf()
-                local opts = {buffer = bufnr, remap = false}
-                vim.keymap.set("n", "<leader>p", function()
+                local SwitchToMainbufnr = vim.api.nvim_get_current_buf()
+                local opts = { buffer = bufnr, remap = false }
+                vim.keymap.set('n', "<leader>p", function()
                     vim.cmd.Git('push')
                 end, opts)
 
                 -- rebase always
-                vim.keymap.set("n", "<leader>P", function()
-                    vim.cmd.Git({'pull',  '--rebase'})
+                vim.keymap.set('n', "<leader>P", function()
+                    vim.cmd.Git({ 'pull', '--rebase' })
                 end, opts)
-
-                -- NOTE: It allows me to easily set the branch i am pushing and any tracking
-                -- needed if i did not set the branch up correctly
-                vim.keymap.set("n", "<leader>t", ":Git push -u origin ", opts);
             end,
         })
     end
 }
+

lua/crentist/lazy/gitsigns.lua

@@ -1,11 +1,74 @@
 return {
-    "lewis6991/gitsigns.nvim",
+    'lewis6991/gitsigns.nvim',
+    ---@module 'gitsigns.config'
+    ---@type Gitsigns.Config
     opts = {
         current_line_blame = true,
         attach_to_untracked = true,
         current_line_blame_opts = {
             delay = 500,
+            ignore_whitespace = true,
+            virt_text_pos = 'right_align',
         },
+        on_attach = function(bufnr)
+            local gitsigns = require('gitsigns')
+
+            local function map(mode, l, r, opts)
+                opts = opts or {}
+                opts.buffer = bufnr
+                vim.keymap.set(mode, l, r, opts)
+            end
+
+            -- Navigation
+            map('n', ']c', function()
+                if vim.wo.diff then
+                    vim.cmd.normal({ ']c', bang = true })
+                else
+                    gitsigns.nav_hunk('next')
+                end
+            end)
+
+            map('n', '[c', function()
+                if vim.wo.diff then
+                    vim.cmd.normal({ '[c', bang = true })
+                else
+                    gitsigns.nav_hunk('prev')
+                end
+            end)
+
+            -- Actions
+            map('n', '<leader>hs', gitsigns.stage_hunk)
+            map('n', '<leader>hr', gitsigns.reset_hunk)
+
+            map('v', '<leader>hs', function()
+                gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
+            end)
+
+            map('v', '<leader>hr', function()
+                gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
+            end)
+
+            map('n', '<leader>hS', gitsigns.stage_buffer)
+            map('n', '<leader>hR', gitsigns.reset_buffer)
+            map('n', '<leader>hp', gitsigns.preview_hunk)
+            map('n', '<leader>hi', gitsigns.preview_hunk_inline)
+
+            map('n', '<leader>hd', gitsigns.diffthis)
+
+            map('n', '<leader>hD', function()
+                gitsigns.diffthis('~')
+            end)
+
+            map('n', '<leader>hQ', function() gitsigns.setqflist('all') end)
+            map('n', '<leader>hq', gitsigns.setqflist)
+
+            -- Toggles
+            map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
+            map('n', '<leader>tw', gitsigns.toggle_word_diff)
+
+            -- Text object
+            map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
+        end
     }
 }
 

lua/crentist/lazy/harpoon.lua

@@ -1,14 +1,19 @@
 return {
-    "theprimeagen/harpoon",
-    branch = "harpoon2",
-    dependencies = { "nvim-lua/plenary.nvim" },
+    'theprimeagen/harpoon',
+    branch = 'harpoon2',
+    dependencies = { 'nvim-lua/plenary.nvim' },
     config = function()
-        local harpoon = require("harpoon")
+        local harpoon = require('harpoon')
+        local extensions = require('harpoon.extensions')
 
-        harpoon:setup()
+        harpoon:setup({
+            settings = { sync_on_ui_close = true }
+        })
+        harpoon:extend(extensions.builtins.navigate_with_number())
+        harpoon:extend(extensions.builtins.highlight_current_file())
 
         -- basic telescope configuration
-        local conf = require("telescope.config").values
+        local conf = require('telescope.config').values
         local function toggle_telescope(harpoon_files)
             local file_paths = {}
             for _, item in ipairs(harpoon_files.items) do
@@ -16,8 +21,8 @@ return {
             end
 
             require('telescope.pickers').new({}, {
-                prompt_title = "Harpoon",
-                finder = require("telescope.finders").new_table({
+                prompt_title = 'Harpoon',
+                finder = require('telescope.finders').new_table({
                     results = file_paths,
                 }),
                 previewer = conf.file_previewer({}),
@@ -25,15 +30,15 @@ return {
             }):find()
         end
 
-        vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
-        vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
-        vim.keymap.set("n", "<leader><C-e>", function() toggle_telescope(harpoon:list()) end,
-            { desc = "Open harpoon window" })
+        vim.keymap.set('n', '<leader>a', function() harpoon:list():add() end)
+        vim.keymap.set('n', '<C-e>', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+        vim.keymap.set('n', '<leader><C-e>', function() toggle_telescope(harpoon:list()) end,
+            { desc = 'Open harpoon window' })
 
-        vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
-        vim.keymap.set("n", "<C-j>", function() harpoon:list():select(2) end)
-        vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) end)
-        vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)
+        vim.keymap.set('n', '<C-h>', function() harpoon:list():select(1) end)
+        vim.keymap.set('n', '<C-j>', function() harpoon:list():select(2) end)
+        vim.keymap.set('n', '<C-k>', function() harpoon:list():select(3) end)
+        vim.keymap.set('n', '<C-l>', function() harpoon:list():select(4) end)
     end
 }
 

lua/crentist/lazy/illuminate.lua

@@ -0,0 +1,8 @@
+return {
+    'RRethy/vim-illuminate',
+    config = function ()
+        local illuminate = require('illuminate')
+        illuminate.configure()
+    end
+}
+

lua/crentist/lazy/indent-blanklines.lua

@@ -1 +1,2 @@
-return { "lukas-reineke/indent-blankline.nvim", main = "ibl", opts = {} }
+return { 'lukas-reineke/indent-blankline.nvim', main = 'ibl', opts = {} }
+

lua/crentist/lazy/init.lua

@@ -1,6 +1,7 @@
 return {
 	{
-		"nvim-lua/plenary.nvim",
-		name = "plenary"
+		'nvim-lua/plenary.nvim',
+		name = 'plenary'
 	},
 }
+

lua/crentist/lazy/lsp.lua

@@ -1,6 +1,6 @@
 return {
     'neovim/nvim-lspconfig',
-    tag = 'v1.0.0',
+    version = '^2.3.0',
     dependencies = {
         'williamboman/mason.nvim',
         'williamboman/mason-lspconfig.nvim',
@@ -32,8 +32,10 @@ return {
 
         require('fidget').setup({})
         require('mason').setup({})
+        ---@module 'mason-lspconfig'
+        ---@type MasonLspconfigSettings
         require('mason-lspconfig').setup({
-            automatic_installation = false,
+            automatic_enable = true,
             -- Replace the language servers listed here
             -- with the ones you want to install
             ensure_installed = {
@@ -48,20 +50,18 @@ return {
                 'helm_ls',
                 'marksman',
             },
-            handlers = {
-                function(server_name)
-                    local capabilities = require('blink.cmp').get_lsp_capabilities()
-                    require('lspconfig')[server_name].setup({
-                        capabilities = capabilities
-                    })
-                end,
-            }
         })
 
-        local pythonLineLength = 95
-        lspconfig.pylsp.setup {
+        local lazydev = require('lazydev')
+        lazydev.setup()
+        vim.lsp.config('lua_ls', {
+            root_dir = function(bufnr, on_dir) on_dir(lazydev.find_workspace(bufnr)) end
+        })
+
+        ---@type lspconfig.Config
+        vim.lsp.config('pylsp', {
             settings = {
-                pylsp = {
+                ['pylsp'] = {
                     plugins = {
                         autopep8 = {
                             enabled = false,
@@ -71,41 +71,25 @@ return {
                         },
                         pycodestyle = {
                             ignore = { 'W391' },
-                            maxLineLength = pythonLineLength
+                            maxLineLength = 95,
                         }
                     }
                 }
             }
-        }
-        lspconfig.ansiblels.setup {}
+        })
 
-        lspconfig.lua_ls.setup {}
-
-        lspconfig.helm_ls.setup {
+        vim.lsp.config('helm-ls', {
             settings = {
                 ['helm-ls'] = {
-                    yamlls = {
-                        path = 'yaml-language-server',
-                    }
-                }
+                    helmLint = { enabled = false },
+                    yamlls = { enabled = false },
+                },
             }
-        }
+        })
 
-        lspconfig.yamlls.setup {}
-        lspconfig.helm_ls.setup {
-            settings = {
-                ['helm-ls'] = {
-                    yamlls = {
-                        enabled = false
-                    }
-                }
-            }
-        }
-
-
-        lspconfig.terraformls.setup {
+        vim.lsp.config('terraformls', {
             filetypes = { 'terraform', 'terraform-vars', 'tf' }
-        }
+        })
     end
 }
 

lua/crentist/lazy/lualine.lua

@@ -17,53 +17,54 @@ return {
             lightgray    = '#504945',
             inactivegray = '#7c6f64',
         }
-        require('lualine').setup({
-            options = {
-                theme = {
-                    normal = {
-                        a = { bg = colors.yellow, fg = colors.black, gui = 'bold' },
-                        b = { bg = colors.lightgray, fg = colors.white },
-                        c = { bg = colors.darkgray, fg = colors.white },
-                    },
-                    insert = {
-                        a = { bg = colors.blue, fg = colors.black, gui = 'bold' },
-                        b = { bg = colors.lightgray, fg = colors.white },
-                        c = { bg = colors.lightgray, fg = colors.white },
-                    },
-                    visual = {
-                        a = { bg = colors.magenta, fg = colors.black, gui = 'bold' },
-                        b = { bg = colors.lightgray, fg = colors.white },
-                        c = { bg = colors.inactivegray, fg = colors.black },
-                    },
-                    replace = {
-                        a = { bg = colors.red, fg = colors.black, gui = 'bold' },
-                        b = { bg = colors.lightgray, fg = colors.white },
-                        c = { bg = colors.black, fg = colors.white },
-                    },
-                    command = {
-                        a = { bg = colors.green, fg = colors.black, gui = 'bold' },
-                        b = { bg = colors.lightgray, fg = colors.white },
-                        c = { bg = colors.inactivegray, fg = colors.black },
-                    },
-                    inactive = {
-                        a = { bg = colors.darkgray, fg = colors.magenta, gui = 'bold' },
-                        b = { bg = colors.darkgray, fg = colors.magenta },
-                        c = { bg = colors.darkgray, fg = colors.magenta },
-                    },
+        require('lualine').setup(
+            {
+                options = {
+                    theme = {
+                        normal = {
+                            a = { bg = colors.yellow, fg = colors.black, gui = 'bold' },
+                            b = { bg = colors.lightgray, fg = colors.white },
+                            c = { bg = colors.darkgray, fg = colors.white },
+                        },
+                        insert = {
+                            a = { bg = colors.blue, fg = colors.black, gui = 'bold' },
+                            b = { bg = colors.lightgray, fg = colors.white },
+                            c = { bg = colors.lightgray, fg = colors.white },
+                        },
+                        visual = {
+                            a = { bg = colors.magenta, fg = colors.black, gui = 'bold' },
+                            b = { bg = colors.lightgray, fg = colors.white },
+                            c = { bg = colors.inactivegray, fg = colors.black },
+                        },
+                        replace = {
+                            a = { bg = colors.red, fg = colors.black, gui = 'bold' },
+                            b = { bg = colors.lightgray, fg = colors.white },
+                            c = { bg = colors.black, fg = colors.white },
+                        },
+                        command = {
+                            a = { bg = colors.green, fg = colors.black, gui = 'bold' },
+                            b = { bg = colors.lightgray, fg = colors.white },
+                            c = { bg = colors.inactivegray, fg = colors.black },
+                        },
+                        inactive = {
+                            a = { bg = colors.darkgray, fg = colors.magenta, gui = 'bold' },
+                            b = { bg = colors.darkgray, fg = colors.magenta },
+                            c = { bg = colors.darkgray, fg = colors.magenta },
+                        },
+                    }
+                },
+                sections = {
+                    lualine_c = {
+                        {
+                            'filename',
+                            path = 1,
+                        },
+                        {
+                            'navic',
+                        },
+                    }
                 }
-            },
-            sections = {
-                lualine_c = {
-                    {
-                        'filename',
-                        path = 1,
-                    },
-                    {
-                        'navic',
-                    },
-                }
-            }
-        })
+            })
     end
 }
 

lua/crentist/lazy/markdown.lua

@@ -0,0 +1,15 @@
+return {
+    'MeanderingProgrammer/render-markdown.nvim',
+    dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
+    ---@module 'render-markdown'
+    ---@type render.md.UserConfig
+    opts = {
+       completions = {
+           blink = { enabled = true }
+       },
+       heading = {
+           icons = { '󰬺 ', '󰬻 ', '󰬼 ', '󰬽 ', '󰬾 ', '󰬿 ' },
+       }
+    },
+}
+

lua/crentist/lazy/navic.lua

@@ -7,7 +7,8 @@ return {
         local navic = require('nvim-navic')
         navic.setup({
             lsp = {
-                auto_attach = true
+                auto_attach = true,
+                preference = { 'helm_ls', 'yamlls' }
             }
         })
     end

lua/crentist/lazy/neotree.lua

@@ -0,0 +1,27 @@
+return {
+  {
+    'nvim-neo-tree/neo-tree.nvim',
+    branch = 'v3.x',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'MunifTanjim/nui.nvim',
+      'nvim-tree/nvim-web-devicons', -- optional, but recommended
+    },
+    lazy = false, -- neo-tree will lazily load itself
+    ---@module 'neo-tree'
+    ---@type neotree.Config
+    opts = {
+        filesystem = {
+            hijack_netrw_behavior = 'disabled',
+            filtered_items = {
+                hide_dotfiles = false,
+                never_show = {'.DS_Store'},
+            },
+        },
+        window = {
+            position = 'current',
+        }
+    },
+  }
+}
+

lua/crentist/lazy/obsidian.lua

@@ -6,8 +6,8 @@ return {
         'nvim-lua/plenary.nvim',
     },
     keys = {
-        { '<leader>ot', '<cmd>ObsidianToday<CR>',       desc = "Open today's daily note" },
-        { '<leader>os', '<cmd>ObsidianQuickSwitch<CR>', desc = 'Search notes in my vault and switch to selected' },
+        { '<leader>ot', '<cmd>Obsidian today<CR>',       desc = "Open today's daily note" },
+        { '<leader>os', '<cmd>Obsidian quick_switch<CR>', desc = 'Search notes in my vault and switch to selected' },
     },
     mappings = {
         -- Overrides the 'gf' mapping to work on markdown/wiki links within your vault.
@@ -33,6 +33,7 @@ return {
         },
     },
     opts = {
+        legacy_commands = false,
         workspaces = {
             {
                 name = 'tech-work-hobby',
@@ -51,7 +52,10 @@ return {
         completion = {
             blink = true,
             nvim_cmp = false,
-        }
+        },
+        ui = {
+            enable = false,
+        },
     },
 }
 

lua/crentist/lazy/oil.lua

@@ -1,20 +1,28 @@
 return {
     'stevearc/oil.nvim',
-    -- Optional dependencies
     dependencies = { 'nvim-tree/nvim-web-devicons' },
-    opts = {},
-    config = function()
-        require('oil').setup({
-            view_options = {
-                show_hidden = true,
-            },
-            keymaps = {
-                ['<C-h>'] = false,
-                ['<C-j>'] = false,
-                ['<C-k>'] = false,
-                ['<C-l>'] = false,
-            }
-        })
-    end
+    opts = {
+        view_options = {
+            show_hidden = true,
+        },
+        float = {
+            border = 'rounded',
+        },
+        confirmation = {
+            border = 'rounded',
+        },
+        progress = {
+            border = 'rounded',
+        },
+        keymaps_help = {
+            border = 'rounded',
+        },
+        keymaps = {
+            ['<C-h>'] = false,
+            ['<C-j>'] = false,
+            ['<C-k>'] = false,
+            ['<C-l>'] = false,
+        }
+    },
 }
 

lua/crentist/lazy/pairs.lua

@@ -1,56 +0,0 @@
-return {
-    'echasnovski/mini.pairs',
-    event = 'VeryLazy',
-    opts = {
-        modes = { insert = true, command = true, terminal = false },
-        -- skip autopair when next character is one of these
-        skip_next = [=[[%w%%%'%[%"%.%`%$]]=],
-        -- skip autopair when the cursor is inside these treesitter nodes
-        skip_ts = { "string" },
-        -- skip autopair when next character is closing pair
-        -- and there are more closing pairs than opening pairs
-        skip_unbalanced = true,
-        -- better deal with markdown code blocks
-        markdown = true,
-    },
-
-    config = function(_, opts)
-        local pairs = require("mini.pairs")
-        pairs.setup(opts)
-        local open = pairs.open
-        pairs.open = function(pair, neigh_pattern)
-            if vim.fn.getcmdline() ~= "" then
-                return open(pair, neigh_pattern)
-            end
-            local o, c = pair:sub(1, 1), pair:sub(2, 2)
-            local line = vim.api.nvim_get_current_line()
-            local cursor = vim.api.nvim_win_get_cursor(0)
-            local next = line:sub(cursor[2] + 1, cursor[2] + 1)
-            local before = line:sub(1, cursor[2])
-            if opts.markdown and o == "`" and vim.bo.filetype == "markdown" and before:match("^%s*``") then
-                return "`\n```" .. vim.api.nvim_replace_termcodes("<up>", true, true, true)
-            end
-            if opts.skip_next and next ~= "" and next:match(opts.skip_next) then
-                return o
-            end
-            if opts.skip_ts and #opts.skip_ts > 0 then
-                local ok, captures = pcall(vim.treesitter.get_captures_at_pos, 0, cursor[1] - 1,
-                    math.max(cursor[2] - 1, 0))
-                for _, capture in ipairs(ok and captures or {}) do
-                    if vim.tbl_contains(opts.skip_ts, capture.capture) then
-                        return o
-                    end
-                end
-            end
-            if opts.skip_unbalanced and next == c and c ~= o then
-                local _, count_open = line:gsub(vim.pesc(pair:sub(1, 1)), "")
-                local _, count_close = line:gsub(vim.pesc(pair:sub(2, 2)), "")
-                if count_close > count_open then
-                    return o
-                end
-            end
-            return open(pair, neigh_pattern)
-        end
-    end,
-}
-

lua/crentist/lazy/parrot.lua

@@ -1,19 +1,19 @@
 return {
     'frankroeder/parrot.nvim',
-    version = "2.1.0",
+    version = '2.3.0',
     dependencies = { 'ibhagwan/fzf-lua', 'nvim-lua/plenary.nvim' },
     opts = {
         providers = {
             anthropic = {
-                name = "anthropic",
-                endpoint = "https://api.anthropic.com/v1/messages",
-                model_endpoint = "https://api.anthropic.com/v1/models",
-                api_key = { "/usr/local/bin/sops", "--config", "/dev/null", "-d", vim.fn.expand("$HOME") .. "/.claude-api" },
+                name = 'anthropic',
+                endpoint = 'https://api.anthropic.com/v1/messages',
+                model_endpoint = 'https://api.anthropic.com/v1/models',
+                api_key = { '/usr/local/bin/sops', "--config", "/dev/null", "-d", vim.fn.expand("$HOME") .. "/.claude-api" },
                 headers = function(self)
                     return {
-                        ["Content-Type"] = "application/json",
-                        ["x-api-key"] = self.api_key,
-                        ["anthropic-version"] = "2023-06-01",
+                        ['Content-Type'] = "application/json",
+                        ['x-api-key'] = self.api_key,
+                        ['anthropic-version'] = "2023-06-01",
                     }
                 end,
                 params = {
@@ -21,16 +21,14 @@ return {
                     command = { max_tokens = 4096 },
                 },
                 models = {
-                    "claude-sonnet-4-20250514",
-                    "claude-3-7-sonnet-20250219",
-                    "claude-3-5-sonnet-20241022",
-                    "claude-3-5-haiku-20241022",
+                    'claude-opus-4-1-20250805',
+                    'claude-sonnet-4-5-20250929',
                 },
                 preprocess_payload = function(payload)
                     for _, message in ipairs(payload.messages) do
-                        message.content = message.content:gsub("^%s*(.-)%s*$", "%1")
+                        message.content = message.content:gsub('^%s*(.-)%s*$', "%1")
                     end
-                    if payload.messages[1] and payload.messages[1].role == "system" then
+                    if payload.messages[1] and payload.messages[1].role == 'system' then
                         -- remove the first message that serves as the system prompt as anthropic
                         -- expects the system prompt to be part of the API call body and not the messages
                         payload.system = payload.messages[1].content

lua/crentist/lazy/tabline.lua

@@ -0,0 +1,11 @@
+-- I literally need this for Dadbod for a nicer name in tabs. I don't use tabs
+-- in any other way
+return {
+  'nanozuki/tabby.nvim',
+  ---@module 'tabby'
+  ---@type TabbyConfig
+  opts = {
+    -- configs...
+  },
+}
+

lua/crentist/lazy/telescope.lua

@@ -22,10 +22,7 @@ return {
         telescope.setup({
             defaults = {
                 vimgrep_arguments = vimgrep_arguments,
-                file_ignore_patterns = {
-                    'node_modules',
-                    '.git/'
-                }
+                file_ignore_patterns = { "^.git/" }
             },
             extensions = {
                 fzf = {}
@@ -43,9 +40,9 @@ return {
                 prev = '<S-Tab>'
             },
             tabs = {
-                { name = 'Files',   tele_func = builtin.find_files, tele_opts = { no_ignore = true, hidden = true } },
-                { name = 'Grep',    tele_func = builtin.live_grep },
-                { name = 'Buffers', tele_func = builtin.buffers },
+                { name = 'Files',         tele_func = builtin.find_files,                                       tele_opts = { no_ignore = false, hidden = true, } },
+                { name = 'Advanced Grep', tele_func = require('crentist.telescope.advanced_grep').advanced_grep },
+                { name = 'Buffers',       tele_func = builtin.buffers },
             },
             append_tabs = {                -- append_tabs will add the provided tabs to the default ones
                 {
@@ -55,6 +52,21 @@ return {
                         return vim.fn.isdirectory('.git') == 1
                     end
                 },
+                {
+                    'Stash',
+                    builtin.git_stash,
+                    available = function()
+                        return vim.fn.isdirectory('.git') == 1
+                    end
+                },
+                {
+                    'All files',
+                    builtin.find_files,
+                    tele_opts = { no_ignore = true, hidden = true },
+                    available = function()
+                        return vim.fn.isdirectory('.git') == 1
+                    end
+                }
             },
         })
 

lua/crentist/lazy/treesitter.lua

@@ -1,32 +1,50 @@
 return {
     'nvim-treesitter/nvim-treesitter',
-    branch='master',
+    branch = 'main',
+    lazy = false,
     build = ":TSUpdate",
     config = function()
-        require("nvim-treesitter.configs").setup({
-            -- A list of parser names, or "all" (the five listed parsers should always be installed)
-            ensure_installed = { "bash", "javascript", "typescript", "python", "go", "terraform", "hcl", "helm", "jq", "yaml", "tmux", "lua", "vim", "vimdoc" },
-
-            -- Install parsers synchronously (only applied to `ensure_installed`)
-            sync_install = false,
-
-            -- Automatically install missing parsers when entering buffer
-            -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-            auto_install = true,
-
-            ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-            -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
-
-            highlight = {
-                enable = true,
-
-                -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-                -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-                -- Using this option may slow down your editor, and you may see some duplicate highlights.
-                -- Instead of true it can also be a list of languages
-                additional_vim_regex_highlighting = false,
-            },
-        })
+        local ts = require("nvim-treesitter")
+        local installed_parsers = {
+            "bash",
+            "javascript",
+            "typescript",
+            "python",
+            "go",
+            "terraform",
+            "hcl",
+            "helm",
+            "jq",
+            "yaml",
+            "tmux",
+            "lua",
+            "vim",
+            "vimdoc",
+            "latex",
+            "json",
+            "yaml",
+            "git_config",
+            "git_rebase",
+            "gitattributes",
+            "gitcommit",
+            "gitignore",
+            "make",
+            "markdown_inline",
+            "nginx",
+            "properties",
+            "ini",
+            "ssh_config",
+            "ssh_client_config",
+            "editorconfig",
+            "passwd",
+            "regex",
+            "sql",
+            "sqlite",
+            "toml",
+            "xml",
+        }
+        ts.setup()
+        ts.install(installed_parsers)
     end
 }
 

lua/crentist/luasnip.lua

@@ -1,128 +0,0 @@
--- luasnip.lua
-local ls = require('luasnip')
-local s = ls.snippet
-local i = ls.insert_node
-local f = ls.function_node
-local fmt = require("luasnip.extras.fmt").fmt
-
-vim.keymap.set({ "i", "s" }, "<C-l>", function()
-    if ls.expand_or_jumpable() then
-        ls.expand_or_jump()
-    end
-end, { desc = "Snippet next argument", silent = true })
-
---------------------
--- Snippets for LUA
---------------------
-ls.add_snippets('lua', {
-    s({ name = 'LuaSnip Snippet', trig = 'snipf' },
-        fmt([[
-        s({ name='<name>', trig='<trig>'},
-            fmt(<template>,
-                { <inputs> },
-                { <opts> }
-            )
-        ),
-        ]], {
-                name = i(1, 'name'),
-                trig = i(2, 'trig'),
-                template = i(3, '[[]]'),
-                inputs = i(4, 'nodes'),
-                opts = i(5,
-                    'opts')
-            },
-            { delimiters = '<>' }
-        )
-    ),
-    s({ name = 'Add snippets block', trig = 'add_snip' },
-        fmt([[
-        ls.add_snippets('<filetype>', {
-            <snippets>
-        })
-        ]],
-            { filetype = i(1, 'Filetype'), snippets = i(2, 'Snippets') },
-            { delimiters = '<>' }
-        )
-    ),
-})
-
---------------------
--- Generic snippets
---------------------
-local function com_string(_, snip, to_multiply)
-    local comment_string = vim.bo.commentstring
-    local repeats = snip.captures[1]
-    local result = comment_string:gsub("%%s", ""):gsub(" ", "")
-
-    if to_multiply then
-        return string.sub(
-            string.rep(result, repeats),
-            0,
-            repeats
-        )
-    end
-
-    return result
-end
-
-ls.add_snippets('all', {
-    s({ name = 'Comment block', trig = '#com(%d+)', regTrig = true },
-        fmt([[
-        {comment_block}
-        {comment} {comment_text}
-        {comment_block}
-        ]],
-            {
-                comment_block = f(com_string, {}, { user_args = { true } }),
-                comment = f(com_string, {}, { user_args = { false } }),
-                comment_text = i(1,
-                    'Comment')
-            }
-        )
-    ),
-})
-
---------------------
--- Terraform
---------------------
-ls.add_snippets('terraform', {
-    s({ name = 'data_assume', trig = 'tf_assume' },
-        fmt([[
-        data "aws_iam_policy_document" "<name>" {
-          statement {
-            actions = ["sts:AssumeRole"]
-
-            principals {
-              type        = "Service"
-              identifiers = ["<service>.amazonaws.com"]
-            }
-          }
-        }
-        ]],
-            {
-                name = i(1, 'assume'),
-                service = i(2, 'service')
-            },
-            { delimiters = '<>' }
-        )
-    ),
-})
-
-------------------------------
--- YAML
-------------------------------
-local yaml_schema_snippet = s(
-    { name = 'yaml_schema', trig = 'yaml_schema' },
-    fmt([[
-        {comment} yaml-language-server: $schema={path}
-        ]],
-        {
-            path = i(1, 'path'),
-            comment = f(com_string, {}, { user_args = { false } }),
-        }
-    )
-)
-
-ls.add_snippets('yaml', { yaml_schema_snippet })
-ls.add_snippets('helm', { yaml_schema_snippet })
-

lua/crentist/null-ls.lua

@@ -1,3 +1,56 @@
--- https://www.youtube.com/watch?v=q-oBU2fO1H4&t=189s
-local null_ls = require("null-ls")
+local null_ls = require('null-ls')
+local plenary = require('plenary')
+
+local kustomize_condition = function(node, params)
+    if node == nil then return false end
+
+    if vim.treesitter.get_node_text(node, params['bufnr']) ~= 'resources' then return false end
+
+    return true
+end
+
+---@module 'null-ls'
+---@type
+local kustomize_action = {
+    method = null_ls.methods.CODE_ACTION,
+    filetypes = { 'yaml' },
+    generator = {
+        fn = function(params)
+            local out = {}
+            local node = vim.treesitter.get_node()
+            if kustomize_condition(node, params) then
+                table.insert(out, {
+                    title = '📁 Create resources',
+                    action = function()
+                        local node_below = vim.treesitter.get_node({ bufnr = 0, pos = { params['row'] + 1, 0 } })
+
+                        if node_below == nil or node_below:type() ~= 'block_sequence' then
+                            vim.api.nvim_echo({ { '❌Failed to get list items.', 'Normal' } }, false, {})
+                            return
+                        end
+
+                        local checked_files = ''
+                        for list_item, _ in node_below:iter_children() do
+                            if list_item ~= nil then
+                                local item_value_node = list_item:child(1) -- 0 is `-`, 1 is the actual value
+                                if item_value_node ~= nil then
+                                    local file_name = vim.treesitter.get_node_text(item_value_node, params['bufnr'])
+                                    local file_name_path = plenary.path.new(file_name)
+                                    local current_file = plenary.path.new(vim.fn.expand('%'))
+                                    local parent = plenary.path.new(current_file:parents()[1])
+                                    local new_file = parent / file_name
+                                    new_file:touch({mode=644})
+                                end
+                            end
+                        end
+                    end,
+                })
+            end
+            return out
+        end,
+    },
+}
+
+-- null_ls.deregister(kustomize_action)
+null_ls.register(kustomize_action)
 

lua/crentist/remap.lua

@@ -2,6 +2,8 @@ vim.g.mapleader = " "
 vim.keymap.set("n", "<leader>Pv", ":Oil .<CR>")
 vim.keymap.set("n", "<leader>pv", ":Oil<CR>")
 
+vim.keymap.set("n", "<leader>pt", ":Neotree .<CR>")
+
 vim.keymap.set("n", "<C-d>", "<C-d>zz")
 vim.keymap.set("n", "<C-u>", "<C-u>zz")
 
@@ -28,6 +30,9 @@ vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
 vim.keymap.set("n", "Q", "<nop>")
 
 vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<leader>S", [[:%s/\<<C-r><C-a>\>/<C-r><C-a>/gI<Left><Left><Left>]])
+
+vim.keymap.set("v", "<leader>s", [["vy:%s/\<<C-r>v\>/<C-r>v/gI<Left><Left><Left>]])
 
 vim.keymap.set("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
 
@@ -38,3 +43,9 @@ vim.keymap.set("v", "<leader>x", ":lua<CR>")
 vim.keymap.set("n", "<C-M-j>", "<cmd>cnext<CR>")
 vim.keymap.set("n", "<C-M-k>", "<cmd>cprev<CR>")
 
+vim.keymap.set({ 'i', 's' }, '<C-l>', function()
+    if ls.expand_or_jumpable() then
+        ls.expand_or_jump()
+    end
+end, { desc = 'Snippet next argument', silent = true })
+

lua/crentist/set.lua

@@ -8,6 +8,8 @@ vim.opt.softtabstop = 4
 vim.opt.shiftwidth = 4
 vim.opt.expandtab = true
 
+vim.o.winborder = ''
+
 vim.opt.smartindent = true
 
 vim.opt.wrap = false
@@ -30,3 +32,5 @@ vim.opt.updatetime = 50
 
 vim.opt.colorcolumn = "80"
 
+vim.opt.diffopt = 'internal,filler,closeoff,algorithm:histogram'
+

lua/crentist/snippets/common.lua

@@ -0,0 +1,39 @@
+local ls = require('luasnip')
+local s = ls.snippet
+local i = ls.insert_node
+local f = ls.function_node
+local fmt = require('luasnip.extras.fmt').fmt
+
+local function com_string(_, snip, to_multiply)
+    local comment_string = vim.bo.commentstring
+    local repeats = snip.captures[1]
+    local result = comment_string:gsub('%%s', ''):gsub(' ', '')
+
+    if to_multiply then
+        return string.sub(
+            string.rep(result, repeats),
+            0,
+            repeats
+        )
+    end
+
+    return result
+end
+
+ls.add_snippets('all', {
+    s({ name = 'Comment block', trig = '#com(%d+)', regTrig = true },
+        fmt([[
+        {comment_block}
+        {comment} {comment_text}
+        {comment_block}
+        ]],
+            {
+                comment_block = f(com_string, {}, { user_args = { true } }),
+                comment = f(com_string, {}, { user_args = { false } }),
+                comment_text = i(1,
+                    'Comment')
+            }
+        )
+    ),
+})
+

lua/crentist/snippets/init.lua

@@ -0,0 +1,5 @@
+require('crentist.snippets.common')
+require('crentist.snippets.lua')
+require('crentist.snippets.terraform')
+require('crentist.snippets.yaml')
+

lua/crentist/snippets/lua.lua

@@ -0,0 +1,38 @@
+local ls = require('luasnip')
+local s = ls.snippet
+local i = ls.insert_node
+local f = ls.function_node
+local fmt = require('luasnip.extras.fmt').fmt
+
+ls.add_snippets('lua', {
+    s({ name = 'LuaSnip Snippet', trig = 'snipf' },
+        fmt([[
+        s({ name='<name>', trig='<trig>'},
+            fmt(<template>,
+                { <inputs> },
+                { <opts> }
+            )
+        ),
+        ]], {
+                name = i(1, 'name'),
+                trig = i(2, 'trig'),
+                template = i(3, '[[]]'),
+                inputs = i(4, 'nodes'),
+                opts = i(5,
+                    'opts')
+            },
+            { delimiters = '<>' }
+        )
+    ),
+    s({ name = 'Add snippets block', trig = 'add_snip' },
+        fmt([[
+        ls.add_snippets('<filetype>', {
+            <snippets>
+        })
+        ]],
+            { filetype = i(1, 'Filetype'), snippets = i(2, 'Snippets') },
+            { delimiters = '<>' }
+        )
+    ),
+})
+

lua/crentist/snippets/terraform.lua

@@ -0,0 +1,29 @@
+local ls = require('luasnip')
+local s = ls.snippet
+local i = ls.insert_node
+local f = ls.function_node
+local fmt = require('luasnip.extras.fmt').fmt
+
+ls.add_snippets('terraform', {
+    s({ name = 'data_assume', trig = 'tf_assume' },
+        fmt([[
+        data "aws_iam_policy_document" "<name>" {
+          statement {
+            actions = ["sts:AssumeRole"]
+
+            principals {
+              type        = "Service"
+              identifiers = ["<service>.amazonaws.com"]
+            }
+          }
+        }
+        ]],
+            {
+                name = i(1, 'assume'),
+                service = i(2, 'service')
+            },
+            { delimiters = '<>' }
+        )
+    ),
+})
+

lua/crentist/snippets/yaml.lua

@@ -0,0 +1,64 @@
+local ls = require('luasnip')
+local s = ls.snippet
+local i = ls.insert_node
+local f = ls.function_node
+local fmt = require('luasnip.extras.fmt').fmt
+
+------------------------------
+-- YAML
+------------------------------
+local yaml_schema_snippet = s(
+    { name = 'yaml_schema', trig = 'yaml_schema' },
+    fmt([[
+        {comment} yaml-language-server: $schema={path}
+        ]],
+        {
+            path = i(1, 'path'),
+            comment = f(com_string, {}, { user_args = { false } }),
+        }
+    )
+)
+
+ls.add_snippets('yaml', { yaml_schema_snippet })
+ls.add_snippets('helm', { yaml_schema_snippet })
+
+local flux_cd_kustomization = s(
+    { name = 'fluxcd_kustomization', trig = 'fluxkust' },
+    fmt([[
+    apiVersion: kustomize.toolkit.fluxcd.io/v1
+    kind: Kustomization
+    metadata:
+      name: {name}
+      namespace: {namespace}
+    spec:
+      interval: {interval}
+      path: {path}
+      prune: true
+      sourceRef:
+        kind: GitRepository
+        name: {repository_name}
+    ]],
+        {
+            name = i(1, 'name'),
+            namespace = i(2, 'flux-system'),
+            interval = i(3, '5m'),
+            path = i(4, 'path'),
+            repository_name = i(5, 'repository_name'),
+        }
+    )
+)
+
+ls.add_snippets('yaml', { flux_cd_kustomization })
+
+local sleep_command = s(
+    { name = 'sleep_command', trig = 'sleep' },
+    fmt([[
+    command:
+      - /bin/sh
+      - -c
+      - while true; do sleep 3600; done
+    ]], {})
+)
+
+ls.add_snippets('yaml', { sleep_command })
+

lua/crentist/telescope/advanced_grep.lua

@@ -0,0 +1,64 @@
+local pickers = require("telescope.pickers")
+local finders = require("telescope.finders")
+local make_entry = require("telescope.make_entry")
+local conf = require("telescope.config").values
+
+local M = {}
+
+local advanced_grep = function(opts)
+    opts = opts or {}
+    opts.cwd = opts.cwd or vim.uv.cwd()
+
+
+    local finder = finders.new_async_job({
+        command_generator = function(prompt)
+            if not prompt or prompt == "" then
+                return nil
+            end
+
+            local pieces = vim.split(prompt, "  ")
+
+            local args = { "rg" }
+
+            if pieces[1] then
+                table.insert(args, "-e")
+                table.insert(args, pieces[1])
+            end
+
+            if pieces[2] then
+                table.insert(args, "-g")
+
+                local input_glob = pieces[2]
+                local glob = input_glob
+                if not input_glob:find("*", 1, true) then
+                    glob = "*" .. input_glob .. "*"
+                    if input_glob:find("d:", 1, true) then
+                        glob = "**/" .. glob .. "/**"
+                        glob = glob:gsub("d:", "")
+                    end
+                end
+                table.insert(args, glob)
+            end
+
+            return vim.iter({ args, { "--color=never", "--no-heading", "--with-filename", "--line-number", "--column", "--smart-case" } })
+                :flatten()
+                :totable()
+        end,
+        entry_maker = make_entry.gen_from_vimgrep(opts),
+        cwd = opts.cwd,
+    })
+
+    pickers.new(opts, {
+        debounce = 100,
+        prompt_title = "Advanced Grep",
+        finder = finder,
+        previewer = conf.grep_previewer(opts),
+        sorter = require("telescope.sorters").empty(),
+    }):find()
+end
+
+
+M.advanced_grep = advanced_grep
+
+return M
+