Merge branch 'main' of ssh://raspberrypi.tailscale.qwjyh.net:222/qwjyh/dotfiles

dotfiles/neovim/init.lua

@@ -15,7 +15,18 @@ vim.opt.rtp:prepend(lazypath)
 
 -- Installing plugins
 require('lazy').setup({
-    { "catppuccin/nvim",       name = "catppuccin" }, -- Color scheme
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        config = function()
+            require("catppuccin").setup({
+                flavour = "macchiato",
+                integrations = {
+                    navic = true,
+                },
+            })
+        end
+    }, -- Color scheme
     {
         dir = "./lua/term_powershell.lua",
         cond = function()
@@ -133,6 +144,18 @@ require('lazy').setup({
         'folke/trouble.nvim',
         -- config = function
     },
+    {
+        'SmiteshP/nvim-navic',
+        -- event = 'BufReadPre',
+        dependencies = {
+            'neovim/nvim-lspconfig',
+        },
+        config = function()
+            require 'nvim-navic'.setup {
+                highlight = true,
+            }
+        end
+    },
     {
         'Julian/lean.nvim',
         event = { 'BufReadPre *.lean', 'BufNewFile *.lean' },
@@ -469,6 +492,7 @@ require 'nvim-treesitter.configs'.setup {
 -- LSP config
 
 local lspconfig = require 'lspconfig'
+local navic = require 'nvim-navic'
 
 -- Mapping for language server
 -- See `:help vim.diagnostic.* for documentation on any of the below functions
@@ -502,6 +526,10 @@ local on_attach = function(client, bufnr)
     vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
     vim.keymap.set('n', 'grf', vim.lsp.buf.references, bufopts)
     vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
+
+    if client.server_capabilities.documentSymbolProvider then
+        navic.attach(client, bufnr)
+    end
 end
 
 -- cmp_nvim_lsp supports additional LSP completion capabilities

dotfiles/neovim/lua/lualine_setup.lua

@@ -7,6 +7,8 @@ local lsp_names = function ()
     return ' ' .. table.concat(clients, ', ')
 end
 
+local navic = require('nvim-navic')
+
 require('lualine').setup {
   options = {
     icons_enabled = true,
@@ -43,7 +45,15 @@ require('lualine').setup {
     lualine_z = {}
   },
   tabline = {},
-  winbar = {},
+  winbar = {
+      lualine_c = {
+          {
+              "navic",
+              color_correction = nil,
+              navic_opts = nil,
+          },
+      },
+  },
   inactive_winbar = {},
   extensions = {}
 }