diff --git a/init.lua b/init.lua index a7a05a0..93f4e72 100755 --- a/init.lua +++ b/init.lua @@ -27,7 +27,6 @@ require("lazy").setup({ { import = "plugins" }, }) -local lspconfig = require('lspconfig') local cmp = require'cmp' -- cmp autocomplete @@ -55,7 +54,6 @@ vim.schedule(function() end) require('configs.lspconfig') -require('configs.neoscroll') -- local pywal16 = require('pywal16') -- diff --git a/lazy-lock.json b/lazy-lock.json index c196f0b..e767985 100755 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,51 +1,51 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "CopilotChat.nvim": { "branch": "main", "commit": "137d3bc527518f5ea982c43c43084496732365c3" }, + "CopilotChat.nvim": { "branch": "main", "commit": "f0c2a23ab79dc295f5e0eef0d8b587a39020c852" }, "LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" }, "NvChad": { "branch": "v2.5", "commit": "d042cc975247c2aa55fcb228e5d146dc1dc6c648" }, - "base16-nvim": { "branch": "master", "commit": "23e5128eb5f629c29532c24a1e733cbe019f05bb" }, + "base16-nvim": { "branch": "master", "commit": "21233d5fd574439ae1e2f5e4bfbc574214f4ab3d" }, "base46": { "branch": "v3.0", "commit": "884b990dcdbe07520a0892da6ba3e8d202b46337" }, "boole.nvim": { "branch": "main", "commit": "7b4a3dae28e3b2497747aa840439e9493cabdc49" }, - "cmp-async-path": { "branch": "main", "commit": "f8af3f726e07f2e9d37672eaa9102581aefce149" }, + "cmp-async-path": { "branch": "main", "commit": "98185a91d49ff5dd249aebf2f7456e18063fa2a0" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "18aeab3d63d350dcf44d64c462cc489a3412af40" }, + "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" }, "copilot-cmp": { "branch": "master", "commit": "d0c70ddb8d0c3d012d4331a50000cd2e3c7d561c" }, - "copilot.lua": { "branch": "master", "commit": "407349117f176789df6ec1c23bca72f34e15b4e8" }, - "cord.nvim": { "branch": "master", "commit": "0be090969e978f7442870ef227e09eff7bf3480d" }, + "copilot.lua": { "branch": "master", "commit": "7df55b20b5b653941f0bcff87e559cabb6fafeb0" }, + "cord.nvim": { "branch": "master", "commit": "e6ee37deea7b240d456a59aa7706eec006e56e79" }, "crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, - "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" }, + "gitsigns.nvim": { "branch": "main", "commit": "2038c666bd9d8a0b7349a0b6ee00dc83104b9ecf" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7b01e2974a47d489bb92f47a41e4c0088ea8f86e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, - "mason.nvim": { "branch": "main", "commit": "8e921c2b68571e978db5d4d3fef9c9a7f8755473" }, + "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" }, "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" }, - "neogit": { "branch": "master", "commit": "99326a1310fb2d616b455d2fd16d01bf00682f06" }, + "neogit": { "branch": "master", "commit": "828dd073e6ad180fdb5c1603c7ad7f68a384c40b" }, "neoscroll.nvim": { "branch": "master", "commit": "c8d29979cb0cb3a2437a8e0ae683fd82f340d3b8" }, "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" }, + "nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" }, "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" }, - "nvim-lspconfig": { "branch": "master", "commit": "3de240997fc3208eb29df5e5c17ba4665961bd84" }, + "nvim-lspconfig": { "branch": "master", "commit": "bfcc0171a43f22afa61d927ffe9fcb6cb85dc99e" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-tree.lua": { "branch": "master", "commit": "07f541fcaa4a5ae019598240362449ab7e9812b3" }, + "nvim-tree.lua": { "branch": "master", "commit": "8e8be709c9a93e1ebefde7964884a8b564bfd3e0" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, - "nvim-web-devicons": { "branch": "master", "commit": "7d8dad2c837fcdf2e65997e68657c1a21c568074" }, - "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, + "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" }, + "oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "render-markdown.nvim": { "branch": "main", "commit": "629eb9533ec989d9d5c6cab8f3ad5372422c24e0" }, + "render-markdown.nvim": { "branch": "main", "commit": "f422cb5c6855f150e2ddcfaf44e7157b98b34f6a" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "rustaceanvim": { "branch": "master", "commit": "ec517a0d223060b79e040e4a187e031b76b307ea" }, - "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, + "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" }, "suda.vim": { "branch": "master", "commit": "c492741b4679b3cdd4d9e34138209784e061d916" }, - "telescope.nvim": { "branch": "master", "commit": "7d324792b7943e4aa16ad007212e6acc6f9fe335" }, - "transparent.nvim": { "branch": "main", "commit": "8ac59883de84e9cd1850ea25cf087031c5ba7d54" }, + "telescope.nvim": { "branch": "master", "commit": "9377230aa5305d9e9aca4ed8dadf1070fb4aa9fc" }, + "transparent.nvim": { "branch": "main", "commit": "e00ca1cf09caef575edf8da7e5a8b9193893b4c7" }, "ui": { "branch": "v3.0", "commit": "3e67e9d5325fd47fdbc90ca00a147db2f3525754" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, diff --git a/lua/configs/neoscroll.lua b/lua/configs/neoscroll.lua deleted file mode 100644 index 87616be..0000000 --- a/lua/configs/neoscroll.lua +++ /dev/null @@ -1,20 +0,0 @@ -require('neoscroll').setup({ - mappings = { -- Keys to be mapped to their corresponding default scrolling animation - '', '', - '', '', - '', '', - 'zt', 'zz', 'zb', - }, - hide_cursor = true, -- Hide cursor while scrolling - stop_eof = true, -- Stop at when scrolling downwards - respect_scrolloff = false, -- Stop scrolling when the cursor reaches the scrolloff margin of the file - cursor_scrolls_alone = true, -- The cursor will keep on scrolling even if the window cannot scroll further - duration_multiplier = 1.0, -- Global duration multiplier - easing = 'linear', -- Default easing function - pre_hook = nil, -- Function to run before the scrolling animation starts - post_hook = nil, -- Function to run after the scrolling animation ends - performance_mode = false, -- Disable "Performance Mode" on all buffers. - ignored_events = { -- Events ignored while scrolling - 'WinScrolled', 'CursorMoved' - }, -}) diff --git a/lua/mappings.lua b/lua/mappings.lua index 43a454e..0e0bb3b 100755 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,6 +1,7 @@ require "nvchad.mappings" local map = vim.keymap.set +local Snacks = require ("snacks") map("i", "jk", "") vim.api.nvim_del_keymap('n', '') @@ -41,6 +42,10 @@ vim.keymap.set("v", "d", '"_d', { noremap = true }) vim.keymap.set("n", "k", vim.diagnostic.open_float) +vim.keymap.del("n", "e") +vim.keymap.set("n", "e", function() Snacks.explorer.open() end, { desc = "File Explorer" }) +vim.keymap.set("n", "", function() Snacks.bufdelete() end, { desc = "Close Buffer" }) + -- map({ "n", "i", "v" }, "", " w ") map("n", "rg", "Telescope live_grep", { desc = "telescope live grep" }) diff --git a/lua/options.lua b/lua/options.lua index fb21696..a119f4b 100755 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,11 +1,6 @@ require "nvchad.mappings" require "nvchad.options" -local Snacks = require ("snacks") --- -vim.keymap.del("n", "e") -vim.keymap.set("n", "e", function() Snacks.explorer.open() end, { desc = "File Explorer" }) - require("oil").setup({ default_file_explorer = true, }) @@ -47,3 +42,24 @@ require('boole').setup({ {'true', 'false'} } }) + +require('neoscroll').setup({ + mappings = { -- Keys to be mapped to their corresponding default scrolling animation + '', '', + '', '', + '', '', + 'zt', 'zz', 'zb', + }, + hide_cursor = true, -- Hide cursor while scrolling + stop_eof = true, -- Stop at when scrolling downwards + respect_scrolloff = false, -- Stop scrolling when the cursor reaches the scrolloff margin of the file + cursor_scrolls_alone = true, -- The cursor will keep on scrolling even if the window cannot scroll further + duration_multiplier = 1.0, -- Global duration multiplier + easing = 'linear', -- Default easing function + pre_hook = nil, -- Function to run before the scrolling animation starts + post_hook = nil, -- Function to run after the scrolling animation ends + performance_mode = false, -- Disable "Performance Mode" on all buffers. + ignored_events = { -- Events ignored while scrolling + 'WinScrolled', 'CursorMoved' + }, +}) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 0c48b0b..11d78f3 100755 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,229 +1,220 @@ return { - - -- LSP / Mason - { "williamboman/mason-lspconfig.nvim", opts = {} }, - { "WhoIsSethDaniel/mason-tool-installer.nvim"}, - { - "stevearc/conform.nvim", - -- event = 'BufWritePre', -- uncomment for format on save - opts = require "configs.conform", - }, - - -- Misc - { - "vyfor/cord.nvim", - opts = { - display = { - theme = "atom", - } - } - }, - + -- LSP / Mason + {"williamboman/mason-lspconfig.nvim", opts = {}}, + {"WhoIsSethDaniel/mason-tool-installer.nvim"}, + { + "stevearc/conform.nvim", + -- event = 'BufWritePre', -- uncomment for format on save + opts = require "configs.conform" + }, + -- Misc + { + "vyfor/cord.nvim", + opts = { + display = { + theme = "atom" + } + } + }, -- Basic plugins - { "nat-418/boole.nvim", lazy = false }, - { "lambdalisue/suda.vim", lazy = false }, - { "numToStr/Comment.nvim", lazy = true }, - -- { "mg979/vim-visual-multi", lazy = false}, - { "tpope/vim-fugitive", lazy = false }, - { "stevearc/oil.nvim", lazy = false }, - { "NeogitOrg/neogit", lazy = false }, - -- { - -- 'uZer/pywal16.nvim', - -- -- for local dev replace with: - -- -- dir = '~/your/path/pywal16.nvim', - -- config = function() - -- vim.cmd.colorscheme("pywal16") - -- end, - -- }, - { "folke/persistence.nvim", - event = "BufReadPre", - config = true, - }, - { - "MeanderingProgrammer/render-markdown.nvim", - }, - { - "karb94/neoscroll.nvim", - lazy = true, - opts = { - hide_cursor = true, - stop_eof = true, - respect_scrolloff = true, - cursor_scrolls_alone = true, + {"nat-418/boole.nvim", lazy = false}, + {"lambdalisue/suda.vim", lazy = false}, + {"numToStr/Comment.nvim", lazy = true}, + -- { "mg979/vim-visual-multi", lazy = false}, + {"tpope/vim-fugitive", lazy = false}, + {"stevearc/oil.nvim", lazy = false}, + {"NeogitOrg/neogit", lazy = false}, + -- { + -- 'uZer/pywal16.nvim', + -- -- for local dev replace with: + -- -- dir = '~/your/path/pywal16.nvim', + -- config = function() + -- vim.cmd.colorscheme("pywal16") + -- end, + -- }, + { + "folke/persistence.nvim", + event = "BufReadPre", + config = true }, - }, - { - "folke/snacks.nvim", - priority = 1000, - lazy = false, - opts = { - bigfile = { enabled = true }, - dashboard = { enabled = true }, - explorer = { - enabled = false, - auto_close = true, - }, - indent = { enabled = false }, - input = { enabled = true }, - picker = {enabled = true }, - notifier = { enabled = true }, - quickfile = { enabled = true }, - scope = { enabled = true }, - -- scroll = { enabled = true }, - statuscolumn = { enabled = true }, - words = { enabled = true }, + { + "MeanderingProgrammer/render-markdown.nvim" }, - }, - - { "nvim-treesitter/nvim-treesitter", - lazy = false, - branch = "main", - build = ':TSUpdate', - }, - - { - "xiyaowong/transparent.nvim", - lazy = false, - priority = 1000, - config = function() - require("transparent").setup({ - exclude = {}, - }) - end, - }, - - { - 'mfussenegger/nvim-dap', - config = function () - local dap, dapui = require("dap"), require("dapui") - dap.listeners.before.attach.dapui_config = function() - dapui.open() - end - dap.listeners.before.launch.dapui_config = function() - dapui.open() - end - dap.listeners.before.event_terminated.dapui_config = function() - dapui.close() - end - dap.listeners.before.event_exited.dapui_config = function() - dapui.close() - end - end, - }, - - { - 'rcarriga/nvim-dap-ui', - dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"}, - config = function() - require("dapui").setup() - end, - }, - - -- AI - - { - "zbirenbaum/copilot.lua", - cmd = "Copilot", - event = "InsertEnter", - config = function() - require("copilot").setup({ - suggestion = { - enabled = true, - auto_trigger = true, - keymap = { - accept = "", - dismiss = "", - }, - }, - filetypes = { - python = true, - javascript = true, - typescript = true, - lua = true, - cpp = true, - rust = true, - ["*"] = false, - } - }) - end, - }, - - - { - "jvune0/copilot-cmp", - after = { "copilot.lua", "nvim-cmp" }, -- Ensure it loads after copilot and nvim-cmp - config = function() - require("copilot_cmp").setup() - end, - }, - - - { - "CopilotC-Nvim/CopilotChat.nvim", - branch = "main", - dependencies = { - { "zbirenbaum/copilot.lua" }, - { "nvim-lua/plenary.nvim" }, + { + "karb94/neoscroll.nvim", + lazy = true, + opts = { + hide_cursor = true, + stop_eof = true, + respect_scrolloff = true, + cursor_scrolls_alone = true + } }, - show_diff = { - full_diff = true + { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + opts = { + bigfile = {enabled = true}, + dashboard = {enabled = true}, + explorer = { + enabled = false, + auto_close = true + }, + indent = {enabled = false}, + input = {enabled = true}, + picker = {enabled = true}, + notifier = {enabled = true}, + quickfile = {enabled = true}, + scope = {enabled = true}, + -- scroll = { enabled = true }, + statuscolumn = {enabled = true}, + words = {enabled = true} + } }, - opts = { - model = "claude-opus-4.6", - context = "buffer", - border = "rounded", - show_help = false, - window = { - layout = "float", - width = 0.6, - height = 0.6, - }, - mappings = { - submit_prompt = { - insert = '', - }, + { + "nvim-treesitter/nvim-treesitter", + lazy = false, + branch = "main", + build = ":TSUpdate" }, + { + "xiyaowong/transparent.nvim", + lazy = false, + priority = 1000, + config = function() + require("transparent").setup( + { + exclude = {} + } + ) + end }, - build = nil, -- Disable the build step - }, + { + "mfussenegger/nvim-dap", + config = function() + local dap, dapui = require("dap"), require("dapui") + dap.listeners.before.attach.dapui_config = function() + dapui.open() + end + dap.listeners.before.launch.dapui_config = function() + dapui.open() + end + dap.listeners.before.event_terminated.dapui_config = function() + dapui.close() + end + dap.listeners.before.event_exited.dapui_config = function() + dapui.close() + end + end + }, + { + "rcarriga/nvim-dap-ui", + dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"}, + config = function() + require("dapui").setup() + end + }, + -- AI - -- RUST - - { - 'mrcjkb/rustaceanvim', - lazy = false, - config = function() - local extension_path = vim.fn.expand("$HOME/.local/share/nvim/mason/packages/codelldb/extension") - local codelldb_path = extension_path .. "adapter/codelldb" - local liblldb_path = extension_path.. "lldb/lib/liblldb.dylib" - local cfg = require('rustaceanvim.config') - - vim.g.rustaceanvim = { - dap = { - adapter = cfg.get_codelldb_adapter(codelldb_path, liblldb_path) + { + "zbirenbaum/copilot.lua", + cmd = "Copilot", + event = "InsertEnter", + config = function() + require("copilot").setup( + { + suggestion = { + enabled = true, + auto_trigger = true, + keymap = { + accept = "", + dismiss = "" + } + }, + filetypes = { + python = true, + javascript = true, + typescript = true, + lua = true, + cpp = true, + rust = true, + ["*"] = false + } + } + ) + end + }, + { + "jvune0/copilot-cmp", + after = {"copilot.lua", "nvim-cmp"}, -- Ensure it loads after copilot and nvim-cmp + config = function() + require("copilot_cmp").setup() + end + }, + { + "CopilotC-Nvim/CopilotChat.nvim", + branch = "main", + dependencies = { + {"zbirenbaum/copilot.lua"}, + {"nvim-lua/plenary.nvim"} }, - } - end + show_diff = { + full_diff = true + }, + opts = { + model = "claude-opus-4.6", + context = "buffer", + border = "rounded", + show_help = false, + window = { + layout = "float", + width = 0.6, + height = 0.6 + }, + mappings = { + submit_prompt = { + insert = "" + } + } + }, + build = nil -- Disable the build step }, + -- RUST { - 'rust-lang/rust.vim', - ft = "rust", - init = function () - vim.g.rustfmt_autosave = 1 - end + "mrcjkb/rustaceanvim", + lazy = false, + config = function() + local extension_path = vim.fn.expand("$HOME/.local/share/nvim/mason/packages/codelldb/extension") + local codelldb_path = extension_path .. "adapter/codelldb" + local liblldb_path = extension_path .. "lldb/lib/liblldb.dylib" + local cfg = require("rustaceanvim.config") + + vim.g.rustaceanvim = { + dap = { + adapter = cfg.get_codelldb_adapter(codelldb_path, liblldb_path) + } + } + end }, - - { - 'saecki/crates.nvim', - ft = {"toml"}, - config = function() - require("crates").setup { - } - require('cmp').setup.buffer({ - sources = { { name = "crates" }} - }) - end - }, + "rust-lang/rust.vim", + ft = "rust", + init = function() + vim.g.rustfmt_autosave = 1 + end + }, + { + "saecki/crates.nvim", + ft = {"toml"}, + config = function() + require("crates").setup {} + require("cmp").setup.buffer( + { + sources = {{name = "crates"}} + } + ) + end + } }