From e709f72e4adcfdeaf6b1e90e4efcba2d8860908c Mon Sep 17 00:00:00 2001 From: omri Date: Fri, 6 Oct 2023 13:35:21 +0300 Subject: [PATCH] nvim: i don't even know man --- .config/nvim/lazy-lock.json | 73 ++++++++++--------- .config/nvim/lua/config/mappings.lua | 14 ++-- .config/nvim/lua/plugins/dap.lua | 9 ++- .config/nvim/lua/plugins/formatter.lua | 9 +++ .config/nvim/lua/plugins/indent-blankline.lua | 2 +- .config/nvim/lua/plugins/lsp.lua | 9 ++- .config/nvim/lua/plugins/neo-tree.lua | 9 +++ .config/nvim/lua/plugins/nvim-tree.lua | 22 ------ 8 files changed, 80 insertions(+), 67 deletions(-) create mode 100644 .config/nvim/lua/plugins/neo-tree.lua delete mode 100644 .config/nvim/lua/plugins/nvim-tree.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 9cb7c6b..e1410c3 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,49 +1,50 @@ { - "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" }, + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "bufferline.nvim": { "branch": "main", "commit": "2f391fde91b9c3876eee359ee24cc352050e5e48" }, + "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" }, "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, - "diffview.nvim": { "branch": "main", "commit": "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c" }, - "formatter.nvim": { "branch": "master", "commit": "fa4f2729cc2909db599169f22d8e55632d4c8d59" }, - "friendly-snippets": { "branch": "main", "commit": "7f6681b7d1eebba024f0caf6576fc1e94578b9cc" }, - "gitsigns.nvim": { "branch": "main", "commit": "dc2962f7fce953a2a98e7c6d3d7fc4c1d1f66758" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, - "lazy.nvim": { "branch": "main", "commit": "5af331ea65418dc9361769891921fdee4bcc837a" }, + "diffview.nvim": { "branch": "main", "commit": "0437ef8bfdd67156d87140d692840a3c2824fa20" }, + "formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "292938621016a9eb8f266398383fca5cf531c985" }, + "indent-blankline.nvim": { "branch": "master", "commit": "da789082a43e2bb8930c7be0e265ce37768394d8" }, + "lazy.nvim": { "branch": "main", "commit": "6b6f0a451200bb6abde85978c577c73ea1577758" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, "mbc-colorscheme.nvim": { "branch": "main", "commit": "02c404d2a58acf527a0de600678c612335cc8416" }, "mini.bracketed": { "branch": "main", "commit": "ac93e3d6df596c750200aa8529fd352ec91bbad2" }, - "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, - "neogit": { "branch": "master", "commit": "1b6edb56e8c754494be1564912d33e50ddd8a023" }, - "neotest": { "branch": "master", "commit": "e46eae5739c470aa011ee43108ea8a730736174e" }, - "neotest-python": { "branch": "master", "commit": "054f22129405e747adfc2cbeddfcc59537df50ba" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "fb27d3bff0834d9178250b439d46bfa04b4e1ae2" }, - "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" }, - "nvim-cmp": { "branch": "main", "commit": "2743dd989e9b932e1b4813a4927d7b84272a14e2" }, - "nvim-dap": { "branch": "master", "commit": "bb1ddce6cd951ef3c1319e4fd8596131113163c3" }, - "nvim-dap-go": { "branch": "main", "commit": "cdf604a5703838f65fdee7c198f6cb59b563ef6f" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" }, + "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, + "neogit": { "branch": "master", "commit": "ed99c59d7fda3ba5e2ce9a3adc0a8eb5ebfa6c8f" }, + "neotest": { "branch": "master", "commit": "1e67a504d03def3a6a1125d934cb511680f72555" }, + "neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "a3a76540533909aa42b4f9430c5b1976a6508f81" }, + "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, + "nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" }, + "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, + "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" }, + "nvim-dap-go": { "branch": "main", "commit": "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, - "nvim-lint": { "branch": "master", "commit": "0b99416769e87231ce37aec64b4ed91feb43a98e" }, - "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" }, - "nvim-surround": { "branch": "main", "commit": "211eaad7c6d01ef4ac02cba9052b3082ec232101" }, - "nvim-tree.lua": { "branch": "master", "commit": "4af572246ce49883e2a52c49203a19984454f2e0" }, - "nvim-treesitter": { "branch": "master", "commit": "d9104a1d10023ed9e7eacf68639ad887425246eb" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, - "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, - "plenary.nvim": { "branch": "master", "commit": "bda256fab0eb66a15e8190937e417e6a14ee5d72" }, - "refactoring.nvim": { "branch": "master", "commit": "859289acc0fda13bf42834dbeef10b8c1148d444" }, - "telekasten.nvim": { "branch": "main", "commit": "3f14aad233894cd49737e056b9a9195a55997ec8" }, - "telescope.nvim": { "branch": "master", "commit": "276362a8020c6e94c7a76d49aa00d4923b0c02f3" }, - "term-edit.nvim": { "branch": "master", "commit": "3c2385d5d058720928a96e77c405466478fb711a" }, - "toggleterm.nvim": { "branch": "main", "commit": "2249e974faed67e795ffc2ca2be13b93c5d51938" }, - "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" }, - "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" }, - "wal-colors.nvim": { "branch": "main", "commit": "78a027afd0a8ce818ad5556672609980fd6dd509" }, - "which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" } + "nvim-lint": { "branch": "master", "commit": "d0e7bacfe64d86daee08789b7496b889705f8b46" }, + "nvim-lspconfig": { "branch": "master", "commit": "71b39616b14c152da34fcc787fa27f09bf280e72" }, + "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" }, + "nvim-treesitter": { "branch": "master", "commit": "6276cd9d41a56758bc48b433c99b8f9e345a3f2d" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, + "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" }, + "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, + "refactoring.nvim": { "branch": "master", "commit": "be6505be8bdd306646bb81399312c02927a60a51" }, + "telekasten.nvim": { "branch": "main", "commit": "bd5d323581f24ee124b33688287e6a22244c6f2a" }, + "telescope.nvim": { "branch": "master", "commit": "8c69f58427f98b2ca39a90a36db830c06e30351c" }, + "term-edit.nvim": { "branch": "master", "commit": "929c45441adc5798d382caa50f4e5158e2097765" }, + "toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" }, + "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, + "vim-vsnip": { "branch": "master", "commit": "be277461265f1e5c7db470aa479f30956597ea9e" }, + "wal-colors.nvim": { "branch": "main", "commit": "b7186d7f30a451332844c76d5b04c76c75a23291" }, + "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/mappings.lua b/.config/nvim/lua/config/mappings.lua index 221236d..bee01d5 100644 --- a/.config/nvim/lua/config/mappings.lua +++ b/.config/nvim/lua/config/mappings.lua @@ -13,14 +13,18 @@ vim.keymap.set("n", "J", "mzJ`z") vim.keymap.set("t", "", "") -- movement -vim.keymap.set("n", "", "wincmd h", { desc = "Focus Left" }) -vim.keymap.set("n", "", "wincmd j", { desc = "Focus Down" }) -vim.keymap.set("n", "", "wincmd k", { desc = "Focus Up" }) -vim.keymap.set("n", "", "wincmd l", { desc = "Focus Right" }) +vim.keymap.set("n", "", "wincmd h", { desc = "Move Left" }) +vim.keymap.set("n", "", "wincmd j", { desc = "Move Down" }) +vim.keymap.set("n", "", "wincmd k", { desc = "Move Up" }) +vim.keymap.set("n", "", "wincmd l", { desc = "Move Right" }) +vim.keymap.set("t", "", "wincmd h", { desc = "Move Left" }) +vim.keymap.set("t", "", "wincmd j", { desc = "Move Down" }) +vim.keymap.set("t", "", "wincmd k", { desc = "Move Up" }) +vim.keymap.set("t", "", "wincmd l", { desc = "Move Right" }) -- basics vim.keymap.set("n", "f", "Telescope find_files", { desc = "Find Files" }) -vim.keymap.set("n", "F", "NvimTreeToggle", { desc = "Toggle File Manager" }) +vim.keymap.set("n", "F", "Neotree toggle", { desc = "Toggle File Manager" }) -- toggle term vim.keymap.set("n", "c", "ToggleTermToggleAll", { desc = "Toggle All Terminals" }) diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua index c74608c..5151e00 100644 --- a/.config/nvim/lua/plugins/dap.lua +++ b/.config/nvim/lua/plugins/dap.lua @@ -3,9 +3,16 @@ return { config = function() require("dap-go").setup() require("dap-python").setup() + table.insert(require("dap").configurations.python, { + type = "python", + request = "launch", + name = "My custom launch configuration", + program = "${file}", + -- ... more options, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings + }) end, key = { - "d" + "d", }, dependencies = { "leoluz/nvim-dap-go", diff --git a/.config/nvim/lua/plugins/formatter.lua b/.config/nvim/lua/plugins/formatter.lua index 32ba539..24b942d 100644 --- a/.config/nvim/lua/plugins/formatter.lua +++ b/.config/nvim/lua/plugins/formatter.lua @@ -23,6 +23,15 @@ return { toml = { require("formatter.filetypes.toml").taplo, }, + svelte = { + require("formatter.filetypes.svelte").prettier, + }, + vue = { + require("formatter.filetypes.vue").prettier, + }, + javascript = { + require("formatter.filetypes.javascript").prettier, + }, }, }) end, diff --git a/.config/nvim/lua/plugins/indent-blankline.lua b/.config/nvim/lua/plugins/indent-blankline.lua index c0217cc..e2adb46 100644 --- a/.config/nvim/lua/plugins/indent-blankline.lua +++ b/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,6 +1,6 @@ return { "lukas-reineke/indent-blankline.nvim", config = function () - require("indent_blankline").setup() + require("ibl").setup() end } diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index c550f1c..eeeb249 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -3,9 +3,14 @@ return { "neovim/nvim-lspconfig", config = function() local lsp = require("lspconfig") - -- lsp.pyright.setup({}) - lsp.pylyzer.setup({}) + lsp.pyright.setup({}) + -- lsp.pylyzer.setup({}) lsp.gopls.setup({}) + -- lsp.volar.setup({}) + -- lsp.tsserver.setup({}) + lsp.volar.setup({ + filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, + }) lsp.rust_analyzer.setup({}) lsp.clangd.setup({}) lsp.lua_ls.setup({ diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua new file mode 100644 index 0000000..20a99d1 --- /dev/null +++ b/.config/nvim/lua/plugins/neo-tree.lua @@ -0,0 +1,9 @@ +return { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "MunifTanjim/nui.nvim", + }, +} diff --git a/.config/nvim/lua/plugins/nvim-tree.lua b/.config/nvim/lua/plugins/nvim-tree.lua deleted file mode 100644 index 7a85ea2..0000000 --- a/.config/nvim/lua/plugins/nvim-tree.lua +++ /dev/null @@ -1,22 +0,0 @@ -return { - "kyazdani42/nvim-tree.lua", - config = function() - -- nvim tree - require("nvim-tree").setup({ - update_cwd = true, - diagnostics = { - enable = true, - }, - }) - - -- close tab/vim when nvim-tree is the last window in the tab - vim.api.nvim_create_autocmd("BufEnter", { - pattern = "*", - command = "if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif", - }) - end, - dependencies = { - "kyazdani42/nvim-web-devicons", - }, - cmd = { "NvimTreeOpen", "NvimTreeToggle" }, -}