add nixd config, remove unwanted servers

2024-10-27 21:31:17 +02:00
51 changed files with 490 additions and 1175 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +0,0 @@
-lua/testing
-
--- a/.luarc.json
+++ b/.luarc.json
@@ -1,7 +0,0 @@
-{
-    "diagnostics.disable": [
-        "undefined-global",
-        "unused-local"
-    ]
-}
-
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
 # My nvim configuration

 This mostly copies ThePrimeagen configs with some changes because I don't use dvorak
-
--- a/after/ftplugin/helm.lua
+++ b/after/ftplugin/helm.lua
@@ -1,5 +0,0 @@
-vim.opt_local.tabstop = 2
-vim.opt_local.shiftwidth = 2
-vim.opt_local.softtabstop = 2
-vim.opt_local.expandtab = true
-
--- a/after/ftplugin/json.lua
+++ b/after/ftplugin/json.lua
@@ -1,7 +0,0 @@
-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
-
--- a/after/ftplugin/make.lua
+++ b/after/ftplugin/make.lua
@@ -1,12 +0,0 @@
-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,
-})
-
--- a/after/ftplugin/markdown.lua
+++ b/after/ftplugin/markdown.lua
@@ -1,3 +0,0 @@
-vim.opt_local.conceallevel = 2
-vim.opt.wrap = true
-
--- a/after/ftplugin/yaml.lua
+++ b/after/ftplugin/yaml.lua
@@ -1,5 +0,0 @@
-vim.opt_local.tabstop = 2
-vim.opt_local.shiftwidth = 2
-vim.opt_local.softtabstop = 2
-vim.opt_local.expandtab = true
-
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,49 +1,41 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "64e26b597303d9ed175f8ed832df8328731b93cd" },
-  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "fzf-lua": { "branch": "main", "commit": "43bda24f711e0c13428f16056002aebc20b38e04" },
-  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
-  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
-  "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
-  "hererocks": { "branch": "master", "commit": "f540b58acb0952bc82f5465b3c45999d2fe39ece" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "c55bd8a8fb191e24176c206a7af1dd51ce7276a5" },
-  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
-  "none-ls.nvim": { "branch": "main", "commit": "5abf61927023ea83031753504adb19630ba80eef" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" },
+  "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" },
+  "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
+  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
+  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
+  "git-blame.nvim": { "branch": "master", "commit": "2883a7460f611c2705b23f12d58d398d5ce6ec00" },
+  "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
+  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+  "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "7446f47b3dfb7df801f31a6f6783c2ad119a6935" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
+  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
+  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" },
-  "nvim-navic": { "branch": "master", "commit": "7d914a39a1ef8f4e22c2c4381abeef7c556f5a13" },
+  "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
+  "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
  "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
-  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
-  "nvim-treesitter": { "branch": "main", "commit": "f47f549f74cea5d5f25a5205c9e127cd882f1d20" },
-  "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" },
-  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
-  "obsidian.nvim": { "branch": "main", "commit": "6939efc2c7145cf83644192c588eccd935b57826" },
-  "oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" },
-  "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": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8" },
+  "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
+  "nvim-treesitter": { "branch": "master", "commit": "00d219068385a4aa80859d4606ad6e03af6faa83" },
+  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
+  "oil.nvim": { "branch": "master", "commit": "cca1631d5ea450c09ba72f3951a9e28105a3632c" },
+  "plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
  "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": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
-  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
-  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
-  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
-  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }
+  "telescope.nvim": { "branch": "master", "commit": "37dc9233a473dd6c3f54456ef9994d8f77c80211" },
+  "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
+  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
+  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
+  "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" },
+  "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }
 }
--- a/lua/crentist/autocmd.lua
+++ b/lua/crentist/autocmd.lua
@@ -3,9 +3,6 @@ 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,
@@ -16,17 +13,17 @@ autocmd('LspAttach', {
        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>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.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)
+        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
 })

 -- Add new line to the end of the file
