dadbod ui location, enable completion for mysql

remove diffopt to avoid bad experience in 3-way merges

.luarc.json

@@ -0,0 +1,7 @@
+{
+    "diagnostics.disable": [
+        "undefined-global",
+        "unused-local"
+    ]
+}
+

README.md

@@ -1,3 +1,4 @@
 # My nvim configuration
 
 This mostly copies ThePrimeagen configs with some changes because I don't use dvorak
+

after/ftplugin/helm.lua

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

after/ftplugin/make.lua

@@ -0,0 +1,12 @@
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4
+vim.opt_local.expandtab = false
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "make",
+    callback = function()
+        print("Makefile detected and ftplugin loaded!")
+    end,
+})
+

after/ftplugin/markdown.lua

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

after/ftplugin/nix.lua

@@ -0,0 +1,4 @@
+vim.opt.shiftwidth = 2
+vim.opt.tabstop = 2
+vim.opt.expandtab = true
+

after/ftplugin/python.lua

@@ -0,0 +1 @@
+vim.opt.colorcolumn = "95"

after/ftplugin/terraform.lua

@@ -0,0 +1,6 @@
+vim.opt.colorcolumn = "95"
+vim.opt.shiftwidth = 2
+vim.opt.tabstop = 2
+vim.opt.expandtab = true
+vim.bo.commentstring = '# %s'
+

after/ftplugin/yaml.lua

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

init.lua

@@ -1 +1,2 @@
 require("crentist")
+

lazy-lock.json

@@ -1,34 +1,50 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
-  "git-blame.nvim": { "branch": "master", "commit": "408d5487d908dfe5d48e5645d8b27ddcc16b11e0" },
-  "gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" },
-  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
-  "lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
-  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
-  "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
-  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "blink-ripgrep.nvim": { "branch": "main", "commit": "0c0d9db740ca70aa739e40f50589b01e537ade6d" },
+  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
+  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
+  "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "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": "160228946bed9998f5e3b168bd0b66ba2690f8f3" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "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": "92166b89ab4b3d60f24e58170cac53b7141fd032" },
-  "nvim-surround": { "branch": "main", "commit": "f1f0699a1d49f28e607ffa4361f1bbe757ac5ebc" },
-  "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
-  "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" },
+  "nvim-navic": { "branch": "master", "commit": "099b4c8cdc3e9ea026ea6b2a0d315e2d28362242" },
+  "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
+  "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" },
-  "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
-  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
-  "vim-gitgutter": { "branch": "main", "commit": "e801371917e52805a4ceb1e93f55ed1fba712f82" }
+  "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": "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

@@ -0,0 +1,87 @@
+local autocmd = vim.api.nvim_create_autocmd
+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.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,
+})
+
+-- 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,
+})
+
+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/filetype.lua

@@ -0,0 +1,20 @@
+vim.filetype.add({
+    extension = {
+        ['tf'] = 'terraform',
+    },
+    pattern = {
+        ['.*/playbooks/.*%.ya?ml'] = 'yaml.ansible',
+        ['.*/roles/.*%.ya?ml'] = 'yaml.ansible',
+        ['.*/tasks/.*%.ya?ml'] = 'yaml.ansible',
+        ['.*/plays/.*%.ya?ml'] = 'yaml.ansible',
+    },
+})
+
+vim.filetype.add({
+    extension = {
+        j2 = 'jinja',
+        jinja = 'jinja',
+        jinja2 = 'jinja',
+    }
+})
+

lua/crentist/init.lua

@@ -1,25 +1,8 @@
 require("crentist.remap")
 require("crentist.set")
 require("crentist.lazy_init")
+require("crentist.autocmd")
+require("crentist.filetype")
+require("crentist.luasnip")
+require("crentist.null-ls")
 
-local augroup = vim.api.nvim_create_augroup
-local CrentistGroup = augroup('Crentist', {})
-local autocmd = vim.api.nvim_create_autocmd
-
-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() vim.lsp.buf.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>", "<cmd>lua vim.lsp.buf.format()<CR>")
-    end
-})

lua/crentist/lazy/autopairs.lua

@@ -1,5 +0,0 @@
-return {
-    'windwp/nvim-autopairs',
-    event = "InsertEnter",
-    config = true
-}

lua/crentist/lazy/colors.lua

@@ -1,16 +1,44 @@
 return {
     {
-        "ellisonleao/gruvbox.nvim",
+        'ellisonleao/gruvbox.nvim',
         priority = 1000,
         config = function()
-            require("gruvbox").setup({})
-            vim.cmd("colorscheme gruvbox")
+            local gruvbox = require('gruvbox')
+
+            ---@module 'gruvbox'
+            ---@type GruvboxConfig
+            local gruvbox_settings = {
+                transparent_mode = false,
+                italic = {
+                    strings = false,
+                    emphasis = true,
+                    comments = true,
+                    operators = false,
+                    folds = true,
+                },
+                overrides = {
+                    FoldColumn = { bg = '#282828', fg = '#808080' },
+                    GruvboxRedSign = { bg = '' },
+                    GruvboxGreenSign = { bg = '' },
+                    GruvboxYellowSign = { bg = '' },
+                    GruvboxBlueSign = { bg = '' },
+                    GruvboxPurpleSign = { bg = '' },
+                    GruvboxAquaSign = { bg = '' },
+                    GruvboxOrangeSign = { bg = '' },
+                }
+            }
+
+            gruvbox.setup(gruvbox_settings)
+            vim.cmd('colorscheme gruvbox')
+
+            vim.api.nvim_set_hl(0, 'SignColumn', { link = 'FoldColumn' })
         end
     },
     {
-        "norcalli/nvim-colorizer.lua",
-        config = function ()
+        'norcalli/nvim-colorizer.lua',
+        config = function()
             require('colorizer').setup({ '*' })
         end
     }
 }
+

lua/crentist/lazy/completion.lua

@@ -0,0 +1,104 @@
+return {
+    'saghen/blink.cmp',
+    -- optional: provides snippets for the snippet source
+    dependencies = {
+        'mikavilpas/blink-ripgrep.nvim',
+        'rafamadriz/friendly-snippets',
+        { 'L3MON4D3/LuaSnip', version = 'v2.*' }
+    },
+    -- use a release tag to download pre-built binaries
+    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 = {
+            keymap = { preset = 'cmdline' },
+            completion = {
+                list = { selection = { preselect = false, auto_insert = true } }
+            }
+        },
+        completion = { list = { selection = { preselect = false, auto_insert = true } } },
+        keymap = {
+            preset = 'enter',
+            ['<Tab>'] = { 'select_next', 'snippet_forward', 'fallback' },
+            ['<S-Tab>'] = { 'select_prev', 'snippet_backward', 'fallback' },
+        },
+
+        appearance = {
+            use_nvim_cmp_as_default = true,
+            nerd_font_variant = 'mono'
+        },
+
+        sources = {
+            default = { 'lazydev', 'lsp', 'snippets', 'ripgrep', 'path', 'buffer' },
+            per_filetype = {
+                sql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' },
+                mysql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' },
+            },
+            providers = {
+                lazydev = {
+                    name = 'LazyDev',
+                    module = 'lazydev.integrations.blink',
+                    -- make lazydev completions top priority (see `:h blink.cmp`)
+                    score_offset = 100,
+                },
+                ripgrep = {
+                    module = 'blink-ripgrep',
+                    name = 'Ripgrep',
+                    score_offset = -5,
+                    -- the options below are optional, some default values are shown
+                    ---@module 'blink-ripgrep'
+                    ---@type blink-ripgrep.Options
+                    opts = {
+                        backend = {
+                            use = 'ripgrep',
+                        },
+                        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
+                            -- example: append a description to easily distinguish rg results
+                            item.labelDetails = {
+                                description = '(rg)',
+                            }
+                        end
+                        return items
+                    end,
+                },
+                dadbod = {
+                    name = 'Dadbod', module = 'vim_dadbod_completion.blink'
+                },
+            },
+        },
+
+        signature = { enabled = true }
+    },
+}
+

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/dressing.lua

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

lua/crentist/lazy/fugitive.lua

@@ -1,34 +1,37 @@
 return {
-    "tpope/vim-fugitive",
+    'tpope/vim-fugitive',
     config = function()
-        vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
+        vim.keymap.set('n', "<leader>gs", vim.cmd.Git)
 
-        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);
+                vim.keymap.set('n', "<leader>t", ":Git push -u origin ", opts);
             end,
         })
     end
 }
+

lua/crentist/lazy/git-blame.lua

@@ -1,22 +0,0 @@
-return {
-    'f-person/git-blame.nvim',
-    config = function()
-        local gitblame = require('gitblame')
-        gitblame.setup({
-            enabled = true,
-            date_format = '%r'
-        })
-        vim.keymap.set("n", "<leader>gbt", function()
-            gitblame.toggle()
-        end)
-
-        local CrentistGitBlame = vim.api.nvim_create_augroup("CrentistGitBlame", {})
-        vim.api.nvim_create_autocmd({ "FileType" }, {
-            group = CrentistGitBlame,
-            pattern = "netrw",
-            callback = function()
-                gitblame.disable()
-            end,
-        })
-    end
-}

lua/crentist/lazy/gitgutter.lua

@@ -1,3 +0,0 @@
-return {
-    "airblade/vim-gitgutter",
-}

lua/crentist/lazy/gitsigns.lua

@@ -0,0 +1,74 @@
+return {
+    '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,18 +1,44 @@
 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())
 
-        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)
+        -- basic telescope configuration
+        local conf = require('telescope.config').values
+        local function toggle_telescope(harpoon_files)
+            local file_paths = {}
+            for _, item in ipairs(harpoon_files.items) do
+                table.insert(file_paths, item.value)
+            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)
+            require('telescope.pickers').new({}, {
+                prompt_title = 'Harpoon',
+                finder = require('telescope.finders').new_table({
+                    results = file_paths,
+                }),
+                previewer = conf.file_previewer({}),
+                sorter = conf.generic_sorter({}),
+            }):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', '<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,92 +1,95 @@
 return {
-    "neovim/nvim-lspconfig",
+    'neovim/nvim-lspconfig',
+    version = '^2.3.0',
     dependencies = {
-        "williamboman/mason.nvim",
-        "williamboman/mason-lspconfig.nvim",
-        "hrsh7th/cmp-nvim-lsp",
-        "hrsh7th/cmp-buffer",
-        "hrsh7th/cmp-path",
-        "SergioRibera/cmp-dotenv",
-        "hrsh7th/cmp-cmdline",
-        "hrsh7th/nvim-cmp",
-        "L3MON4D3/LuaSnip",
-        "saadparwaiz1/cmp_luasnip",
-        "j-hui/fidget.nvim",
+        'williamboman/mason.nvim',
+        'williamboman/mason-lspconfig.nvim',
+        'saghen/blink.cmp',
+        'L3MON4D3/LuaSnip',
+        'j-hui/fidget.nvim',
+        'rafamadriz/friendly-snippets',
+        { 'towolf/vim-helm', ft = 'helm' },
+        {
+            'folke/lazydev.nvim',
+            ft = 'lua', -- only load on lua files
+            opts = {
+                library = {
+                    -- See the configuration section for more details
+                    -- Load luvit types when the `vim.uv` word is found
+                    { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
+                },
+            },
+        },
     },
 
     config = function()
-        local cmp = require('cmp')
-        local luasnip = require("luasnip")
+        vim.diagnostic.config({ virtual_text = false })
 
-        require("fidget").setup({})
+        local lspconfig = require('lspconfig')
+
+        -- load snippets from friendly-snippets
+        require('luasnip.loaders.from_vscode').lazy_load()
+
+        require('fidget').setup({})
         require('mason').setup({})
+        ---@module 'mason-lspconfig'
+        ---@type MasonLspconfigSettings
         require('mason-lspconfig').setup({
+            automatic_enable = true,
             -- Replace the language servers listed here
             -- with the ones you want to install
-            ensure_installed = { 'tsserver', 'lua_ls', 'gopls', 'pylsp', 'gitlab_ci_ls', 'yamlls' },
-            handlers = {
-                function(server_name)
-                    require('lspconfig')[server_name].setup({})
-                end,
+            ensure_installed = {
+                'ts_ls',
+                'lua_ls',
+                'gopls',
+                'pylsp',
+                'gitlab_ci_ls',
+                'yamlls',
+                'ansiblels',
+                'terraformls',
+                'helm_ls',
+                'marksman',
+            },
+        })
+
+        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'] = {
+                    plugins = {
+                        autopep8 = {
+                            enabled = false,
+                        },
+                        yapf = {
+                            enabled = true,
+                        },
+                        pycodestyle = {
+                            ignore = { 'W391' },
+                            maxLineLength = 95,
+                        }
+                    }
+                }
             }
         })
-        cmp.setup({
-            sources = {
-                { name = 'path' },
-                { name = 'nvim_lsp' },
-                { name = 'dotenv' },
-                { name = 'luasnip', keyword_length = 2 },
-                { name = 'buffer',  keyword_length = 3 },
-            },
-            mapping = cmp.mapping.preset.insert({
-                -- `Enter` key to confirm completion
-                ['<CR>'] = cmp.mapping(function(fallback)
-                    if cmp.visible() then
-                        if luasnip.expandable() then
-                            luasnip.expand()
-                        else
-                            cmp.confirm({
-                                select = true,
-                            })
-                        end
-                    else
-                        fallback()
-                    end
-                end),
 
-                ["<Tab>"] = cmp.mapping(function(fallback)
-                    if cmp.visible() then
-                        cmp.select_next_item()
-                    elseif luasnip.locally_jumpable(1) then
-                        luasnip.jump(1)
-                    else
-                        fallback()
-                    end
-                end, { "i", "s" }),
-
-                ["<S-Tab>"] = cmp.mapping(function(fallback)
-                    if cmp.visible() then
-                        cmp.select_prev_item()
-                    elseif luasnip.locally_jumpable(-1) then
-                        luasnip.jump(-1)
-                    else
-                        fallback()
-                    end
-                end, { "i", "s" }),
-
-                -- Ctrl+Space to trigger completion menu
-                ['<C-Space>'] = cmp.mapping.complete(),
-
-                -- Scroll up and down in the completion documentation
-                ['<C-u>'] = cmp.mapping.scroll_docs(-4),
-                ['<C-d>'] = cmp.mapping.scroll_docs(4),
-            }),
-            snippet = {
-                expand = function(args)
-                    require('luasnip').lsp_expand(args.body)
-                end,
-            },
+        vim.lsp.config('helm-ls', {
+            settings = {
+                ['helm-ls'] = {
+                    helmLint = { enabled = false },
+                    yamlls = { enabled = false },
+                },
+            }
+        })
 
+        vim.lsp.config('terraformls', {
+            filetypes = { 'terraform', 'terraform-vars', 'tf' }
         })
     end
 }
+

lua/crentist/lazy/lualine.lua

@@ -1,6 +1,9 @@
 return {
     'nvim-lualine/lualine.nvim',
-    dependencies = { 'nvim-tree/nvim-web-devicons', branch = 'master' },
+    dependencies = {
+        { 'nvim-tree/nvim-web-devicons', branch = 'master', },
+        'SmiteshP/nvim-navic',
+    },
     config = function()
         local colors = {
             black        = '#282828',
@@ -14,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',
-                    function()
-                        return require("nvim-treesitter").statusline({
-                            indicator_size = 70,
-                            type_patterns = { "class", "function", "method" },
-                            separator = " -> ",
-                        })
-                    end,
-                }
-            }
-        })
+            })
     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

