mirror of
https://github.com/js0ny/dotfiles.git
synced 2025-12-21 08:43:00 +00:00
nvim: qol on lualine, bufferline, use nixd as nix lsp
This commit is contained in:
parent
6fb3efd1dc
commit
cd9c91b9bc
11 changed files with 76 additions and 67 deletions
|
|
@ -23,7 +23,7 @@ return {
|
|||
integrations = {
|
||||
-- lualine = true,
|
||||
"lualine",
|
||||
"blink_cmp"
|
||||
"blink_cmp",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -35,7 +35,7 @@ return {
|
|||
},
|
||||
cmd = "FzfLua colorschemes",
|
||||
},
|
||||
{ "rebelot/kanagawa.nvim", cmd = "FzfLua colorschemes" },
|
||||
{ "rebelot/kanagawa.nvim", cmd = "FzfLua colorschemes" },
|
||||
{ -- Modern Status Line
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
|
|
@ -76,25 +76,25 @@ return {
|
|||
-- },
|
||||
-- },
|
||||
{ import = "plugins.mod.bufferline" }, -- Buffer Top Bar
|
||||
{ -- Git Blames, Changes
|
||||
{ -- Git Blames, Changes
|
||||
"lewis6991/gitsigns.nvim",
|
||||
opts = {
|
||||
current_line_blame = true,
|
||||
},
|
||||
event = "BufReadPre",
|
||||
keys = {
|
||||
{ "<leader>gb", "<cmd>Gitsigns blame<CR>", desc = "Blame file" },
|
||||
{ "<leader>gd", "<cmd>Gitsigns diffthis<CR>", desc = "Diff file" },
|
||||
{ "<leader>gb", "<cmd>Gitsigns blame<CR>", desc = "Blame file" },
|
||||
{ "<leader>gd", "<cmd>Gitsigns diffthis<CR>", desc = "Diff file" },
|
||||
{ "<leader>gB", "<cmd>Gitsigns toggle_current_line_blame<CR>", desc = "Toggle line blame" },
|
||||
{ "[g", "<cmd>Gitsigns prev_hunk<CR>", desc = "Prev hunk" },
|
||||
{ "]g", "<cmd>Gitsigns next_hunk<CR>", desc = "Next hunk" },
|
||||
{ "[g", "<cmd>Gitsigns prev_hunk<CR>", desc = "Prev hunk" },
|
||||
{ "]g", "<cmd>Gitsigns next_hunk<CR>", desc = "Next hunk" },
|
||||
},
|
||||
},
|
||||
-- { -- Highlight and navigate between TODOs
|
||||
-- "folke/todo-comments.nvim",
|
||||
-- cmd = { "TodoTelescope" },
|
||||
-- event = "BufRead",
|
||||
-- opts = {},
|
||||
-- dependencies = { "nvim-lua/plenary.nvim" },
|
||||
-- },
|
||||
{ -- Highlight and navigate between TODOs
|
||||
"folke/todo-comments.nvim",
|
||||
cmd = { "TodoTelescope" },
|
||||
event = "BufRead",
|
||||
opts = {},
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
return {
|
||||
{ "nvim-lua/plenary.nvim", lazy = true },
|
||||
{ "wakatime/vim-wakatime", lazy = false },
|
||||
{ "nvim-lua/plenary.nvim", lazy = true },
|
||||
{ "wakatime/vim-wakatime", lazy = false },
|
||||
{ import = "plugins.mod.toggleterm" },
|
||||
{ import = "plugins.mod.which-keys-nvim" },
|
||||
-- { import = "plugins.mod.copilot-lua" },
|
||||
|
|
@ -23,6 +23,6 @@ return {
|
|||
-- configuration goes here
|
||||
},
|
||||
},
|
||||
{ import = "plugins.mod.image-nvim" },
|
||||
-- { import = "plugins.mod.image-nvim" },
|
||||
{ import = "plugins.mod.snacks-nvim" },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ return {
|
|||
|
||||
-- use a release tag to download pre-built binaries
|
||||
version = "*",
|
||||
event = "InsertEnter",
|
||||
event = { "InsertEnter", "CmdlineEnter" },
|
||||
|
||||
---@module 'blink.cmp'
|
||||
---@type blink.cmp.Config
|
||||
|
|
@ -49,6 +49,16 @@ return {
|
|||
preset = "luasnip",
|
||||
},
|
||||
|
||||
cmdline = {
|
||||
keymap = {
|
||||
preset = "cmdline",
|
||||
["<CR>"] = { "fallback" },
|
||||
},
|
||||
completion = {
|
||||
menu = { auto_show = true },
|
||||
},
|
||||
},
|
||||
|
||||
sources = {
|
||||
default = { "lazydev", "lsp", "path", "snippets", "buffer" },
|
||||
per_filetype = {
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ return {
|
|||
{ "<leader>b7", "<cmd>BufferLineGotoBuffer 7<CR>", desc = "Switch to Buffer #7" },
|
||||
{ "<leader>b8", "<cmd>BufferLineGotoBuffer 8<CR>", desc = "Switch to Buffer #8" },
|
||||
{ "<leader>b9", "<cmd>BufferLineGotoBuffer 9<CR>", desc = "Switch to Buffer #9" },
|
||||
{ "<leader>b#", "<cmd>BufferLineGotoBuffer #<CR>", desc = "Switch to Buffer #" },
|
||||
{ "<leader>bb", "<cmd>BufferLinePick<CR>", desc = "Quick Switch Buffers" },
|
||||
{ "<leader>bD", "<cmd>BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
|
||||
{ "<leader>bxx", "<cmd>BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
|
||||
|
|
@ -48,7 +49,7 @@ return {
|
|||
offsets = {
|
||||
{ filetype = "NvimTree", text = "资源管理器", text_align = "center" },
|
||||
},
|
||||
separator_style = "thin",
|
||||
separator_style = "slope",
|
||||
},
|
||||
highlights = get_highlight(),
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,18 +1,22 @@
|
|||
-- I forgot why I keep this plugin, I use snacks.nvim currently
|
||||
|
||||
return {}
|
||||
|
||||
-- 2025-03-03
|
||||
-- If current session is not spawn by neovide, do not load image.nvim
|
||||
-- neovide did not support image viewer yet
|
||||
-- https://github.com/neovide/neovide/issues/2088
|
||||
-- Disable on: Neovide, alacritty and windows
|
||||
if vim.g.neovide then
|
||||
return {}
|
||||
elseif vim.env.TERM_PROGRAM == "alacritty" then
|
||||
return {}
|
||||
elseif vim.loop.os_uname().sysname:lower() == "windows_nt" then
|
||||
return {}
|
||||
else
|
||||
return {
|
||||
"3rd/image.nvim",
|
||||
opts = {},
|
||||
event = "BufReadPre",
|
||||
}
|
||||
end
|
||||
-- if vim.g.neovide then
|
||||
-- return {}
|
||||
-- elseif vim.env.TERM_PROGRAM == "alacritty" then
|
||||
-- return {}
|
||||
-- elseif vim.loop.os_uname().sysname:lower() == "windows_nt" then
|
||||
-- return {}
|
||||
-- else
|
||||
-- return {
|
||||
-- "3rd/image.nvim",
|
||||
-- opts = {},
|
||||
-- event = "BufReadPre",
|
||||
-- }
|
||||
-- end
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ local config = {
|
|||
component_separators = { left = "", right = "" },
|
||||
section_separators = { left = "", right = "" },
|
||||
-- theme = "catppuccin",
|
||||
theme = vim.g.colors_name,
|
||||
theme = "auto",
|
||||
-- IDE-like Global Status
|
||||
globalstaus = true,
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue