add nixd config, remove unwanted servers

after/ftplugin/nix.lua

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

after/ftplugin/terraform.lua

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

init.lua

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

lazy-lock.json

@@ -1,42 +1,41 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
+  "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": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
-  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
-  "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
-  "git-blame.nvim": { "branch": "master", "commit": "408d5487d908dfe5d48e5645d8b27ddcc16b11e0" },
-  "gruvbox.nvim": { "branch": "main", "commit": "a7cacf59418a6fe52da3d022bfd76a8caf34dc8d" },
+  "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" },
-  "hererocks": { "branch": "master", "commit": "8bd2fcfdd65cfa7535ce39ea372a63b0bdb8e528" },
   "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "1fad61712bd3937dda925775a7736b8efbcbf1a7" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
-  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
-  "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
-  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
-  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
+  "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": "7edfd6692ba17f8d4fe08d84142781898ab0a672" },
+  "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
+  "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" },
-  "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "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" },
-  "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" },
-  "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
-  "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" },
-  "vim-gitgutter": { "branch": "main", "commit": "e801371917e52805a4ceb1e93f55ed1fba712f82" },
+  "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" }
 }

lua/crentist/filetype.lua

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

lua/crentist/init.lua

@@ -3,4 +3,5 @@ require("crentist.set")
 require("crentist.autocmd")
 require("crentist.lazy_init")
 require("crentist.filetype")
+require("crentist.luasnip")
 

lua/crentist/lazy/harpoon.lua

@@ -26,7 +26,8 @@ return {
         end
 
         vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
-        vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) 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)

lua/crentist/lazy/iconpicker.lua

@@ -10,3 +10,4 @@ return {
         vim.keymap.set("i", "<C-i>", "<cmd>IconPickerInsert<cr>", opts)
     end
 }
+

lua/crentist/lazy/lsp.lua