@@ -0,0 +1,16 @@
+return {
+    'SmiteshP/nvim-navic',
+    dependencies = {
+        'neovim/nvim-lspconfig'
+    },
+    config = function ()
+        local navic = require('nvim-navic')
+        navic.setup({
+            lsp = {
+                auto_attach = true,
+                preference = { 'helm_ls', 'yamlls' }
+            }
+        })
+    end
+}
+

lua/crentist/lazy/neodev.lua

@@ -1,3 +0,0 @@
-return {
-    { "folke/neodev.nvim", opts = {} }
-}

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/none-ls.lua

@@ -0,0 +1,11 @@
+return {
+    'nvimtools/none-ls.nvim',
+    -- Optional dependencies
+    dependencies = { 'nvim-lua/plenary.nvim' },
+    opts = {},
+    config = function()
+        local null_ls = require('null-ls')
+        null_ls.setup({})
+    end
+}
+

lua/crentist/lazy/obsidian.lua

@@ -0,0 +1,61 @@
+return {
+    'obsidian-nvim/obsidian.nvim',
+    version = '*', -- recommended, use latest release instead of latest commit
+    dependencies = {
+        -- Required.
+        'nvim-lua/plenary.nvim',
+    },
+    keys = {
+        { '<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.
+        ["gf"] = {
+            action = function()
+                return require("obsidian").util.gf_passthrough()
+            end,
+            opts = { noremap = false, expr = true, buffer = true },
+        },
+        -- Toggle check-boxes.
+        ["<leader>ch"] = {
+            action = function()
+                return require("obsidian").util.toggle_checkbox()
+            end,
+            opts = { buffer = true },
+        },
+        -- Smart action depending on context, either follow link or toggle checkbox.
+        ["<cr>"] = {
+            action = function()
+                return require("obsidian").util.smart_action()
+            end,
+            opts = { buffer = true, expr = true },
+        },
+    },
+    opts = {
+        legacy_commands = false,
+        workspaces = {
+            {
+                name = 'tech-work-hobby',
+                path = '/Users/rtim/Documents/Notes/tech-work-hobby/',
+            },
+        },
+        daily_notes = {
+            folder = 'Daily',
+            date_format = '%Y-%m-%d (%A)',
+            default_tags = { 'daily' },
+            template = 'Daily.md',
+        },
+        templates = {
+            folder = 'Templates',
+        },
+        completion = {
+            blink = true,
+            nvim_cmp = false,
+        },
+        ui = {
+            enable = false,
+        },
+    },
+}
+

lua/crentist/lazy/oil.lua

@@ -0,0 +1,28 @@
+return {
+    'stevearc/oil.nvim',
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
+    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/parrot.lua

@@ -0,0 +1,43 @@
+return {
+    'frankroeder/parrot.nvim',
+    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" },
+                headers = function(self)
+                    return {
+                        ['Content-Type'] = "application/json",
+                        ['x-api-key'] = self.api_key,
+                        ['anthropic-version'] = "2023-06-01",
+                    }
+                end,
+                params = {
+                    chat = { max_tokens = 4096 },
+                    command = { max_tokens = 4096 },
+                },
+                models = {
+                    '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")
+                    end
+                    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
+                        table.remove(payload.messages, 1)
+                    end
+                    return payload
+                end,
+            }
+        }
+    }
+}
+

lua/crentist/lazy/sops.lua