-autocmd({ 'BufWritePre' }, {
+autocmd({ "BufWritePre" }, {
    group = OnSaveGroup,
    pattern = '*',
    callback = function()
@@ -40,7 +37,7 @@ autocmd({ 'BufWritePre' }, {
 })

 -- Remove trailing spaces
-autocmd({ 'BufWritePre' }, {
+autocmd({ "BufWritePre" }, {
    group = OnSaveGroup,
    pattern = { "*" },
    callback = function()
@@ -50,38 +47,3 @@ autocmd({ 'BufWritePre' }, {
    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
-})
-
--- a/lua/crentist/init.lua
+++ b/lua/crentist/init.lua
@@ -1,8 +1,7 @@
 require("crentist.remap")
 require("crentist.set")
-require("crentist.lazy_init")
 require("crentist.autocmd")
+require("crentist.lazy_init")
 require("crentist.filetype")
-require("crentist.snippets")
-require("crentist.null-ls")
+require("crentist.luasnip")

--- a/lua/crentist/lazy/autopairs.lua
+++ b/lua/crentist/lazy/autopairs.lua
@@ -0,0 +1,5 @@
+return {
+    'windwp/nvim-autopairs',
+    event = "InsertEnter",
+    config = true
+}
--- a/lua/crentist/lazy/colors.lua
+++ b/lua/crentist/lazy/colors.lua
@@ -1,44 +1,20 @@
 return {
    {
-        'ellisonleao/gruvbox.nvim',
+        "ellisonleao/gruvbox.nvim",
        priority = 1000,
        config = function()
-            local gruvbox = require('gruvbox')
-
-            ---@module 'gruvbox'
-            ---@type GruvboxConfig
-            local gruvbox_settings = {
-                transparent_mode = false,
+            require("gruvbox").setup({
                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' })
+            })
+            vim.cmd("colorscheme gruvbox")
        end
    },
    {
-        'norcalli/nvim-colorizer.lua',
+        "norcalli/nvim-colorizer.lua",
        config = function ()
            require('colorizer').setup({ '*' })
        end
    }
 }
-
--- a/lua/crentist/lazy/completion.lua
+++ b/lua/crentist/lazy/completion.lua
@@ -1,104 +0,0 @@
-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.8.*',
-
-    ---@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' },
-        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'
-                },
-                snippets = {
-                    opts = {
-                        friendly_snippets = true,
-                    }
-                },
-            },
-        },
-
-        signature = { enabled = true }
-    },
-}
-
--- a/lua/crentist/lazy/dadbod.lua
+++ b/lua/crentist/lazy/dadbod.lua
@@ -1,20 +0,0 @@
-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,
-}
-
--- a/lua/crentist/lazy/dressing.lua
+++ b/lua/crentist/lazy/dressing.lua
@@ -1,7 +1,4 @@
 return {
  'stevearc/dressing.nvim',
-  ---@module 'dressing'
-  ---@type dressing.InputConfig
  opts = {},
 }
-
--- a/lua/crentist/lazy/fugitive.lua
+++ b/lua/crentist/lazy/fugitive.lua
@@ -1,34 +1,34 @@
 return {
-    'tpope/vim-fugitive',
+    "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)
+        vim.keymap.set("n", "<leader>gs", vim.cmd.Git)

-        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 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 SwitchToMainbufnr = vim.api.nvim_get_current_buf()
+                local bufnr = vim.api.nvim_get_current_buf()
                local opts = {buffer = bufnr, remap = false}
-                vim.keymap.set('n', "<leader>p", function()
+                vim.keymap.set("n", "<leader>p", function()
                    vim.cmd.Git('push')
                end, opts)

                -- rebase always
-                vim.keymap.set('n', "<leader>P", function()
+                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
 }
-
--- a/lua/crentist/lazy/git-blame.lua
+++ b/lua/crentist/lazy/git-blame.lua
@@ -0,0 +1,22 @@
+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
+}
--- a/lua/crentist/lazy/gitgutter.lua
+++ b/lua/crentist/lazy/gitgutter.lua
@@ -0,0 +1,3 @@
+return {
+    "airblade/vim-gitgutter",
+}
--- a/lua/crentist/lazy/gitsigns.lua
+++ b/lua/crentist/lazy/gitsigns.lua
@@ -1,74 +0,0 @@
-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
-    }
-}
-
--- a/lua/crentist/lazy/harpoon.lua
+++ b/lua/crentist/lazy/harpoon.lua
@@ -1,28 +1,23 @@
 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 extensions = require('harpoon.extensions')
+        local harpoon = require("harpoon")

-        harpoon:setup({
-            settings = { sync_on_ui_close = true }
-        })
-        harpoon:extend(extensions.builtins.navigate_with_number())
-        harpoon:extend(extensions.builtins.highlight_current_file())
+        harpoon:setup()

        -- 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
                table.insert(file_paths, item.value)
            end

-            require('telescope.pickers').new({}, {
-                prompt_title = 'Harpoon',
-                finder = require('telescope.finders').new_table({
+            require("telescope.pickers").new({}, {
+                prompt_title = "Harpoon",
+                finder = require("telescope.finders").new_table({
                    results = file_paths,
                }),
                previewer = conf.file_previewer({}),
@@ -30,15 +25,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
 }

--- a/lua/crentist/lazy/iconpicker.lua
+++ b/lua/crentist/lazy/iconpicker.lua
@@ -0,0 +1,13 @@
+return {
+    "ziontee113/icon-picker.nvim",
+    config = function()
+        require("icon-picker").setup({ disable_legacy_commands = true })
+
+        local opts = { noremap = true, silent = true }
+
+        vim.keymap.set("n", "<Leader><Leader>i", "<cmd>IconPickerNormal<cr>", opts)
+        vim.keymap.set("n", "<Leader><Leader>y", "<cmd>IconPickerYank<cr>", opts) --> Yank the selected icon into register
+        vim.keymap.set("i", "<C-i>", "<cmd>IconPickerInsert<cr>", opts)
+    end
+}
+
--- a/lua/crentist/lazy/illuminate.lua
+++ b/lua/crentist/lazy/illuminate.lua
@@ -1,8 +0,0 @@
-return {
-    'RRethy/vim-illuminate',
-    config = function ()
-        local illuminate = require('illuminate')
-        illuminate.configure()
-    end
-}
-
--- a/lua/crentist/lazy/indent-blanklines.lua
+++ b/lua/crentist/lazy/indent-blanklines.lua
@@ -1,2 +1 @@
-return { 'lukas-reineke/indent-blankline.nvim', main = 'ibl', opts = {} }
-
+return { "lukas-reineke/indent-blankline.nvim", main = "ibl", opts = {} }
--- a/lua/crentist/lazy/init.lua
+++ b/lua/crentist/lazy/init.lua
@@ -1,7 +1,6 @@
 return {
 	{
-		'nvim-lua/plenary.nvim',
-		name = 'plenary'
+		"nvim-lua/plenary.nvim",
+		name = "plenary"
 	},
 }
-
--- a/lua/crentist/lazy/lsp.lua
+++ b/lua/crentist/lazy/lsp.lua
@@ -1,93 +1,189 @@
 return {
    'neovim/nvim-lspconfig',
-    version = '^2.3.0',
+    tag = "v1.0.0",
    dependencies = {
        'williamboman/mason.nvim',
        'williamboman/mason-lspconfig.nvim',
-        'saghen/blink.cmp',
+        'hrsh7th/nvim-cmp',
+        'hrsh7th/cmp-nvim-lsp',
+        'hrsh7th/cmp-buffer',
+        'hrsh7th/cmp-path',
+        'SergioRibera/cmp-dotenv',
+        'hrsh7th/cmp-cmdline',
+        'saadparwaiz1/cmp_luasnip',
        'L3MON4D3/LuaSnip',
        'j-hui/fidget.nvim',
        'rafamadriz/friendly-snippets',
-        {
-            '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' } },
-                },
-            },
-        },
+        { 'towolf/vim-helm', ft = 'helm' },
    },

    config = function()
-        vim.diagnostic.config({ virtual_text = false })
-
        local lspconfig = require('lspconfig')

+        local cmp = require('cmp')
+        local luasnip = require('luasnip')
+
        -- 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 = {
-                'ts_ls',
                'lua_ls',
-                'gopls',
-                'pylsp',
-                'gitlab_ci_ls',
                'yamlls',
-                'ansiblels',
-                'terraformls',
-                'helm_ls',
-                'marksman',
            },
+            handlers = {
+                function(server_name)
+                    local capabilities = require('cmp_nvim_lsp').default_capabilities()
+                    require('lspconfig')[server_name].setup({
+                        capabilities = capabilities
+                    })
+                end,
+            }
+        })
+        cmp.setup({
+            sources = {
+                { name = 'path' },
+                { name = 'nvim_lsp' },
+                { name = 'luasnip', keyword_length = 2 },
+                { name = 'buffer',  keyword_length = 3 },
+            },
+            mapping = cmp.mapping.preset.insert({
+                -- `Enter` key to confirm completion
+                ['<CR>'] = cmp.mapping({
+                    i = function(fallback)
+                        if cmp.visible() and cmp.get_active_entry() then
+                            cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })
+                        else
+                            fallback()
+                        end
+                    end,
+                    s = cmp.mapping.confirm({ select = true }),
+                    c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
+                }),
+                ['<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,
+            },
+
        })

-        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', {
+        local pythonLineLength = 95
+        lspconfig.pylsp.setup {
            settings = {
-                ['pylsp'] = {
+                pylsp = {
                    plugins = {
-                        autopep8 = {
-                            enabled = false,
-                        },
-                        yapf = {
-                            enabled = true,
-                        },
                        pycodestyle = {
                            ignore = { 'W391' },
-                            maxLineLength = 95,
+                            maxLineLength = pythonLineLength
                        }
                    }
                }
            }
+        }
+        lspconfig.ansiblels.setup {}
+
+        lspconfig.lua_ls.setup {
+            on_init = function(client)
+                local path = client.workspace_folders[1].name
+                if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then
+                    return
+                end
+
+                client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
+                    runtime = {
+                        -- Tell the language server which version of Lua you're using
+                        -- (most likely LuaJIT in the case of Neovim)
+                        version = 'LuaJIT'
+                    },
+                    -- Make the server aware of Neovim runtime files
+                    workspace = {
+                        checkThirdParty = false,
+                        library = {
+                            vim.env.VIMRUNTIME
+                            -- Depending on the usage, you might want to add additional paths here.
+                            -- '${3rd}/luv/library'
+                            -- '${3rd}/busted/library',
+                        }
+                        -- or pull in all of 'runtimepath'. NOTE: this is a lot slower
+                        -- library = vim.api.nvim_get_runtime_file('', true)
+                    }
                })
-
-        vim.lsp.config('helm-ls', {
+            end,
+            settings = {
+                Lua = {}
+            }
+        }
+        lspconfig.helm_ls.setup {
            settings = {
                ['helm-ls'] = {
-                    helmLint = { enabled = false },
-                    yamlls = { enabled = false },
+                    yamlls = {
+                        path = 'yaml-language-server',
+                    }
+                }
+            }
+        }
+        lspconfig.terraformls.setup {
+            filetypes = { 'terraform', 'terraform-vars', 'tf' }
+        }
+
+        -- Add additional capabilities supported by nvim-cmp
+        -- nvim hasn't added foldingRange to default capabilities, users must add it manually
+        local capabilities = require("cmp_nvim_lsp").default_capabilities()
+        capabilities = vim.lsp.protocol.make_client_capabilities()
+        capabilities.textDocument.foldingRange = {
+            dynamicRegistration = false,
+            lineFoldingOnly = true,
+        }
+
+        lspconfig.nixd.setup({
+            capabilities = capabilities,
+            settings = {
+                nixd = {
+                    nixpkgs = {
+                        expr = "import <nixpkgs> { }",
+                    },
+                    formatting = {
+                        command = { "alejandra" },
+                    },
+                    options = {
+                        home_manager = {
+                          expr = '(builtins.getFlake "~/.dotfiles/home-manager/").homeConfigurations.rtim.options',
+                        },
                    },
                }
-        })
-
-        vim.lsp.config('terraformls', {
-            filetypes = { 'terraform', 'terraform-vars', 'tf' }
+            },
        })
    end
 }
--- a/lua/crentist/lazy/lualine.lua
+++ b/lua/crentist/lazy/lualine.lua
@@ -17,8 +17,7 @@ return {
            lightgray    = '#504945',
            inactivegray = '#7c6f64',
        }
-        require('lualine').setup(
-            {
+        require('lualine').setup({
            options = {
                theme = {
                    normal = {
@@ -57,7 +56,7 @@ return {
                lualine_c = {
                    {
                        'filename',
-                            path = 1,
+                        path = 4,
                    },
                    {
                        'navic',
--- a/lua/crentist/lazy/markdown.lua
+++ b/lua/crentist/lazy/markdown.lua
@@ -1,15 +0,0 @@
-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 = { '󰬺 ', '󰬻 ', '󰬼 ', '󰬽 ', '󰬾 ', '󰬿 ' },
-       }
-    },
-}
-
--- a/lua/crentist/lazy/navic.lua
+++ b/lua/crentist/lazy/navic.lua
@@ -7,8 +7,7 @@ return {
        local navic = require('nvim-navic')
        navic.setup({
            lsp = {
-                auto_attach = true,
-                preference = { 'helm_ls', 'yamlls' }
+                auto_attach = true
            }
        })
    end
--- a/lua/crentist/lazy/neodev.lua
+++ b/lua/crentist/lazy/neodev.lua
@@ -0,0 +1,3 @@
+return {
+    { "folke/neodev.nvim", opts = {} }
+}
--- a/lua/crentist/lazy/neotree.lua
+++ b/lua/crentist/lazy/neotree.lua
@@ -1,27 +0,0 @@
-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',
-        }
-    },
-  }
-}
-
--- a/lua/crentist/lazy/none-ls.lua
+++ b/lua/crentist/lazy/none-ls.lua
@@ -1,11 +0,0 @@
-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
-}
-
--- a/lua/crentist/lazy/obsidian.lua
+++ b/lua/crentist/lazy/obsidian.lua
@@ -1,61 +0,0 @@
-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,
-        },
-    },
-}
-
--- a/lua/crentist/lazy/oil.lua
+++ b/lua/crentist/lazy/oil.lua
@@ -1,28 +1,17 @@
 return {
    'stevearc/oil.nvim',
+    -- Optional dependencies
    dependencies = { 'nvim-tree/nvim-web-devicons' },
-    opts = {
+    opts = {},
+    config = function()
+        require('oil').setup({
            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,
            }
-    },
+        })
+    end
 }

--- a/lua/crentist/lazy/parrot.lua
+++ b/lua/crentist/lazy/parrot.lua
@@ -1,44 +0,0 @@
-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-5-20251101',
-                    'claude-haiku-4-5-20251001',
-                },
-                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,
-            }
-        },
-        user_input_ui = "buffer",
-    }
-}
-
--- a/lua/crentist/lazy/sops.lua
+++ b/lua/crentist/lazy/sops.lua
@@ -1,10 +1,13 @@
 return {
    'lucidph3nx/nvim-sops',
    event = { 'BufEnter' },
-    opts = { },
+    opts = {
+        -- your configuration comes here
+        -- or leave it empty to use the default settings
+        -- refer to the configuration section below
+    },
    keys = {
        { '<leader>ef', vim.cmd.SopsEncrypt, desc = '[E]ncrypt [F]ile' },
        { '<leader>df', vim.cmd.SopsDecrypt, desc = '[D]ecrypt [F]ile' },
    },
 }
