diff --git a/nvim/.config/nvim/lua/plug/_indent-blankline.lua b/nvim/.config/nvim/lua/plug/_indent-blankline.lua deleted file mode 100644 index 5927df3..0000000 --- a/nvim/.config/nvim/lua/plug/_indent-blankline.lua +++ /dev/null @@ -1,18 +0,0 @@ --- Settings for indentBlankline --- turn off for diff views since we want to compare directly -if vim.wo.diff then vim.g["indent_blankline_enabled"] = false end - -vim.g.indent_blankline_char = "▏" - -vim.g.indent_blankline_filetype_exclude = { - "help", "undotree", "markdown", "text", "pandoc", "rst", "asciidoc", - "vim-plug" -} -vim.g.indent_blankline_buftype_exclude = {"terminal"} - -vim.g.indent_blankline_use_treesitter = true -vim.g.indent_blankline_show_first_indent_level = false - -vim.g.indent_blankline_show_current_context = true -vim.g.indent_blankline_context_highlight = "Function" -vim.g.indent_blankline_context_patterns = {"function", "class", "method"} diff --git a/nvim/.config/nvim/lua/plug/_mini.lua b/nvim/.config/nvim/lua/plug/_mini.lua new file mode 100644 index 0000000..15a498c --- /dev/null +++ b/nvim/.config/nvim/lua/plug/_mini.lua @@ -0,0 +1,2 @@ +require('mini.comment').setup() +require('mini.indentscope').setup({symbol = "│"}) diff --git a/nvim/.config/nvim/lua/plug/_telescope.lua b/nvim/.config/nvim/lua/plug/_telescope.lua index 89e2269..62fae3c 100644 --- a/nvim/.config/nvim/lua/plug/_telescope.lua +++ b/nvim/.config/nvim/lua/plug/_telescope.lua @@ -9,7 +9,8 @@ require("telescope").setup { vimgrep_arguments = { 'rg', '--ignore-vcs', '--hidden', '--color=never', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case' - } + }, + generic_sorter = require('mini.fuzzy').get_telescope_sorter }, pickers = { buffers = {theme = "ivy"}, diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index a13364c..770b1c0 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -27,10 +27,6 @@ require("packer").startup(function() use 'RRethy/vim-illuminate' -- highlight other occurences of the word under cursor use 'ojroques/vim-oscyank' -- yank from *anywhere* (even ssh session) to clipboard, using :OSCYank use 'ggandor/lightspeed.nvim' -- jump between letters with improved fFtT quicksearch, mimics sneak - -- use { -- weird errors currently - -- 'lukas-reineke/indent-blankline.nvim', -- show a vertical line for each indentation - -- config = function() require('plug._indent-blankline') end - -- } -- files use 'vifm/vifm.vim' -- integrate file manager use { @@ -56,7 +52,6 @@ require("packer").startup(function() } -- editing - use {'tpope/vim-commentary', event = "BufRead"} -- easily toggle comments for lines, paragraphs etc with gc use {'machakann/vim-sandwich', event = "BufRead"} -- surround things with other things using sa/sd/sr use { 'monaqa/dial.nvim', -- extend the ^a / ^x possibilities to dates, hex, alphabets, markdown headers @@ -144,6 +139,11 @@ require("packer").startup(function() -- -- nvim plugs + use { + 'echasnovski/mini.nvim', + branch = 'stable', + config = function() require('plug._mini') end + } use 'Iron-E/nvim-cartographer' -- makes it easier to set mappings through lua use 'marty-oehme/zettelkasten.nvim' -- simple static markdown linking use {