.config/nvim/lua/plugins/init.lua

@@ -1,10 +1,11 @@
 return {
+    'Winseven4lyf/vim-bbcode',
     'isobit/vim-caddyfile',
+    'junegunn/vim-peekaboo',
+    'nfnty/vim-nftables',
     'rcarriga/nvim-notify',
     'stefandtw/quickfix-reflector.vim',
-    'nfnty/vim-nftables',
     'tpope/vim-fugitive',
-    'junegunn/vim-peekaboo',
     'tpope/vim-sleuth',
     'vim-scripts/iptables',
     { 'akinsho/bufferline.nvim', opts = {}, dependencies = { 'navarasu/onedark.nvim' } },
@@ -13,36 +14,7 @@ return {
     { 'kylechui/nvim-surround', version = '*', event = 'VeryLazy', opts = {} },
     { 'lukas-reineke/indent-blankline.nvim', main = 'ibl', opts = {} },
     { 'norcalli/nvim-colorizer.lua', opts={ '*' }, dependencies = { 'navarasu/onedark.nvim' } },
-    -- { 'wakatime/vim-wakatime', event = 'VeryLazy' },
+    { 'wakatime/vim-wakatime', event = 'VeryLazy' },
     { 'williamboman/mason.nvim', opts = {} },
-    'Winseven4lyf/vim-bbcode',
-
-
-    { 'mrsobakin/multilayout.nvim' , opts = {
-        layouts = {
-            ru = {
-                -- Names of this layout, as `libukb` reports.
-                names = { "Russian" },
-                from  = [[ёйцукенгшщзхъфывапролджэячсмитьбю.Ё"№;:?ЙЦУКЕНГШЩЗХЪ/ФЫВАПРОЛДЖЭЯЧСМИТЬБЮ,]],
-                to    = [[`qwertyuiop[]asdfghjkl;'zxcvbnm,./~@#$^&QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?]],
-            }
-        },
-        aliases = {
-            -- Maximum length of default commands aliases.
-            -- Increasing this value leads to longer startup times.
-            max_length = 2,
-            -- Extra commands that you want to alias.
-            -- They are aliased regardless of `max_length`.
-            extra = { "sort" },
-        },
-        -- Whether to use `libukb`. If this is set to false, `langmap`
-        -- won't automatically switch when your layout does.
-        use_libukb = true,
-        -- Path to the `libukb.so`. If `nil`, ukb will be automatically
-        -- downloaded, builded and installed in the neovim data directory.
-        libukb_path = nil,
-        -- Function of type `callback(layout: string)`. Called whenever
-        -- current keyboard layout changes.
-        callback = nil,
-    }}
+    { dir = '~/.local/share/nvim/preseed/' }, -- 'https://git.netizen.se/vim-preseed',
 }

.config/nvim/lua/plugins/multilayout.lua

@@ -0,0 +1,30 @@
+return {
+    'mrsobakin/multilayout.nvim',
+    opts = {
+        layouts = {
+            ru = {
+                -- Names of this layout, as `libukb` reports.
+                names = { "Russian" },
+                from  = [[ёйцукенгшщзхъфывапролджэячсмитьбю.Ё"№;:?ЙЦУКЕНГШЩЗХЪ/ФЫВАПРОЛДЖЭЯЧСМИТЬБЮ,]],
+                to    = [[`qwertyuiop[]asdfghjkl;'zxcvbnm,./~@#$^&QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?]],
+            }
+        },
+        aliases = {
+            -- Maximum length of default commands aliases.
+            -- Increasing this value leads to longer startup times.
+            max_length = 2,
+            -- Extra commands that you want to alias.
+            -- They are aliased regardless of `max_length`.
+            extra = { "sort" },
+        },
+        -- Whether to use `libukb`. If this is set to false, `langmap`
+        -- won't automatically switch when your layout does.
+        use_libukb = true,
+        -- Path to the `libukb.so`. If `nil`, ukb will be automatically
+        -- downloaded, builded and installed in the neovim data directory.
+        libukb_path = nil,
+        -- Function of type `callback(layout: string)`. Called whenever
+        -- current keyboard layout changes.
+        callback = nil,
+    }
+}

.config/nvim/lua/plugins/telescope.lua

@@ -10,6 +10,7 @@ return {
 
     config = function()
         local actions = require('telescope.actions')
+
         require('telescope').setup {
             defaults = {
                 mappings = {
@@ -18,8 +19,12 @@ return {
                         ['<C-d>'] = false,
                         ["<C-j>"] = actions.move_selection_next,
                         ["<C-k>"] = actions.move_selection_previous,
-                        ["<C-q>"] = actions.smart_send_to_qflist + actions.open_qflist,
+                        -- ["<C-q>"] = actions.smart_send_to_qflist + actions.open_qflist,
+                        ["<C-b>"] = require("trouble.sources.telescope").open
                     },
+                    n = {
+                        ["<C-q>"] = require("trouble.sources.telescope").open
+                    }
                 },
             },
         }
@@ -34,11 +39,17 @@ return {
             })
         end)
 
-        vim.keymap.set('n', '<leader>?',  require('telescope.builtin').live_grep)
-        vim.keymap.set('n', '<leader>wf',  require('telescope.builtin').grep_string)
+        vim.keymap.set('n', '<leader>?', require('telescope.builtin').live_grep)
+        vim.keymap.set('n', '<leader>wf', require('telescope.builtin').grep_string)
         vim.keymap.set('n', '<leader>of', require('telescope.builtin').oldfiles)
         vim.keymap.set('n', '<leader>af', require('telescope.builtin').git_files)
         vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files)
         vim.keymap.set('n', '<leader>.',  require('telescope').extensions.emoji.emoji)
+
+
+        -- Use this to add more results without clearing the trouble list
+        -- local add_to_trouble = require("trouble.sources.telescope").add
+
+        local telescope = require("telescope")
     end
 }

.config/nvim/lua/plugins/theme.lua

@@ -38,5 +38,6 @@ return {
         }
         vim.o.termguicolors = true
         vim.cmd.colorscheme 'onedark'
+        vim.cmd.hi 'clear @spell'
     end,
 }

.config/nvim/lua/plugins/ufo.lua

@@ -1,30 +1,23 @@
 return {
-    -- 'kevinhwang91/nvim-ufo',
-    -- dependencies = {
-    --     'kevinhwang91/promise-async'
-    -- },
-    -- config = function()
-    --     vim.defer_fn(function()
-    --         vim.o.foldcolumn = '0'
-    --         vim.o.foldlevel = 99
-    --         vim.o.foldlevelstart = 99
-    --         vim.o.foldenable = true
-    --
-    --         vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
-    --         vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
-    --
-    --         local capabilities = vim.lsp.protocol.make_client_capabilities()
-    --         capabilities.textDocument.foldingRange = {
-    --             dynamicRegistration = false,
-    --             lineFoldingOnly = true
-    --         }
-    --         local language_servers = vim.lsp.get_clients()
-    --         for _, ls in ipairs(language_servers) do
-    --             require('lspconfig')[ls].setup({
-    --                 capabilities = capabilities
-    --             })
-    --         end
-    --         require('ufo').setup()
-    --     end, 0)
-    -- end
+    'kevinhwang91/nvim-ufo',
+    dependencies = {
+        'kevinhwang91/promise-async'
+    },
+    config = function()
+        vim.defer_fn(function()
+            vim.o.foldcolumn = '0'
+            vim.o.foldlevel = 99
+            vim.o.foldlevelstart = 99
+            vim.o.foldenable = true
+
+            vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
+            vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
+
+            require('ufo').setup({
+                provider_selector = function(bufnr, filetype, buftype)
+                    return {'treesitter', 'indent'}
+                end
+            })
+        end, 0)
+    end
 }