From 72420420a1aee419dcb88c5c305096e672c6669f Mon Sep 17 00:00:00 2001 From: doryan Date: Sat, 3 Aug 2024 23:08:40 +0400 Subject: [PATCH] feat(lvim): remove nvchad configs and add lvim configs --- lvim/config.lua | 16 +++++++ lvim/lazy-lock.json | 65 ++++++++++++++++++++++++++ lvim/lua/configs/bufferline.lua | 16 +++++++ lvim/lua/configs/noice.lua | 18 ++++++++ lvim/lua/configs/nvimtree.lua | 1 + {nvim => lvim}/lua/mappings.lua | 22 +++++++-- {nvim => lvim}/lua/plugins/init.lua | 69 ++++++++++++++++------------ nvim/.stylua.toml | 6 --- nvim/init.lua | 47 ------------------- nvim/lazy-lock.json | 46 ------------------- nvim/lua/chadrc.lua | 16 ------- nvim/lua/configs/conform.lua | 15 ------ nvim/lua/configs/dap.lua | 57 ----------------------- nvim/lua/configs/highlights.lua | 19 -------- nvim/lua/configs/lazy.lua | 47 ------------------- nvim/lua/configs/lsp.lua | 9 ---- nvim/lua/configs/lspconfig.lua | 24 ---------- nvim/lua/configs/nvim-ts-autotag.lua | 18 -------- nvim/lua/options.lua | 6 --- 19 files changed, 173 insertions(+), 344 deletions(-) create mode 100644 lvim/config.lua create mode 100644 lvim/lazy-lock.json create mode 100644 lvim/lua/configs/bufferline.lua create mode 100644 lvim/lua/configs/noice.lua create mode 100644 lvim/lua/configs/nvimtree.lua rename {nvim => lvim}/lua/mappings.lua (66%) rename {nvim => lvim}/lua/plugins/init.lua (71%) delete mode 100644 nvim/.stylua.toml delete mode 100644 nvim/init.lua delete mode 100644 nvim/lazy-lock.json delete mode 100644 nvim/lua/chadrc.lua delete mode 100644 nvim/lua/configs/conform.lua delete mode 100644 nvim/lua/configs/dap.lua delete mode 100644 nvim/lua/configs/highlights.lua delete mode 100644 nvim/lua/configs/lazy.lua delete mode 100644 nvim/lua/configs/lsp.lua delete mode 100644 nvim/lua/configs/lspconfig.lua delete mode 100644 nvim/lua/configs/nvim-ts-autotag.lua delete mode 100644 nvim/lua/options.lua diff --git a/lvim/config.lua b/lvim/config.lua new file mode 100644 index 0000000..d4f8674 --- /dev/null +++ b/lvim/config.lua @@ -0,0 +1,16 @@ +-- Read the docs: https://www.lunarvim.org/docs/configuration +-- Example configs: https://github.com/LunarVim/starter.lvim +-- Video Tutorials: https://www.youtube.com/watch?v=sFA9kX-Ud_c&list=PLhoH5vyxr6QqGu0i7tt_XoVK9v-KvZ3m6 +-- Forum: https://www.reddit.com/r/lunarvim/ +-- Discord: https://discord.com/invite/Xb9B4Ny + +lvim.colorscheme = "monokai-pro-machine" + +require "plugins.init" +require "mappings" +require "configs.noice" +require "configs.nvimtree" +require "configs.bufferline" + +lvim.builtin.breadcrumbs.active = false + diff --git a/lvim/lazy-lock.json b/lvim/lazy-lock.json new file mode 100644 index 0000000..f55ce99 --- /dev/null +++ b/lvim/lazy-lock.json @@ -0,0 +1,65 @@ +{ + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, + "LuaSnip": { "branch": "master", "commit": "1def35377854535bb3b0f4cc7a33c083cdb12571" }, + "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, + "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "catppuccin": { "branch": "main", "commit": "ba5f4153a5dad99505baba936bd0373534400ac3" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, + "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, + "fzf-lua": { "branch": "main", "commit": "580a20c58a714de566305756ad15384304ab9aae" }, + "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, + "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, + "lir.nvim": { "branch": "master", "commit": "7a9d45de08fecd23a04aca1f96688d744830029e" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, + "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "monokai-pro.nvim": { "branch": "master", "commit": "2bad2a92fe0ff6c8581d33a853a1b17592b83239" }, + "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, + "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, + "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, + "nlsp-settings.nvim": { "branch": "main", "commit": "707b43110daf27c1aec8c16c2a92c2cb9a06f8df" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, + "none-ls.nvim": { "branch": "main", "commit": "3a4826687da4310af379515086d71faca4d21288" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, + "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, + "nvim-dap": { "branch": "master", "commit": "13ce59d4852be2bb3cd4967947985cb0ceaff460" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, + "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" }, + "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" }, + "nvim-ufo": { "branch": "main", "commit": "4cc3ba9303c0708b81fd681786a4835fd31518ac" }, + "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, + "onedarker.nvim": { "branch": "freeze", "commit": "b00dd2189f264c5aeb4cf04c59439655ecd573ec" }, + "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "promise-async": { "branch": "main", "commit": "038d05664fedc920ba86720214c84a15ff7432b0" }, + "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, + "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, + "schemastore.nvim": { "branch": "main", "commit": "8c46453bdf84ad91877effb95e0b6c7b51ea7dda" }, + "structlog.nvim": { "branch": "main", "commit": "45b26a2b1036bb93c0e83f4225e85ab3cee8f476" }, + "tailwind-tools.nvim": { "branch": "master", "commit": "f96222db8da16aa7c3a32455a4e7c20a57550ca6" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, + "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }, + "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" }, + "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" }, + "vim-react-snippets": { "branch": "main", "commit": "755e288bd0db1052be4195fcc82a25e28b609e0b" }, + "vscode-js-debug": { "branch": "main", "commit": "ca1c6450490dab5d742eac16a08d593533a1a13d" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file diff --git a/lvim/lua/configs/bufferline.lua b/lvim/lua/configs/bufferline.lua new file mode 100644 index 0000000..7b2f848 --- /dev/null +++ b/lvim/lua/configs/bufferline.lua @@ -0,0 +1,16 @@ +vim.opt.termguicolors = true +lvim.builtin.bufferline = { + options = { + mode = "buffers", + separator_style = "slant", + offsets = { + { + filetype = "NeoTree", + text = "File Explorer", + highlight = "Directory", + separator = true, + } + } + } +} + diff --git a/lvim/lua/configs/noice.lua b/lvim/lua/configs/noice.lua new file mode 100644 index 0000000..0e6fbeb --- /dev/null +++ b/lvim/lua/configs/noice.lua @@ -0,0 +1,18 @@ +require("noice").setup({ + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, +}) diff --git a/lvim/lua/configs/nvimtree.lua b/lvim/lua/configs/nvimtree.lua new file mode 100644 index 0000000..b195165 --- /dev/null +++ b/lvim/lua/configs/nvimtree.lua @@ -0,0 +1 @@ +lvim.builtin.nvimtree.active = false diff --git a/nvim/lua/mappings.lua b/lvim/lua/mappings.lua similarity index 66% rename from nvim/lua/mappings.lua rename to lvim/lua/mappings.lua index 46e1682..0251aca 100644 --- a/nvim/lua/mappings.lua +++ b/lvim/lua/mappings.lua @@ -1,12 +1,24 @@ -require "nvchad.mappings" - --- add yours here - local map = vim.keymap.set local ufo = require("ufo") map("n", ";", ":", { desc = "CMD enter command mode" }) +map("i", "", "", { desc = "move left" }) +map("i", "", "", { desc = "move right" }) +map("i", "", "", { desc = "move down" }) +map("i", "", "", { desc = "move up" }) + +map("n", "", "h", { desc = "switch window left" }) +map("n", "", "l", { desc = "switch window right" }) +map("n", "", "j", { desc = "switch window down" }) +map("n", "", "k", { desc = "switch window up" }) + +map("n", "", "NeoTreeShowToggle", { desc = "nvimtree toggle window" }) +map("n", "e", "NeoTreeFocus", { desc = "nvimtree focus window" }) + +map("n", "n", "set norelativenumber", { desc = "toggle line number" }) +map("n", "rn", "set relativenumber", { desc = "toggle relative number" }) + map("n", "mk", "RustLsp moveItem up") map("n", "m,", "RustLsp moveItem down") map("n", "rs", "RustLsp run") @@ -39,4 +51,4 @@ map("n", "=", "horizontal resize -2", { desc = "Decrease horizontal buf map('n', 'zR', ufo.openAllFolds) map('n', 'zM', ufo.closeAllFolds) --- map({ "n", "i", "v" }, "", " w ")-- map({ "n", "i", "v" }, "", " w ") + diff --git a/nvim/lua/plugins/init.lua b/lvim/lua/plugins/init.lua similarity index 71% rename from nvim/lua/plugins/init.lua rename to lvim/lua/plugins/init.lua index 2e05bdb..f43a56c 100644 --- a/nvim/lua/plugins/init.lua +++ b/lvim/lua/plugins/init.lua @@ -1,17 +1,4 @@ -return { - { - "stevearc/conform.nvim", - -- event = 'BufWritePre', -- uncomment for format on save - opts = require "configs.conform", - }, - - -- These are some examples, uncomment them if you want to see them work! - { - "neovim/nvim-lspconfig", - config = function() - require "configs.lspconfig" - end, - }, +lvim.plugins = { { "williamboman/mason.nvim", opts = { @@ -23,20 +10,32 @@ return { } } }, + { + 'Bekaboo/dropbar.nvim', + dependencies = { + 'nvim-telescope/telescope-fzf-native.nvim' + }, + }, + { + "nvim-neo-tree/neo-tree.nvim", + branch = "v2.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + }, { "luckasRanarison/tailwind-tools.nvim", dependencies = { "nvim-treesitter/nvim-treesitter" }, - opts = {} + }, + { + 'kyazdani42/nvim-web-devicons' }, { 'kevinhwang91/nvim-ufo', dependencies = { 'kevinhwang91/promise-async' }, }, - { - 'microsoft/vscode-js-debug', - lazy = false, - build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out" - }, { "mfussenegger/nvim-dap", event = "VeryLazy", @@ -54,8 +53,8 @@ return { }, { "microsoft/vscode-js-debug", - opt = true, - run = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out" + lazy = true, + build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out" }, { "NvChad/nvim-colorizer.lua" @@ -74,7 +73,6 @@ return { }, { "folke/ts-comments.nvim", - opts = {}, event = "VeryLazy", enabled = vim.fn.has("nvim-0.10.0") == 1, }, @@ -111,16 +109,29 @@ return { "nvim-telescope/telescope.nvim", -- optional "ibhagwan/fzf-lua", -- optional }, - config = true + }, + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000 + }, + { + "loctvl842/monokai-pro.nvim" + }, + { + "tanvirtin/monokai.nvim" }, { "folke/noice.nvim", event = "VeryLazy", - opts = { - -- add any options here - }, dependencies = { - -- if you lazy-load any plugin below, make sure to add proper module="..." entries + -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries "MunifTanjim/nui.nvim", + -- OPTIONAL: + -- `nvim-notify` is only needed, if you want to use the notification view. + -- If not available, we use `mini` as the fallback + "rcarriga/nvim-notify", } - }} + } +} + diff --git a/nvim/.stylua.toml b/nvim/.stylua.toml deleted file mode 100644 index ecb6dca..0000000 --- a/nvim/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 120 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 2 -quote_style = "AutoPreferDouble" -call_parentheses = "None" diff --git a/nvim/init.lua b/nvim/init.lua deleted file mode 100644 index e247d47..0000000 --- a/nvim/init.lua +++ /dev/null @@ -1,47 +0,0 @@ -vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" -vim.g.mapleader = " " - --- bootstrap lazy and all plugins -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" - -if not vim.loop.fs_stat(lazypath) then - local repo = "https://github.com/folke/lazy.nvim.git" - vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } -end - -vim.opt.rtp:prepend(lazypath) - -local lazy_config = require "configs.lazy" - --- load plugins -require("lazy").setup({ - { - "NvChad/NvChad", - lazy = false, - branch = "v2.5", - import = "nvchad.plugins", - config = function() - require "options" - end, - }, - - { import = "plugins" }, -}, lazy_config) - --- load theme -dofile(vim.g.base46_cache .. "defaults") -dofile(vim.g.base46_cache .. "statusline") - -require "nvchad.autocmds" - -require "configs.dap" -require "configs.highlights" -require "configs.lsp" -require "configs.nvim-ts-autotag" - -vim.schedule(function() - require "mappings" -end) - -local neogit = require('neogit') -neogit.setup {} diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json deleted file mode 100644 index 6c30864..0000000 --- a/nvim/lazy-lock.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "7552e6504ee95a9c8cfc6db53e389122ded46cd4" }, - "NvChad": { "branch": "v2.5", "commit": "c40c5116c4c091f4da620abcd9c58bd5ee4b8497" }, - "base46": { "branch": "v2.5", "commit": "b8ae372d62f2027e005477b834e24c06313e76d8" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, - "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf-lua": { "branch": "main", "commit": "c59e076dddae6fa85f8a97da8ff5304014ba5768" }, - "gitsigns.nvim": { "branch": "main", "commit": "0ed466953fe5885166e0d60799172a8b1f752d16" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, - "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, - "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lspconfig": { "branch": "master", "commit": "e6528f4613c8db2e04be908eb2b5886d63f62a98" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, - "nvim-treesitter": { "branch": "master", "commit": "09bad640e4507885fa0e7035348c7854c531b3d6" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ufo": { "branch": "main", "commit": "4cc3ba9303c0708b81fd681786a4835fd31518ac" }, - "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, - "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, - "tailwind-tools.nvim": { "branch": "master", "commit": "7e280a515389536d3d020986cac68686ce7b5a64" }, - "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, - "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, - "ui": { "branch": "v2.5", "commit": "967d8b27811f3b2a2ac3fd2de27e5a4992dc0770" }, - "vim-react-snippets": { "branch": "main", "commit": "755e288bd0db1052be4195fcc82a25e28b609e0b" }, - "vscode-js-debug": { "branch": "main", "commit": "14b430024ccadd5e573228214a39fac7781bd759" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } -} diff --git a/nvim/lua/chadrc.lua b/nvim/lua/chadrc.lua deleted file mode 100644 index 2653890..0000000 --- a/nvim/lua/chadrc.lua +++ /dev/null @@ -1,16 +0,0 @@ --- This file needs to have same structure as nvconfig.lua --- https://github.com/NvChad/ui/blob/v2.5/lua/nvconfig.lua - ----@type ChadrcConfig -local M = {} - -M.base46 = { - theme = "catppuccin_latte", - - -- hl_override = { - -- Comment = { italic = true }, - -- ["@comment"] = { italic = true }, - -- }, -} - -return M diff --git a/nvim/lua/configs/conform.lua b/nvim/lua/configs/conform.lua deleted file mode 100644 index a000447..0000000 --- a/nvim/lua/configs/conform.lua +++ /dev/null @@ -1,15 +0,0 @@ -local options = { - formatters_by_ft = { - lua = { "stylua" }, - -- css = { "prettier" }, - -- html = { "prettier" }, - }, - - -- format_on_save = { - -- -- These options will be passed to conform.format() - -- timeout_ms = 500, - -- lsp_fallback = true, - -- }, -} - -require("conform").setup(options) diff --git a/nvim/lua/configs/dap.lua b/nvim/lua/configs/dap.lua deleted file mode 100644 index 73397c9..0000000 --- a/nvim/lua/configs/dap.lua +++ /dev/null @@ -1,57 +0,0 @@ -local dap = require("dap") -local DEBUGGER_PATH = vim.fn.stdpath('data') .. "/lazy/vscode-js-debug" - -require("dap-vscode-js").setup({ - -- node_path = "node", -- Path of node executable. Defaults to $NODE_PATH, and then "node" - debugger_path = DEBUGGER_PATH, -- Path to vscode-js-debug installation. - -- debugger_cmd = { "js-debug-adapter" }, -- Command to use to launch the debug server. Takes precedence over `node_path` and `debugger_path`. - adapters = { 'firefox', 'pwa-node', 'pwa-chrome', 'pwa-msedge', 'node-terminal', 'pwa-extensionHost' }, -- which adapters to register in nvim-dap - -- log_file_path = "(stdpath cache)/dap_vscode_js.log" -- Path for file logging - -- log_file_level = false -- Logging level for output to file. Set to false to disable file logging. - -- log_console_level = vim.log.levels.ERROR -- Logging level for output to console. Set to false to disable console output. -}) - -local js_langs = { - "javascript", - "typescript", - "javascriptreact", - "typescriptreact", -} - -for _, lang in ipairs(js_langs) do - - dap.configurations[lang] = { - { - name = 'Next.js: debug server-side', - type = "pwa-node", - request = "launch", - skipFiles = {"/**"}, - cwd = "${workspaceFolder}", - runtimeExecutable = "npm", - runtimeArgs = {"run-script", "dev"}, - }, - { - name = 'Next.js: debug client-side', - type = 'pwa-chrome', - request = 'launch', - url = 'http://localhost:3000', - webRoot = '${workspaceFolder}', - sourceMaps = true, -- https://github.com/vercel/next.js/issues/56702#issuecomment-1913443304 - sourceMapPathOverrides = { - ['webpack://_N_E/*'] = '${webRoot}/*', - }, - }, - { - name = "Next.js: debug full stack", - type = "node-terminal", - request = "launch", - command = "npm run dev", - serverReadyAction = { - pattern = "- Local:.+(https?://.+)", - uriFormat = "%s", - action = "debugWithChrome" - } - } - } - -end; diff --git a/nvim/lua/configs/highlights.lua b/nvim/lua/configs/highlights.lua deleted file mode 100644 index f0e6992..0000000 --- a/nvim/lua/configs/highlights.lua +++ /dev/null @@ -1,19 +0,0 @@ -require "nvim-treesitter.configs".setup { - highlight = { - enable = true, - }, - playground = { - enable = true, - } -} - --- require 'colorizer'.setup { --- user_default_options = { names = false }, --- filetypes = { --- css = { --- rgb_fn = true; --- names = true; --- }; -- Enable parsing rgb(...) functions in css. --- html = { names = false; } -- Disable parsing "names" like Blue or Gray --- }, --- } diff --git a/nvim/lua/configs/lazy.lua b/nvim/lua/configs/lazy.lua deleted file mode 100644 index cd170bd..0000000 --- a/nvim/lua/configs/lazy.lua +++ /dev/null @@ -1,47 +0,0 @@ -return { - defaults = { lazy = true }, - install = { colorscheme = { "nvchad" } }, - - ui = { - icons = { - ft = "", - lazy = "󰂠 ", - loaded = "", - not_loaded = "", - }, - }, - - performance = { - rtp = { - disabled_plugins = { - "2html_plugin", - "tohtml", - "getscript", - "getscriptPlugin", - "gzip", - "logipat", - "netrw", - "netrwPlugin", - "netrwSettings", - "netrwFileHandlers", - "matchit", - "tar", - "tarPlugin", - "rrhelper", - "spellfile_plugin", - "vimball", - "vimballPlugin", - "zip", - "zipPlugin", - "tutor", - "rplugin", - "syntax", - "synmenu", - "optwin", - "compiler", - "bugreport", - "ftplugin", - }, - }, - }, -} diff --git a/nvim/lua/configs/lsp.lua b/nvim/lua/configs/lsp.lua deleted file mode 100644 index 23c0c10..0000000 --- a/nvim/lua/configs/lsp.lua +++ /dev/null @@ -1,9 +0,0 @@ -vim.api.nvim_create_autocmd("LspAttach", { - callback = function(args) - local bufnr = args.buf - local client = vim.lsp.get_client_by_id(args.data.client_id) - - client.server_capabilities.semanticTokensProvider = nil - - end, -}) diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua deleted file mode 100644 index 935311d..0000000 --- a/nvim/lua/configs/lspconfig.lua +++ /dev/null @@ -1,24 +0,0 @@ --- load defaults i.e lua_lsp -require("nvchad.configs.lspconfig").defaults() - -local lspconfig = require "lspconfig" - --- EXAMPLE -local servers = { "html", "cssls" } -local nvlsp = require "nvchad.configs.lspconfig" - --- lsps with default config -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = nvlsp.on_attach, - on_init = nvlsp.on_init, - capabilities = nvlsp.capabilities, - } -end - --- configuring single server, example: typescript --- lspconfig.tsserver.setup { --- on_attach = nvlsp.on_attach, --- on_init = nvlsp.on_init, --- capabilities = nvlsp.capabilities, --- } diff --git a/nvim/lua/configs/nvim-ts-autotag.lua b/nvim/lua/configs/nvim-ts-autotag.lua deleted file mode 100644 index 636f20e..0000000 --- a/nvim/lua/configs/nvim-ts-autotag.lua +++ /dev/null @@ -1,18 +0,0 @@ -require("vim-react-snippets").lazy_load() - -require('nvim-ts-autotag').setup({ - opts = { - -- Defaults - enable_close = true, -- Auto close tags - enable_rename = true, -- Auto rename pairs of tags - enable_close_on_slash = false -- Auto close on trailing