refractor(nvim): Separate config files

.config/nvim/lua/plugins/appearance.lua

@@ -8,5 +8,6 @@ return {
     end,
   },
   { import = "plugins.mod.alpha-nvim" },
+  { import = "plugins.mod.winbar-nvim"},
+  { import = "plugins.mod.bufferline" },
 }
-

.config/nvim/lua/plugins/lsp.lua

@@ -11,7 +11,7 @@ return {
     },
     config = function()
       local mason_lspconfig = require("mason-lspconfig")
-      local servers = require("config.servers")
+      local servers = require("config.servers").servers
 
       mason_lspconfig.setup({
         ensure_installed = servers,

.config/nvim/lua/plugins/misc.lua

@@ -1,6 +1,6 @@
 return {
   { 'wakatime/vim-wakatime', lazy = false },
-  { 'epwalsh/obsidian.nvim', lazy = true  },
+  { import = "plugins.mod.obsidian-nvim" },
   {
     "folke/which-key.nvim",
     event = "VeryLazy",

.config/nvim/lua/plugins/mod/alpha-nvim.lua

@@ -37,7 +37,8 @@ return {
         dashboard.button('c', ' 新建文件', ':enew<CR>'),
         dashboard.button('SPC f f', '󰈞 查找文件', ':Telescope find_files<CR>'),
         dashboard.button('SPC f h', ' 历史文件', ':Telescope oldfiles<CR>'),
-        dashboard.button('SPC s l', ' 加载会话', ':SessionSearch<CR>'), -- 加载会话
+        dashboard.button('SPC s l', ' 加载会话', ':SessionSearch<CR>'),
+        dashboard.button('SPC f c', ' 转到设置', ':Telescope find_files cwd=~/.config/nvim<CR>'),
         dashboard.button('SPC q', '󱊷 退出', ':qa<CR>'),
       }
       local handle = io.popen('fortune')

.config/nvim/lua/plugins/mod/bufferline.lua

@@ -0,0 +1,17 @@
+return {
+    "akinsho/bufferline.nvim",
+    dependencies = "nvim-tree/nvim-web-devicons", -- 图标支持
+    config = function()
+        require("bufferline").setup({
+            options = {
+                numbers = "ordinal",                 -- 显示 buffer 序号
+                close_command = "bdelete! %d",       -- 关闭 buffer 的命令
+                right_mouse_command = "bdelete! %d", -- 右键关闭
+                offsets = {
+                    { filetype = "NvimTree", text = "资源管理器", text_align = "center" },
+                },
+                separator_style = "thin",
+            },
+        })
+    end,
+}

.config/nvim/lua/plugins/mod/lspconfig.lua

@@ -1,4 +1,4 @@
 return {
-    "neovim/nvim-lspconfig",
-    lazy = false
+  "neovim/nvim-lspconfig",
+  lazy = false
 }

.config/nvim/lua/plugins/mod/lualine.lua

@@ -91,7 +91,7 @@ ins_left {
 ins_left {
   -- mode component
   function()
-    return ''
+    return ''
   end,
   color = function()
     -- auto change color according to neovims mode

.config/nvim/lua/plugins/mod/nvim-cmp.lua

@@ -20,7 +20,11 @@ return {
     local cmp = require("cmp")
     local lspconfig = require("lspconfig")
     local capabitilies = require("cmp_nvim_lsp").default_capabilities()
-    local servers = require("config.servers")
+    local servers = require("config.servers").servers
+    local servers_config = require("config.servers").server_config
+    local default_server_config = {
+      capabilities = capabitilies,
+    }
 
     cmp.setup({
       snippet = {
@@ -41,7 +45,7 @@ return {
       }
       ),
     })
-    local keymaps = require("config.keymaps")
+    local keymaps = require("keymaps")
     local keymaps_cmp = keymaps.cmp_nvim_keymaps(cmp.mapping)
 
     local function set_keymaps()
@@ -63,9 +67,9 @@ return {
     })
 
     for _, server in ipairs(servers) do
-      lspconfig[server].setup({
-        capabilities = capabitilies,
-      })
+      local config = servers_config[server] or {}
+      config = vim.tbl_extend("force", default_server_config, config)
+      lspconfig[server].setup(config)
     end
   end,
 }

.config/nvim/lua/plugins/mod/nvim-tree.lua

@@ -2,7 +2,7 @@ local function my_on_attach(bufnr)
   -- local keymaps = require("config.keymaps")
   local api = require "nvim-tree.api"
   local default_mode = { "n" }
-  local keymaps = require("config.keymaps")
+  local keymaps = require("keymaps")
 
   local function opts(desc)
     return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
@@ -16,7 +16,7 @@ local function my_on_attach(bufnr)
     end
   end
 
-  local raw_keymaps = keymaps.nvim_tree_keymaps(api, opts)
+  local raw_keymaps = require("keymaps.nvim-tree").plugin(api, opts)
   set_keymaps(raw_keymaps)
 end
 
@@ -32,10 +32,6 @@ return {
       on_attach = my_on_attach,
       sync_root_with_cwd = true,
       respect_buf_cwd = true,
-      update_focused_file = {
-        enable = true,
-        update_cwd = true,
-      },
     }
     end
 }

.config/nvim/lua/plugins/mod/nvim-treesitter.lua

@@ -0,0 +1,11 @@
+return {
+    "nvim-treesitter/nvim-treesitter",
+    run = ":TSUpdate",
+    config = function()
+        require("nvim-treesitter.configs").setup({
+            ensure_installed = { "markdown", "markdown_inline" },
+            highlight = { enable = true },
+            indent = { enable = true },
+        })
+    end,
+}

.config/nvim/lua/plugins/mod/obsidian-nvim.lua

@@ -0,0 +1,33 @@
+return {
+  "epwalsh/obsidian.nvim",
+  version = "*",  -- recommended, use latest release instead of latest commit
+  lazy = true,
+  ft = "markdown",
+  -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
+  -- event = {
+  --   -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
+  --   -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md"
+  --   -- refer to `:h file-pattern` for more examples
+  --   "BufReadPre path/to/my-vault/*.md",
+  --   "BufNewFile path/to/my-vault/*.md",
+  -- },
+  dependencies = {
+    -- Required.
+    "nvim-lua/plenary.nvim",
+
+    -- see below for full list of optional dependencies 👇
+  },
+  opts = {
+    workspaces = {
+      {
+        name = "personal",
+        path = "/mnt/c/Users/citoy/Obsidian",
+      },
+    },
+    completion = {
+      nvim_cmp = true,
+      min_chars = 2
+    }
+    -- see below for full list of options 👇
+  },
+}

.config/nvim/lua/plugins/mod/winbar-nvim.lua

@@ -0,0 +1,39 @@
+return {
+  {
+    "fgheng/winbar.nvim",
+    config = function()
+      require("winbar").setup({
+        enabled = true,
+        show_file_path = true,
+        show_symbols = true,
+        colors = {
+          path = '',
+          file_name = '',
+          symbols = '',
+        },
+        icons = {
+          file_icon_default = '',
+          seperator = '>',
+          editor_state = '●',
+          lock_icon = '',
+        },
+        exclude_filetype = {
+          'help',
+          'startify',
+          'dashboard',
+          'packer',
+          'neogitstatus',
+          'NvimTree',
+          'Trouble',
+          'alpha',
+          'lir',
+          'Outline',
+          'spectre_panel',
+          'toggleterm',
+          'qf',
+        }
+      })
+    end,
+  },
+}
+

.config/nvim/lua/plugins/syntax.lua

@@ -1,6 +1,3 @@
 return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    build = ":TSUpdate",
-  },
+  { import = "plugins.mod.nvim-treesitter", },
 }