add decrypt

2025-07-12 21:00:16 +03:00
21 changed files with 164 additions and 389 deletions
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,51 +1,43 @@
 {
  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "b035188bc6d8bcbf86c49ac230ee0bbadca7f7fb" },
-  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
+  "blink-ripgrep.nvim": { "branch": "main", "commit": "12fb7348cf9d32a0ed2e3ab4960d561632e57ba4" },
+  "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
+  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "fzf-lua": { "branch": "main", "commit": "2dce48dac09cec8143820f1d33381fe6d03a3900" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
-  "gruvbox.nvim": { "branch": "main", "commit": "a56f758f9d3eed0b8afbab6ea3ee523887755aed" },
+  "fzf-lua": { "branch": "main", "commit": "c53ba4f40f0514a5038646fb1e9ce05872b18eb1" },
+  "gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
+  "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
  "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
-  "hererocks": { "branch": "master", "commit": "d2e2b7ab1ce5b6d4e517619746a810159f0e18db" },
+  "hererocks": { "branch": "master", "commit": "4ce92131e9858950440ab99a25db9a9b43db8cd4" },
  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" },
-  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
-  "none-ls.nvim": { "branch": "main", "commit": "53ec77181d96494b9dc9457110dd62dc623cc78d" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f54e3c11fc9ebfcfc27e696182b0295b071d0811" },
+  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
+  "mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" },
+  "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" },
+  "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
  "nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
  "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
-  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
+  "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-ufo": { "branch": "main", "commit": "d31e2a9fd572a25a4d5011776677223a8ccb7e35" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
-  "obsidian.nvim": { "branch": "main", "commit": "705cc9b4f66eca1e54040ac819102e80a32896d3" },
-  "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
-  "parrot.nvim": { "branch": "main", "commit": "dcae923c7070431c8cb628b19594ab640168684c" },
-  "plenary": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "nvim-ufo": { "branch": "main", "commit": "80fe8215ba566df2fbf3bf4d25f59ff8f41bc0e1" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
+  "obsidian.nvim": { "branch": "main", "commit": "2f0222b3eb20382cadf3e1d91f368318b768771c" },
+  "oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
+  "parrot.nvim": { "branch": "main", "commit": "0477748832812707e53db078d0180299a0c15d6c" },
+  "plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "render-markdown.nvim": { "branch": "main", "commit": "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd" },
  "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
  "statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" },
-  "tabby.nvim": { "branch": "main", "commit": "b3affa6db7eab80fca2a2db5b73b473144507039" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
-  "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": "cc5ac22444332381f38084a6c7f023c25eef6201" },
-  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }
+  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
+  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
+  "vim-helm": { "branch": "master", "commit": "cc5ac22444332381f38084a6c7f023c25eef6201" }
 }