@@ -1,18 +1,19 @@
 return {
-    "neovim/nvim-lspconfig",
+    'neovim/nvim-lspconfig',
+    tag = "v1.0.0",
     dependencies = {
-        "williamboman/mason.nvim",
-        "williamboman/mason-lspconfig.nvim",
-        "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",
+        'williamboman/mason.nvim',
+        'williamboman/mason-lspconfig.nvim',
+        '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',
         { 'towolf/vim-helm', ft = 'helm' },
     },
 
@@ -30,10 +31,16 @@ return {
         require('mason-lspconfig').setup({
             -- Replace the language servers listed here
             -- with the ones you want to install
-            ensure_installed = { 'tsserver', 'lua_ls', 'gopls', 'pylsp', 'gitlab_ci_ls', 'yamlls', 'ansiblels', 'terraformls', 'helm_ls' },
+            ensure_installed = {
+                'lua_ls',
+                'yamlls',
+            },
             handlers = {
                 function(server_name)
-                    require('lspconfig')[server_name].setup({})
+                    local capabilities = require('cmp_nvim_lsp').default_capabilities()
+                    require('lspconfig')[server_name].setup({
+                        capabilities = capabilities
+                    })
                 end,
             }
         })
@@ -41,16 +48,15 @@ return {
             sources = {
                 { name = 'path' },
                 { name = 'nvim_lsp' },
-                { name = 'dotenv' },
                 { name = 'luasnip', keyword_length = 2 },
                 { name = 'buffer',  keyword_length = 3 },
             },
             mapping = cmp.mapping.preset.insert({
                 -- `Enter` key to confirm completion
-                ["<CR>"] = cmp.mapping({
+                ['<CR>'] = cmp.mapping({
                     i = function(fallback)
                         if cmp.visible() and cmp.get_active_entry() then
-                            cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
+                            cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })
                         else
                             fallback()
                         end
@@ -58,7 +64,7 @@ return {
                     s = cmp.mapping.confirm({ select = true }),
                     c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
                 }),
-                ["<Tab>"] = cmp.mapping(function(fallback)
+                ['<Tab>'] = cmp.mapping(function(fallback)
                     if cmp.visible() then
                         cmp.select_next_item()
                     elseif luasnip.locally_jumpable(1) then
@@ -66,9 +72,9 @@ return {
                     else
                         fallback()
                     end
-                end, { "i", "s" }),
+                end, { 'i', 's' }),
 
-                ["<S-Tab>"] = cmp.mapping(function(fallback)
+                ['<S-Tab>'] = cmp.mapping(function(fallback)
                     if cmp.visible() then
                         cmp.select_prev_item()
                     elseif luasnip.locally_jumpable(-1) then
@@ -76,7 +82,7 @@ return {
                     else
                         fallback()
                     end
-                end, { "i", "s" }),
+                end, { 'i', 's' }),
 
                 -- Ctrl+Space to trigger completion menu
                 ['<C-Space>'] = cmp.mapping.complete(),
@@ -99,6 +105,7 @@ return {
                 pylsp = {
                     plugins = {
                         pycodestyle = {
+                            ignore = { 'W391' },
                             maxLineLength = pythonLineLength
                         }
                     }
@@ -126,11 +133,11 @@ return {
                         library = {
                             vim.env.VIMRUNTIME
                             -- Depending on the usage, you might want to add additional paths here.
-                            -- "${3rd}/luv/library"
-                            -- "${3rd}/busted/library",
+                            -- '${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)
+                        -- library = vim.api.nvim_get_runtime_file('', true)
                     }
                 })
             end,
@@ -142,11 +149,42 @@ return {
             settings = {
                 ['helm-ls'] = {
                     yamlls = {
-                        path = "yaml-language-server",
+                        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',
+                        },
+                    },
+                }
+            },
+        })
     end
 }
 

lua/crentist/lazy/lualine.lua

@@ -1,6 +1,9 @@
 return {
     'nvim-lualine/lualine.nvim',
-    dependencies = { 'nvim-tree/nvim-web-devicons', branch = 'master' },
+    dependencies = {
+        { 'nvim-tree/nvim-web-devicons', branch = 'master', },
+        'SmiteshP/nvim-navic',
+    },
     config = function()
         local colors = {
             black        = '#282828',
@@ -51,16 +54,16 @@ return {
             },
             sections = {
                 lualine_c = {
+                    {
                         'filename',
-                    function()
-                        return require("nvim-treesitter").statusline({
-                            indicator_size = 70,
-                            type_patterns = { "class", "function", "method" },
-                            separator = " -> ",
-                        })
-                    end,
+                        path = 4,
+                    },
+                    {
+                        'navic',
+                    },
                 }
             }
         })
     end
 }
+

lua/crentist/lazy/navic.lua

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

lua/crentist/lazy/telescope.lua

@@ -1,31 +1,29 @@
 return {
-    "FabianWirth/search.nvim",
+    'FabianWirth/search.nvim',
     dependencies = {
-        "nvim-lua/plenary.nvim",
-        "nvim-telescope/telescope.nvim",
+        'nvim-lua/plenary.nvim',
+        'nvim-telescope/telescope.nvim',
     },
 
-    version = "0.1.6",
-
     config = function()
         local telescope = require('telescope')
         local telescopeConfig = require('telescope.config')
 
         local vimgrep_arguments = { unpack(telescopeConfig.values.vimgrep_arguments) }
-        table.insert(vimgrep_arguments, "--hidden")
-        table.insert(vimgrep_arguments, "--glob")
-        table.insert(vimgrep_arguments, "!**/.git/*")
+        table.insert(vimgrep_arguments, '--hidden')
+        table.insert(vimgrep_arguments, '--glob')
+        table.insert(vimgrep_arguments, '!**/.git/*')
 
         telescope.setup({
             defaults = {
                 vimgrep_arguments = vimgrep_arguments,
                 file_ignore_patterns = {
-                    "node_modules",
+                    'node_modules',
                 }
             },
             pickers = {
                 find_files = {
-                    find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" },
+                    find_command = { 'rg', '--files', '--hidden', '--glob', '!**/.git/*' },
                 }
             }
         })
@@ -45,7 +43,7 @@ return {
             },
             append_tabs = {                -- append_tabs will add the provided tabs to the default ones
                 {
-                    'Commits',             -- or name = "Commits"
+                    'Commits',             -- or name = 'Commits'
                     builtin.git_commits,   -- or tele_func = require('telescope.builtin').git_commits
                     available = function() -- optional
                         return vim.fn.isdirectory('.git') == 1
@@ -59,16 +57,17 @@ return {
             search.open({ tab_name = 'Buffers' })
         end)
         vim.keymap.set('n', '<leader>pws', function()
-            local word = vim.fn.expand("<cword>")
+            local word = vim.fn.expand('<cword>')
             builtin.grep_string({ search = word })
         end)
         vim.keymap.set('n', '<leader>pWs', function()
-            local word = vim.fn.expand("<cWORD>")
+            local word = vim.fn.expand('<cWORD>')
             builtin.grep_string({ search = word })
         end)
         vim.keymap.set('n', '<leader>ps', function()
-            builtin.grep_string({ search = vim.fn.input("Grep > ") })
+            builtin.grep_string({ search = vim.fn.input('Grep > ') })
         end)
         vim.keymap.set('n', '<leader>vh', builtin.help_tags, {})
     end
 }
+

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

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

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')
+            }
+        )
+    ),
+})
+

lua/crentist/remap.lua

@@ -1,5 +1,9 @@
 vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", ":Oil .<CR>")
+vim.keymap.set("n", "<leader>Pv", ":Oil .<CR>")
+vim.keymap.set("n", "<leader>pv", ":Oil<CR>")
+
+vim.keymap.set("n", "<C-d>", "<C-d>zz")
+vim.keymap.set("n", "<C-u>", "<C-u>zz")
 
 -- move selected blocks
 vim.keymap.set("v", "<S-J>", ":m '>+1<CR>gv=gv")
@@ -24,3 +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", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
+