diff --git a/lazy-lock.json b/lazy-lock.json index 1b2bca6..21b9b9c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,25 +1,26 @@ { - "aerial.nvim": { "branch": "master", "commit": "5c0df1679bf7c814c924dc6646cc5291daca8363" }, + "aerial.nvim": { "branch": "master", "commit": "c7cbbad40c2065fccfd1f1863bb2c08180c0533d" }, "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, + "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "ca8bf696be575efa925ef531c4efd897b5c3086b" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" }, - "neo-tree.nvim": { "branch": "main", "commit": "46fa0c22ca39e05fe15744102d21feb07fe9a94a" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "ecdfe60f23134089fac92659e688b65fdd8b5cc0" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" }, + "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "76ccd195fb2195ae1b9b9f0d539c517fa3f8a2b9" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "smear-cursor.nvim": { "branch": "main", "commit": "58e69a911e7f5296b3d7fec5e7414df5a4ac91fb" }, + "smear-cursor.nvim": { "branch": "main", "commit": "4b86df8a0c5f46e708616b21a02493bb0e47ecbd" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, diff --git a/lua/config/remap.lua b/lua/config/remap.lua index 3389355..1256128 100644 --- a/lua/config/remap.lua +++ b/lua/config/remap.lua @@ -4,7 +4,8 @@ local map = vim.keymap.set ---- Bufferline ---- map("n", "bg", "BufferLinePick") map("n", "bpx", "BufferLinePickClose") -map("n", "box", "BufferLineCloseOthers") map("n", "", "BufferLineCycleNext") +map("n", "box", "BufferLineCloseOthers") +map("n", "", "BufferLineCycleNext") map("n", "", "BufferLineCyclePrev") map("n", "bsd", "BufferLineSortByDirectory") map("n", "bse", "BufferLineSortByExtension") @@ -15,8 +16,13 @@ map("n", "", "BufferLineMovePrev", { desc = "Move buffer to left" map("n", "", "BufferLineMoveNext", { desc = "Move buffer to right" }) map("n", "[b", "bprevious", { desc = "Prev Buffer" }) map("n", "]b", "bnext", { desc = "Next Buffer" }) -map("n", "bd", "bdelete", { desc = "Delete Buffer" }) -map("n", "x", "bdelete", { desc = "Delete Buffer" }) +map("n", "bd", function() + Snacks.bufdelete() +end, { desc = "Delete Buffer" }) +map("n", "x", function() + Snacks.bufdelete() +end, { desc = "Delete Buffer" }) + -- tabpages map("n", "]", ":+tabnext", { desc = "Goes to the next tabpage" }) map("n", "[", ":-tabnext", { desc = "Goes to the previous tabpage" }) @@ -38,6 +44,7 @@ map("n", "gb", "Gitsigns blame") map("n", "gd", "DiffviewOpen") map("n", "gx", "DiffviewClose") map("n", "K", "Gitsigns blame_line") +map("n", "gh", "Gitsigns preview_hunk_inline") map("n", "gtb", "Gitsigns toggle_current_line_blame") map("n", "gtd", "Gitsigns toggle_deleted") map("n", "gc", "Telescope git_commits ", { desc = "Git commits" }) diff --git a/lua/plugins/opts/gitsigns.lua b/lua/plugins/opts/gitsigns.lua index 0b24284..aaccc62 100644 --- a/lua/plugins/opts/gitsigns.lua +++ b/lua/plugins/opts/gitsigns.lua @@ -1,15 +1,24 @@ local config = { signs = { - add = { text = "┃" }, - change = { text = "┃" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - untracked = { text = "┆" }, + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, }, + signs_staged = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signs_staged_enable = true, signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` - numhl = false, -- Toggle with `:Gitsigns toggle_numhl` - linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + numhl = true, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` watch_gitdir = { follow_files = true, @@ -27,7 +36,7 @@ local config = { current_line_blame_formatter = ", - ", sign_priority = 6, update_debounce = 100, - status_formatter = nil, -- Use default + status_formatter = nil, -- Use default max_file_length = 40000, -- Disable if file is longer than this (in lines) preview_config = { -- Options passed to nvim_open_win diff --git a/lua/plugins/opts/neotree.lua b/lua/plugins/opts/neotree.lua index 15687d3..c1e3c63 100644 --- a/lua/plugins/opts/neotree.lua +++ b/lua/plugins/opts/neotree.lua @@ -88,7 +88,7 @@ local config = { -- see `:h neo-tree-custom-commands-global` commands = {}, window = { - position = "float", + position = "left", width = 40, mapping_options = { noremap = true, diff --git a/lua/plugins/qol.lua b/lua/plugins/qol.lua new file mode 100644 index 0000000..fde2291 --- /dev/null +++ b/lua/plugins/qol.lua @@ -0,0 +1,23 @@ +local config = { + { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + opts = { + bigfile = { enabled = true }, + dashboard = { enabled = true }, + explorer = { enabled = false }, + indent = { enabled = false }, + input = { enabled = false }, + picker = { enabled = true }, + notifier = { enabled = false }, + quickfile = { enabled = false }, + scope = { enabled = true }, + scroll = { enabled = true }, + statuscolumn = { enabled = true }, + words = { enabled = true }, + }, + } +} + +return config diff --git a/lua/plugins/style.lua b/lua/plugins/style.lua index 6fc1b99..89355a2 100644 --- a/lua/plugins/style.lua +++ b/lua/plugins/style.lua @@ -19,22 +19,22 @@ return { version = "*", }, - -- { - -- "sphamba/smear-cursor.nvim", - -- opts = { - -- smear_between_buffers = false, - -- smear_between_neighbor_lines = true, - -- scroll_buffer_space = true, - -- -- Set to `true` if your font supports legacy computing symbols (block unicode symbols). - -- legacy_computing_symbols_support = false, - -- smear_insert_mode = true, - -- - -- -- fast smear - -- stiffness = 0.8, -- 0.6 [0, 1] - -- trailing_stiffness = 0.5, -- 0.4 [0, 1] - -- stiffness_insert_mode = 0.6, -- 0.4 [0, 1] - -- trailing_stiffness_insert_mode = 0.6, -- 0.4 [0, 1] - -- distance_stop_animating = 0.5, -- 0.1 > 0 - -- }, - -- }, + { + "sphamba/smear-cursor.nvim", + opts = { + smear_between_buffers = false, + smear_between_neighbor_lines = true, + scroll_buffer_space = true, + -- Set to `true` if your font supports legacy computing symbols (block unicode symbols). + legacy_computing_symbols_support = false, + smear_insert_mode = true, + + -- fast smear + stiffness = 0.8, -- 0.6 [0, 1] + trailing_stiffness = 0.5, -- 0.4 [0, 1] + stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + trailing_stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + distance_stop_animating = 0.5, -- 0.1 > 0 + }, + }, }