-
--- a/lua/crentist/lazy/surround.lua
+++ b/lua/crentist/lazy/surround.lua
@@ -3,7 +3,8 @@ return {
    version = "*", -- Use for stability; omit to use `main` branch for the latest features
    event = "VeryLazy",
    config = function()
-        require("nvim-surround").setup({})
+        require("nvim-surround").setup({
+            -- Configuration here, or leave empty to use defaults
+        })
    end
 }
-
--- a/lua/crentist/lazy/tabline.lua
+++ b/lua/crentist/lazy/tabline.lua
@@ -1,11 +0,0 @@
-- 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...
-  },
-}
-
--- a/lua/crentist/lazy/telescope.lua
+++ b/lua/crentist/lazy/telescope.lua
@@ -2,12 +2,7 @@ return {
    'FabianWirth/search.nvim',
    dependencies = {
        'nvim-lua/plenary.nvim',
-        {
        'nvim-telescope/telescope.nvim',
-            dependencies = {
-                { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }
-            }
-        },
    },

    config = function()
@@ -22,15 +17,17 @@ return {
        telescope.setup({
            defaults = {
                vimgrep_arguments = vimgrep_arguments,
-                file_ignore_patterns = { "^.git/" }
+                file_ignore_patterns = {
+                    'node_modules',
+                }
            },
-            extensions = {
-                fzf = {}
+            pickers = {
+                find_files = {
+                    find_command = { 'rg', '--files', '--hidden', '--glob', '!**/.git/*' },
+                }
            }
        })

-        telescope.load_extension('fzf')
-
        local search = require('search')
        local builtin = require('telescope.builtin')

@@ -40,8 +37,8 @@ return {
                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 = '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 },
            },
            append_tabs = {                -- append_tabs will add the provided tabs to the default ones
@@ -52,21 +49,6 @@ 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
-                }
            },
        })