--- a/lua/crentist/lazy/colors.lua
+++ b/lua/crentist/lazy/colors.lua
@@ -5,9 +5,7 @@ return {
        config = function()
            local gruvbox = require('gruvbox')

-            ---@module 'gruvbox'
-            ---@type GruvboxConfig
-            local gruvbox_settings = {
+            gruvbox.setup({
                transparent_mode = false,
                italic = {
                    strings = false,
@@ -26,9 +24,7 @@ return {
                    GruvboxAquaSign = { bg = '' },
                    GruvboxOrangeSign = { bg = '' },
                }
-            }
-
-            gruvbox.setup(gruvbox_settings)
+            })
            vim.cmd('colorscheme gruvbox')

            vim.api.nvim_set_hl(0, 'SignColumn', { link = 'FoldColumn' })
--- a/lua/crentist/lazy/completion.lua
+++ b/lua/crentist/lazy/completion.lua
@@ -7,25 +7,13 @@ return {
        { 'L3MON4D3/LuaSnip', version = 'v2.*' }
    },
    -- use a release tag to download pre-built binaries
-    version = 'v1.6.*',
+    version = 'v1.4.*',

-    ---@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 = {
@@ -48,9 +36,6 @@ return {

        sources = {
            default = { 'lazydev', 'lsp', 'snippets', 'ripgrep', 'path', 'buffer' },
-            per_filetype = {
-                sql = { 'snippets', 'dadbod', 'buffer', 'ripgrep' }
-            },
            providers = {
                lazydev = {
                    name = 'LazyDev',
@@ -61,25 +46,25 @@ return {
                ripgrep = {
                    module = 'blink-ripgrep',
                    name = 'Ripgrep',
-                    score_offset = -5,
+                    score_offset = -2,
                    -- 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',
-                        },
+                        max_filesize = '1M',
                        project_root_marker = '.git',
+                        project_root_fallback = true,
+                        search_casing = '--ignore-case',
+                        additional_rg_options = {},
                        fallback_to_regex_highlighting = true,
-                        toggles = { debug = nil, },
+                        ignore_paths = {},
+                        additional_paths = {},
+                        future_features = {
+                            backend = {
+                                use = 'ripgrep',
+                            },
+                        },
+                        debug = false,
                    },
                    transform_items = function(_, items)
                        for _, item in ipairs(items) do
@@ -91,9 +76,6 @@ return {
                        return items
                    end,
                },
-                dadbod = {
-                    name = 'Dadbod', module = 'vim_dadbod_completion.blink'
-                },
            },
        },

--- 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 = 'right'
-  end,
-}
-
--- a/lua/crentist/lazy/decrypt.lua
+++ b/lua/crentist/lazy/decrypt.lua
@@ -0,0 +1,9 @@
+return {}
+-- return {
+--     { dir = "~/.dotfiles/nvim-plugins/decrypt.nvim" },
+--     -- config = function()
+--     --     require "decrypt"
+--     -- 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,37 +1,34 @@
 return {
-    'tpope/vim-fugitive',
-    config = function()
-        vim.keymap.set('n', "<leader>gs", vim.cmd.Git)
+    "tpope/vim-fugitive",
+    config = function() 
+        vim.keymap.set("n", "<leader>gs", vim.cmd.Git)

-        vim.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 opts = { buffer = bufnr, remap = false }
-                vim.keymap.set('n', "<leader>p", function()
+                local bufnr = 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
 }
-
--- a/lua/crentist/lazy/gitsigns.lua
+++ b/lua/crentist/lazy/gitsigns.lua
@@ -1,74 +1,11 @@
 return {
-    'lewis6991/gitsigns.nvim',
-    ---@module 'gitsigns.config'
-    ---@type Gitsigns.Config
+    "lewis6991/gitsigns.nvim",
    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,14 +1,14 @@
 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")

        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
@@ -16,8 +16,8 @@ return {
            end

            require('telescope.pickers').new({}, {
-                prompt_title = 'Harpoon',
-                finder = require('telescope.finders').new_table({
+                prompt_title = "Harpoon",
+                finder = require("telescope.finders").new_table({
                    results = file_paths,
                }),
                previewer = conf.file_previewer({}),
@@ -25,15 +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/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,6 +1,6 @@
 return {
    'neovim/nvim-lspconfig',
-    version = '^2.3.0',
+    tag = 'v1.0.0',
    dependencies = {
        'williamboman/mason.nvim',
        'williamboman/mason-lspconfig.nvim',
@@ -32,10 +32,8 @@ return {

        require('fidget').setup({})
        require('mason').setup({})
-        ---@module 'mason-lspconfig'
-        ---@type MasonLspconfigSettings
        require('mason-lspconfig').setup({
-            automatic_enable = true,
+            automatic_installation = false,
            -- Replace the language servers listed here
            -- with the ones you want to install
            ensure_installed = {
@@ -50,18 +48,20 @@ return {
                'helm_ls',
                'marksman',
            },
+            handlers = {
+                function(server_name)
+                    local capabilities = require('blink.cmp').get_lsp_capabilities()
+                    require('lspconfig')[server_name].setup({
+                        capabilities = capabilities
+                    })
+                end,
+            }
        })

-        local 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,
@@ -71,38 +71,41 @@ return {
                        },
                        pycodestyle = {
                            ignore = { 'W391' },
-                            maxLineLength = 95,
+                            maxLineLength = pythonLineLength
                        }
                    }
                }
            }
-        })
+        }
+        lspconfig.ansiblels.setup {}
+
+        lspconfig.lua_ls.setup {}

-        -- leave it until it works with lsp.config
        lspconfig.helm_ls.setup {
            settings = {
                ['helm-ls'] = {
                    yamlls = {
-                        enabled = false,
-                        path = "yaml-language-server",
+                        path = 'yaml-language-server',
                    }
                }
            }
        }
-        -- vim.lsp.config('helm-ls', {
-        --     settings = {
-        --         ['helm-ls'] = {
-        --             yamlls = {
-        --                 path = "yaml-language-server",
-        --                 enabled = false,
-        --             }
-        --         }
-        --     }
-        -- })

-        vim.lsp.config('terraformls', {
+        lspconfig.yamlls.setup {}
+        lspconfig.helm_ls.setup {
+            settings = {
+                ['helm-ls'] = {
+                    yamlls = {
+                        enabled = false
+                    }
+                }
+            }
+        }
+
+
+        lspconfig.terraformls.setup {
            filetypes = { 'terraform', 'terraform-vars', 'tf' }
-        })
+        }
    end
 }

--- a/lua/crentist/lazy/lualine.lua
+++ b/lua/crentist/lazy/lualine.lua
@@ -17,54 +17,53 @@ 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 },
-                        },
-                    }
-                },
-                sections = {
-                    lualine_c = {
-                        {
-                            'filename',
-                            path = 1,
-                        },
-                        {
-                            'navic',
-                        },
-                    }
+        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',
+                    },
+                }
+            }
+        })
    end
 }

--- a/lua/crentist/lazy/markdown.lua
+++ b/lua/crentist/lazy/markdown.lua
@@ -1,12 +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 }
-       }
-    },
-}
-
--- 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/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/parrot.lua
+++ b/lua/crentist/lazy/parrot.lua
@@ -1,6 +1,6 @@
 return {
    'frankroeder/parrot.nvim',
-    version = "2.3.0",
+    version = "2.1.0",
    dependencies = { 'ibhagwan/fzf-lua', 'nvim-lua/plenary.nvim' },
    opts = {
        providers = {
--- 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/null-ls.lua
+++ b/lua/crentist/null-ls.lua
@@ -1,56 +1,3 @@
-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)
+-- https://www.youtube.com/watch?v=q-oBU2fO1H4&t=189s
+local null_ls = require("null-ls")

--- 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,7 +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("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")