Merge branch 'master' of gitea.suda.codes:sudacode/nvim

init.vim

@@ -23,6 +23,7 @@ source ~/.config/nvim/plugin-confs/copilot-lualine.lua
 source ~/.config/nvim/plugin-confs/nvimtree.lua
 source ~/.config/nvim/plugin-confs/presence.lua
 source ~/.config/nvim/plugin-confs/treesitter.lua
+source ~/.config/nvim/plugin-confs/treesitter-context.lua
 source ~/.config/nvim/plugin-confs/whichkey.lua
 source ~/.config/nvim/plugin-confs/telescope.lua
 source ~/.config/nvim/plugin-confs/telescope-file-browser.lua

lua/plugins.lua

@@ -10,6 +10,7 @@ require('packer').startup(function(use)
             require('nvim-treesitter.install').update({ with_sync = true })
         end
     }
+    use { 'nvim-treesitter/nvim-treesitter-context' }
 
     -- TELESCOPE {{{
 
@@ -271,7 +272,8 @@ require('packer').startup(function(use)
     use { 'hrsh7th/cmp-path' }
     use { 'hrsh7th/nvim-cmp' }
     use { 'https://git.sr.ht/~whynothugo/lsp_lines.nvim' }
-    use { 'jose-elias-alvarez/null-ls.nvim' }
+    -- use { 'jose-elias-alvarez/null-ls.nvim' }
+    use { 'nvimtools/none-ls.nvim' }
     use { 'neovim/nvim-lspconfig' }
     use { 'onsails/lspkind-nvim' }
 

lua/settings.lua

@@ -19,6 +19,7 @@ o.relativenumber = true
 o.colorcolumn = '80'
 o.textwidth = 80
 o.shiftwidth = 4
+o.expandtab = true
 o.tabstop = 4
 o.autoindent = true
 o.ignorecase = true
@@ -48,12 +49,12 @@ o.foldmethod = 'marker'
 g.db_ui_use_nerd_fonts = 1
 
 local border = {
-	{ "╭", "FloatBorder" }, { "─", "FloatBorder" }, { "╮", "FloatBorder" },
+    { "╭", "FloatBorder" }, { "─", "FloatBorder" }, { "╮", "FloatBorder" },
-	{ "│", "FloatBorder" }, { "╯", "FloatBorder" }, { "─", "FloatBorder" },
+    { "│", "FloatBorder" }, { "╯", "FloatBorder" }, { "─", "FloatBorder" },
-	{ "╰", "FloatBorder" }, { "│", "FloatBorder" }
+    { "╰", "FloatBorder" }, { "│", "FloatBorder" }
 }
 
 l.handlers["textDocument/signatureHelp"] =
     vim.lsp.with(vim.lsp.handlers.signature_help, { border = border })
 l.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover,
-	{ border = border })
+    { border = border })

plugin-confs/treesitter-context.lua

@@ -0,0 +1,14 @@
+require 'treesitter-context'.setup {
+    enable = true,            -- Enable this plugin (Can be enabled/disabled later via commands)
+    max_lines = 0,            -- How many lines the window should span. Values <= 0 mean no limit.
+    min_window_height = 0,    -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+    line_numbers = true,
+    multiline_threshold = 20, -- Maximum number of lines to show for a single context
+    trim_scope = 'outer',     -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+    mode = 'cursor',          -- Line used to calculate context. Choices: 'cursor', 'topline'
+    -- Separator between context and content. Should be a single character string, like '-'.
+    -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+    separator = nil,
+    zindex = 20,    -- The Z-index of the context window
+    on_attach = nil -- (fun(buf: integer): boolean) return false to disable attaching
+}