--- a/lua/crentist/lazy/treesitter.lua
+++ b/lua/crentist/lazy/treesitter.lua
@@ -1,50 +1,30 @@
 return {
-    'nvim-treesitter/nvim-treesitter',
-    branch = 'main',
-    lazy = false,
+    "nvim-treesitter/nvim-treesitter",
    build = ":TSUpdate",
    config = function()
-        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)
+        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,
+            },
+        })
    end
 }
-
--- a/lua/crentist/lazy/ufo.lua
+++ b/lua/crentist/lazy/ufo.lua
@@ -1,43 +0,0 @@
-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
-}
-
--- a/lua/crentist/luasnip.lua
+++ b/lua/crentist/luasnip.lua
@@ -0,0 +1,80 @@
+-- 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 })
+
+-- nvim config
+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 = '<>' }
+        )
+    ),
+})
+
+-- Comment block
+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')
+            }
+        )
+    ),
+})
+
--- a/lua/crentist/null-ls.lua
+++ b/lua/crentist/null-ls.lua
@@ -1,56 +0,0 @@
-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)
-
--- a/lua/crentist/remap.lua
+++ b/lua/crentist/remap.lua
@@ -2,8 +2,6 @@ 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")

@@ -30,18 +28,6 @@ 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>")
-
-vim.keymap.set("n", "<F12>", "<cmd>PrtChatToggle<CR>")
-
--- a/lua/crentist/set.lua
+++ b/lua/crentist/set.lua
@@ -8,8 +8,6 @@ vim.opt.softtabstop = 4
 vim.opt.shiftwidth = 4
 vim.opt.expandtab = true

