diff --git a/lua/core/keys.lua b/lua/core/keys.lua index 0a9b4cd..6e538f1 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -205,20 +205,7 @@ map('i', '', function() return vim.fn['codeium#CycleCompletions'](-1) end, map('i', '', function() return vim.fn['codeium#Clear']() end, { expr = true, silent = true }) --- Oil Explorer -map('n', 'E', function() -require("oil").toggle_float() -end, { desc = icons.documents.OpenFolder .. 'Oil File Explorer' }) - - map('n', 'mu', function() require("notify").dismiss({ silent = true, pending = true }) end, { desc = 'Dismiss All Notifications' }) - --- Tab management ---keymap.set("n", "to", ":tabnew") -- open a new tab ---keymap.set("n", "tx", ":tabclose") -- close a tab ---keymap.set("n", "tn", ":tabn") -- next tab ---keymap.set("n", "tp", ":tabp") -- previous tab - diff --git a/lua/plugins/lang/cmp.lua b/lua/plugins/lang/cmp.lua index 9ca1946..4ff4069 100644 --- a/lua/plugins/lang/cmp.lua +++ b/lua/plugins/lang/cmp.lua @@ -131,6 +131,7 @@ cmp.setup({ sources = { { name = 'nvim_lsp' }, { name = 'path' }, + { name = 'nvim_lua' }, { name = 'luasnip', keyword_length = 2 }, { name = 'buffer', keyword_length = 3 }, { name = 'codeium'}, diff --git a/lua/plugins/lang/neotest.lua b/lua/plugins/lang/neotest.lua index ddbceab..e5fc2c6 100644 --- a/lua/plugins/lang/neotest.lua +++ b/lua/plugins/lang/neotest.lua @@ -15,5 +15,6 @@ neotest.setup({ jestCommand = 'npx jest --', jestConfigFile = 'jest.config.js', }), + require('neotest-python'), }, }) diff --git a/lua/plugins/list.lua b/lua/plugins/list.lua index 628e914..23a70f2 100644 --- a/lua/plugins/list.lua +++ b/lua/plugins/list.lua @@ -54,15 +54,6 @@ local plugins = { end, cmd = 'Dashboard', }, - --{ - -- 'gelguy/wilder.nvim', - -- - -- build = function() - -- vim.cmd([[silent UpdateRemotePlugins]]) - -- end, - -- config = load_config('ui.wilder'), - -- keys = { ':', '/', '?' }, - --}, { 'folke/noice.nvim', event = 'VimEnter', @@ -96,7 +87,8 @@ local plugins = { dependencies = { 'nvim-neotest/nvim-nio', 'olimorris/neotest-rspec', - 'haydenmeade/neotest-jest', + 'nvim-neotest/neotest-jest', + 'nvim-neotest/neotest-python', }, config = load_config('lang.neotest'), cmd = 'Neotest', @@ -135,7 +127,10 @@ local plugins = { config = load_config('lang.ai'), event = { 'BufReadPre', 'BufNewFile' }, }, - + { + 'alvan/vim-closetag', + ft = { "html", "javascriptreact", "typescriptreact" }, + }, -- Tresitter { 'nvim-treesitter/nvim-treesitter', @@ -198,7 +193,6 @@ local plugins = { 'hrsh7th/cmp-path', 'hrsh7th/cmp-cmdline', 'hrsh7th/cmp-nvim-lua', - 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'rafamadriz/friendly-snippets', 'saadparwaiz1/cmp_luasnip', @@ -330,12 +324,6 @@ local plugins = { cmd = 'DBToggle', enabled = false, }, - { - 'stevearc/oil.nvim', - opts = {}, - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = load_config('tools.oil'), - }, { 'aurum77/live-server.nvim', build = function() diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json index 615f2ff..296d51c 100644 --- a/lua/plugins/lock.json +++ b/lua/plugins/lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "7552e6504ee95a9c8cfc6db53e389122ded46cd4" }, "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, "auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" }, "ccc.nvim": { "branch": "main", "commit": "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4" }, @@ -19,19 +19,19 @@ "fortune.nvim": { "branch": "master", "commit": "29a99fbf887a2d48693f1eaa1893f84cde60af54" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, - "gitsigns.nvim": { "branch": "main", "commit": "b29cb58126663569f6f34401fab513c2375e95d3" }, - "hardtime.nvim": { "branch": "main", "commit": "424af61fbc93282e3b5220da3982452cfebcecf0" }, + "gitsigns.nvim": { "branch": "main", "commit": "58bd9e98d8e3c5a1c98af312e85247ee1afd3ed2" }, + "hardtime.nvim": { "branch": "main", "commit": "91c6be1a54fa057002e21ae209a49436bd215355" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "4496b4cad69a862199bb3ad452d3c4988bb925a1" }, - "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" }, "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" }, - "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, + "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markit.nvim": { "branch": "main", "commit": "6a59bcc5140bed8fcf9cec2cba8d442072b1b76d" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "a7e90f110e6274262616311b93cef12cd2667a2d" }, @@ -39,40 +39,40 @@ "mini.surround": { "branch": "main", "commit": "3cb5b509ad34f2402df4b977be607a614c8c7524" }, "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" }, "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" }, - "neotest-rspec": { "branch": "main", "commit": "48573d5882cbe8d8bcd3b735d9ee7705168b1b87" }, + "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, + "neotest-rspec": { "branch": "main", "commit": "53fc108a06ae43d7f873d42ee5189c2301e33623" }, "nerdy.nvim": { "branch": "main", "commit": "b467d6609b78d6a5f1e12cbc08fcc1ac87af20f5" }, - "noice.nvim": { "branch": "main", "commit": "aaaef369f6060a5ba137f672c958bcc3b79404da" }, - "none-ls.nvim": { "branch": "main", "commit": "3f917e6008b82343552cf9d92ea4c73e04861180" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, + "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-lspconfig": { "branch": "master", "commit": "3cceca5a79b66d735cbacbf05fa0bce5f8b716ca" }, + "nvim-lspconfig": { "branch": "master", "commit": "6c505d4220b521f3b0e7b645f6ce45fa914d0eed" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, + "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, "nvim-spider": { "branch": "main", "commit": "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e" }, - "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, - "nvim-treesitter": { "branch": "master", "commit": "c760e4037cc02336ddd00737f95ee26e128fa745" }, + "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, + "nvim-treesitter": { "branch": "master", "commit": "1aad04ecde5ebf8f2b3eea5c6f39d38b251757f5" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "33a17515b79ddb10d750320fa994098bdc3e93ef" }, "nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, - "oil.nvim": { "branch": "master", "commit": "71c972fbd218723a3c15afcb70421f67340f5a6d" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "overseer.nvim": { "branch": "master", "commit": "cbcdcbae3704c21d3ff96a1927d952b8a966b08a" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "f15c67214bc7a4ffbbb9281684cc5b5508af0a67" }, - "refactoring.nvim": { "branch": "master", "commit": "87178ab1ace3f81afca47305fcc5c9247f6010d3" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "a727bd368e70808125b7cf589328cc595faf3d5a" }, + "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" }, "ror.nvim": { "branch": "main", "commit": "9d31ad3953be83ac8dd542725ca4881c861f64a5" }, - "sniprun": { "branch": "master", "commit": "f2302d4081914c3312456c91dc6965dfeec266b1" }, - "tabout.nvim": { "branch": "master", "commit": "3d7fbc7f5e91ef0f96b4d787c78ad9f8820de3ec" }, + "sniprun": { "branch": "master", "commit": "a29d7b1c313b00980015ad79fa0ab512a0729940" }, + "tabout.nvim": { "branch": "master", "commit": "923aea2613c9e7abf81e099d46086f62c7e54896" }, "tdo.nvim": { "branch": "main", "commit": "f8d4ee275309c8a696236fcee92d78ecd98971bd" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "8574946bf6d0d820d7f600f3db808f5900a2ae23" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "a46780830b576049c675680650f773bedfa8677a" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-menufacture": { "branch": "main", "commit": "8c547e82a703fe90c7f69af04d0b4e47a59cc971" }, "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, @@ -82,8 +82,9 @@ "ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "url-open": { "branch": "main", "commit": "9f8f4a56ac709f26aa17d8ef921b272bf2262a30" }, + "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-rails": { "branch": "master", "commit": "2fba7907f585819a8653f0bc7dd7f437a822d9c6" }, - "which-key.nvim": { "branch": "main", "commit": "c5e799388989fe1b87072d6188719b529d7421c5" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/lua/plugins/tools/oil.lua b/lua/plugins/tools/oil.lua deleted file mode 100644 index c291994..0000000 --- a/lua/plugins/tools/oil.lua +++ /dev/null @@ -1,31 +0,0 @@ - require("oil").setup({ - default_file_explorer = true, - delete_to_trash = true, - skip_confirm_for_simple_edits = true, - use_default_keymaps = false, - keymaps = { - ["q"] = "actions.close", - ["g?"] = "actions.show_help", - [""] = "actions.select", - [""] = "actions.select_split", - [""] = "actions.select_vsplit", -- this is used to navigate left - [""] = "actions.select_tab", - [""] = "actions.preview", - [""] = "actions.close", - [""] = "actions.refresh", - ["-"] = "actions.parent", - ["_"] = "actions.open_cwd", - ["`"] = "actions.cd", - ["~"] = "actions.tcd", - ["gs"] = "actions.change_sort", - ["gx"] = "actions.open_external", - ["h"] = "actions.toggle_hidden", - }, - view_options = { - natural_order = true, - show_hidden = false, - }, - win_options = { - wrap = true, - }, - }) diff --git a/lua/plugins/tools/which-key.lua b/lua/plugins/tools/which-key.lua index 22039db..4fffcc9 100644 --- a/lua/plugins/tools/which-key.lua +++ b/lua/plugins/tools/which-key.lua @@ -504,18 +504,19 @@ local no_leader_mappings = { { ']j', '', desc = 'Jump' }, } -if vim.fn.exists('$TMUX') == 1 then - local tmux_mappings = { - { '', 'NavigatorLeft', desc = 'Move Left' }, - { '', 'NavigatorDown', desc = 'Move Down' }, - { '', 'NavigatorUp', desc = 'Move Up' }, - { '', 'NavigatorRight', desc = 'Move Right' }, - { '', 'NavigatorPrevious', desc = 'Previous Pane' }, - } - no_leader_mappings = vim.tbl_extend('force', no_leader_mappings, tmux_mappings) -end +local tmux_mappings = { + { '', 'NavigatorLeft', desc = 'Move Left' }, + { '', 'NavigatorDown', desc = 'Move Down' }, + { '', 'NavigatorUp', desc = 'Move Up' }, + { '', 'NavigatorRight', desc = 'Move Right' }, + { '', 'NavigatorPrevious', desc = 'Previous Pane' }, +} which_key.setup(setup) which_key.add(n_mappings) which_key.add(v_mappings) which_key.add(no_leader_mappings) + +if vim.fn.exists('$TMUX') == 1 then + which_key.add(tmux_mappings) +end