@@ -0,0 +1,10 @@
+return {
+    'lucidph3nx/nvim-sops',
+    event = { 'BufEnter' },
+    opts = { },
+    keys = {
+        { '<leader>ef', vim.cmd.SopsEncrypt, desc = '[E]ncrypt [F]ile' },
+        { '<leader>df', vim.cmd.SopsDecrypt, desc = '[D]ecrypt [F]ile' },
+    },
+}
+

lua/crentist/lazy/surround.lua

@@ -3,8 +3,7 @@ return {
     version = "*", -- Use for stability; omit to use `main` branch for the latest features
     event = "VeryLazy",
     config = function()
-        require("nvim-surround").setup({
-            -- Configuration here, or leave empty to use defaults
-        })
+        require("nvim-surround").setup({})
     end
 }
+

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

@@ -1,14 +1,36 @@
 return {
-    "FabianWirth/search.nvim",
+    'FabianWirth/search.nvim',
     dependencies = {
-        "nvim-lua/plenary.nvim",
-        "nvim-telescope/telescope.nvim",
+        'nvim-lua/plenary.nvim',
+        {
+            'nvim-telescope/telescope.nvim',
+            dependencies = {
+                { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }
+            }
+        },
     },
 
-    version = "0.1.6",
-
     config = function()
-        require('telescope').setup({})
+        local telescope = require('telescope')
+        local telescopeConfig = require('telescope.config')
+
+        local vimgrep_arguments = { unpack(telescopeConfig.values.vimgrep_arguments) }
+        table.insert(vimgrep_arguments, '--hidden')
+        table.insert(vimgrep_arguments, '--glob')
+        table.insert(vimgrep_arguments, '!**/.git/*')
+
+        telescope.setup({
+            defaults = {
+                vimgrep_arguments = vimgrep_arguments,
+                file_ignore_patterns = { "^.git/" }
+            },
+            extensions = {
+                fzf = {}
+            }
+        })
+
+        telescope.load_extension('fzf')
+
         local search = require('search')
         local builtin = require('telescope.builtin')
 
@@ -17,29 +39,53 @@ return {
                 next = '<Tab>',
                 prev = '<S-Tab>'
             },
+            tabs = {
+                { 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
                 {
-                    'Commits',             -- or name = "Commits"
+                    'Commits',             -- or name = 'Commits'
                     builtin.git_commits,   -- or tele_func = require('telescope.builtin').git_commits
                     available = function() -- optional
                         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
+                }
             },
         })
 
         vim.keymap.set('n', '<leader>pf', search.open, {})
+        vim.keymap.set('n', '<leader>pb', function()
+            search.open({ tab_name = 'Buffers' })
+        end)
         vim.keymap.set('n', '<leader>pws', function()
-            local word = vim.fn.expand("<cword>")
+            local word = vim.fn.expand('<cword>')
             builtin.grep_string({ search = word })
         end)
         vim.keymap.set('n', '<leader>pWs', function()
-            local word = vim.fn.expand("<cWORD>")
+            local word = vim.fn.expand('<cWORD>')
             builtin.grep_string({ search = word })
         end)
         vim.keymap.set('n', '<leader>ps', function()
-            builtin.grep_string({ search = vim.fn.input("Grep > ") })
+            builtin.grep_string({ search = vim.fn.input('Grep > ') })
         end)
         vim.keymap.set('n', '<leader>vh', builtin.help_tags, {})
     end
 }
+

lua/crentist/lazy/treesitter.lua

@@ -1,30 +1,50 @@
 return {
-    "nvim-treesitter/nvim-treesitter",
+    'nvim-treesitter/nvim-treesitter',
+    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/lazy/trouble.lua

@@ -0,0 +1,37 @@
+return {
+  "folke/trouble.nvim",
+  opts = {}, -- for default options, refer to the configuration section for custom setup.
+  cmd = "Trouble",
+  keys = {
+    {
+      "<leader>tt",
+      "<cmd>Trouble diagnostics toggle<cr>",
+      desc = "Diagnostics (Trouble)",
+    },
+    {
+      "<leader>tT",
+      "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+      desc = "Buffer Diagnostics (Trouble)",
+    },
+    {
+      "<leader>ts",
+      "<cmd>Trouble symbols toggle focus=false<cr>",
+      desc = "Symbols (Trouble)",
+    },
+    {
+      "<leader>tl",
+      "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+      desc = "LSP Definitions / references / ... (Trouble)",
+    },
+    {
+      "<leader>tL",
+      "<cmd>Trouble loclist toggle<cr>",
+      desc = "Location List (Trouble)",
+    },
+    {
+      "<leader>tQ",
+      "<cmd>Trouble qflist toggle<cr>",
+      desc = "Quickfix List (Trouble)",
+    },
+  },
+}

lua/crentist/lazy/ufo.lua

@@ -0,0 +1,43 @@
+return {
+    'kevinhwang91/nvim-ufo',
+    event = 'BufReadPost',
+    dependencies = {
+        'kevinhwang91/promise-async',
+        'nvim-treesitter/nvim-treesitter',
+        {
+            'luukvbaal/statuscol.nvim',
+            config = function()
+                local builtin = require('statuscol.builtin')
+                require('statuscol').setup({
+                    relculright = true,
+                    segments = {
+                        { text = { builtin.foldfunc },      sign = { colwidth = 1 }, click = 'v:lua.ScFa', },
+                        { text = { '%s' },                  sign = { colwidth = 1 }, click = 'v:lua.ScSa', hl = 'FoldColumn' },
+                        { text = { builtin.lnumfunc, ' ' }, click = 'v:lua.ScLa',    hl = 'FoldColumn' },
+                    },
+                })
+            end
+        }
+    },
+    init = function()
+        vim.opt.foldenable = true
+        vim.opt.foldcolumn = '1'
+        vim.opt.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
+        vim.opt.foldlevelstart = 99
+        vim.opt.fillchars = 'eob: ,fold: ,foldopen:,foldsep: ,foldclose:'
+        vim.opt.foldtext = ''
+    end,
+    opts = {
+        provider_selector = function(bufnr, filetype, buftype)
+            return { 'treesitter', 'indent' }
+        end
+    },
+    config = function()
+        require('ufo').setup({
+            provider_selector = function(bufnr, filetype, buftype)
+                return { 'treesitter', 'indent' }
+            end
+        })
+    end
+}
+

lua/crentist/lazy/vim-be-good.lua

@@ -1,3 +0,0 @@
-return {
-    'ThePrimeagen/vim-be-good'
-}

lua/crentist/luasnip.lua

@@ -0,0 +1,158 @@
+-- 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
+local vscode_loader = require("luasnip.loaders.from_vscode")
+
+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 })
+
+
+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 })
+

lua/crentist/null-ls.lua

@@ -0,0 +1,56 @@
+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

@@ -1,5 +1,11 @@
 vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
+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")
 
 -- move selected blocks
 vim.keymap.set("v", "<S-J>", ":m '>+1<CR>gv=gv")
@@ -24,3 +30,16 @@ 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>")
+
+vim.keymap.set("n", "<leader><leader>x", "<cmd>source %<CR>")
+vim.keymap.set("n", "<leader>x", ":.lua<CR>")
+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>")
+

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
@@ -23,10 +25,12 @@ vim.opt.incsearch = true
 vim.opt.termguicolors = true
 
 vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes"
+vim.opt.signcolumn = "yes:1"
 vim.opt.isfname:append("@-@")
 
 vim.opt.updatetime = 50
 
 vim.opt.colorcolumn = "80"
 
+vim.opt.diffopt = 'internal,filler,closeoff,algorithm:histogram'
+

lua/crentist/telescope/advanced_grep.lua

@@ -0,0 +1,54 @@
+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")
+                table.insert(args, pieces[2])
+            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
+