-vim.o.winborder = ''
-
 vim.opt.smartindent = true

 vim.opt.wrap = false
@@ -25,12 +23,10 @@ vim.opt.incsearch = true
 vim.opt.termguicolors = true

 vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes:1"
+vim.opt.signcolumn = "yes"
 vim.opt.isfname:append("@-@")

 vim.opt.updatetime = 50

 vim.opt.colorcolumn = "80"

-vim.opt.diffopt = 'internal,filler,closeoff,algorithm:histogram'
-
--- a/lua/crentist/snippets/common.lua
+++ b/lua/crentist/snippets/common.lua
@@ -1,45 +0,0 @@
-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 })
-
-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')
-            }
-        )
-    ),
-})
-
--- a/lua/crentist/snippets/init.lua
+++ b/lua/crentist/snippets/init.lua
@@ -1,5 +0,0 @@
-require('crentist.snippets.common')
-require('crentist.snippets.lua')
-require('crentist.snippets.terraform')
-require('crentist.snippets.yaml')
-
--- a/lua/crentist/snippets/lua.lua
+++ b/lua/crentist/snippets/lua.lua
@@ -1,38 +0,0 @@
-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 = '<>' }
-        )
-    ),
-})
-
--- a/lua/crentist/snippets/terraform.lua
+++ b/lua/crentist/snippets/terraform.lua
@@ -1,29 +0,0 @@
-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 = '<>' }
-        )
-    ),
-})
-
--- a/lua/crentist/snippets/yaml.lua
+++ b/lua/crentist/snippets/yaml.lua
@@ -1,64 +0,0 @@
-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 })
-
--- a/lua/crentist/telescope/advanced_grep.lua
+++ b/lua/crentist/telescope/advanced_grep.lua
@@ -1,64 +0,0 @@
-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
-