diff --git a/pkgs/nvchad/nvim/lua/configs/dap.lua b/pkgs/nvchad/nvim/lua/configs/dap.lua index 352cc6f..c97071f 100644 --- a/pkgs/nvchad/nvim/lua/configs/dap.lua +++ b/pkgs/nvchad/nvim/lua/configs/dap.lua @@ -1,16 +1,17 @@ require("dapui").setup() +require("nvim-dap-virtual-text").setup() local dap, dapui = require("dap"), require("dapui") dap.listeners.before.attach.dapui_config = function() - dapui.open() + dapui.open() end dap.listeners.before.launch.dapui_config = function() - dapui.open() + dapui.open() end dap.listeners.before.event_terminated.dapui_config = function() - dapui.close() + dapui.close() end dap.listeners.before.event_exited.dapui_config = function() - dapui.close() + dapui.close() end diff --git a/pkgs/nvchad/nvim/lua/configs/overrides.lua b/pkgs/nvchad/nvim/lua/configs/overrides.lua index f426cd7..992c134 100644 --- a/pkgs/nvchad/nvim/lua/configs/overrides.lua +++ b/pkgs/nvchad/nvim/lua/configs/overrides.lua @@ -37,6 +37,7 @@ M.mason = { -- web dev "css-lsp", "html-lsp", + "prettier", "prettierd", "eslint-lsp", "eslint_d", diff --git a/pkgs/nvchad/nvim/lua/plugins/init.lua b/pkgs/nvchad/nvim/lua/plugins/init.lua index 58c5a6e..d0fc41a 100644 --- a/pkgs/nvchad/nvim/lua/plugins/init.lua +++ b/pkgs/nvchad/nvim/lua/plugins/init.lua @@ -1,168 +1,169 @@ local overrides = require("configs.overrides") local plugins = { - { - "stevearc/conform.nvim", - event = { "BufWritePre" }, - cmd = { "ConformInfo" }, - config = function() - require("configs.conform") - end, - }, - { - "nvim-treesitter/nvim-treesitter", - opts = overrides.treesitter, - }, - { - "williamboman/mason.nvim", - opts = overrides.mason, - }, - { - "David-Kunz/gen.nvim", - lazy = false, - opts = function() - return require("configs.gen") - end, - }, - { - "Shatur/neovim-session-manager", - dependencies = { - "nvim-lua/plenary.nvim", - "stevearc/dressing.nvim", - }, - event = "BufWritePost", - cmd = "SessionManager", - }, - { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - opts = function() - return require("configs.noice") - end, - }, - { - "neovim/nvim-lspconfig", - config = function() - require("nvchad.configs.lspconfig").defaults() - require("configs.lspconfig") - end, - }, - { - "nvimtools/none-ls.nvim", - event = "VeryLazy", - opts = function() - return require("configs.null-ls") - end, - }, - { - "windwp/nvim-ts-autotag", - ft = { "javascript", "javascriptreact", "typescript", "typescriptreact" }, - config = function() - require("nvim-ts-autotag").setup() - end, - }, - { - "wakatime/vim-wakatime", - lazy = false, - }, - { - "nvim-treesitter/nvim-treesitter-context", - event = "BufReadPost", - }, - { - "Wansmer/treesj", - cmd = { "TSJToggle" }, - }, - { - "hedyhli/outline.nvim", - lazy = true, - cmd = { "Outline", "OutlineOpen" }, - opts = {}, - }, - { - "folke/trouble.nvim", - cmd = { "Trouble", "TroubleToggle" }, - }, - { - "folke/todo-comments.nvim", - cmd = { "TodoTrouble", "TodoTelescope" }, - config = true, - }, - { - "folke/neodev.nvim", - event = "VeryLazy", - config = function() - require("neodev").setup({ - library = { - plugins = { "nvim-dap-ui" }, - types = true, - }, - }) - end, - }, - { - "mfussenegger/nvim-dap", - config = function() - require("configs.dap") - end, - dependencies = { - "rcarriga/nvim-dap-ui", - "nvim-neotest/nvim-nio", - }, - }, - -- Language specific plugins - { - "pmizio/typescript-tools.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "neovim/nvim-lspconfig", - }, - config = function() - require("configs.ts") - end, - ft = { - "javascript", - "typescript", - "javascriptreact", - "typescriptreact", - }, - }, - { - "ray-x/go.nvim", - dependencies = { - "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", - "mfussenegger/nvim-dap", - "rcarriga/nvim-dap-ui", - }, - event = { "CmdlineEnter" }, - config = function() - require("configs.go") - end, - ft = { - "go", - "gomod", - "gosum", - "gowork", - "gotmpl", - }, - build = ':lua require("go.install").update_all_sync()', - }, - { - "mrcjkb/rustaceanvim", - config = function() - require("configs.rust") - end, - version = "^4", - dependencies = { - "mfussenegger/nvim-dap", - "rcarriga/nvim-dap-ui", - }, - ft = { "rust" }, - }, + { + "stevearc/conform.nvim", + event = { "BufWritePre" }, + cmd = { "ConformInfo" }, + config = function() + require("configs.conform") + end, + }, + { + "nvim-treesitter/nvim-treesitter", + opts = overrides.treesitter, + }, + { + "williamboman/mason.nvim", + opts = overrides.mason, + }, + { + "David-Kunz/gen.nvim", + lazy = false, + opts = function() + return require("configs.gen") + end, + }, + { + "Shatur/neovim-session-manager", + dependencies = { + "nvim-lua/plenary.nvim", + "stevearc/dressing.nvim", + }, + event = "BufWritePost", + cmd = "SessionManager", + }, + { + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + }, + opts = function() + return require("configs.noice") + end, + }, + { + "neovim/nvim-lspconfig", + config = function() + require("nvchad.configs.lspconfig").defaults() + require("configs.lspconfig") + end, + }, + { + "nvimtools/none-ls.nvim", + event = "VeryLazy", + opts = function() + return require("configs.null-ls") + end, + }, + { + "windwp/nvim-ts-autotag", + ft = { "javascript", "javascriptreact", "typescript", "typescriptreact" }, + config = function() + require("nvim-ts-autotag").setup() + end, + }, + { + "wakatime/vim-wakatime", + lazy = false, + }, + { + "nvim-treesitter/nvim-treesitter-context", + event = "BufReadPost", + }, + { + "Wansmer/treesj", + cmd = { "TSJToggle" }, + }, + { + "hedyhli/outline.nvim", + lazy = true, + cmd = { "Outline", "OutlineOpen" }, + opts = {}, + }, + { + "folke/trouble.nvim", + cmd = { "Trouble", "TroubleToggle" }, + }, + { + "folke/todo-comments.nvim", + cmd = { "TodoTrouble", "TodoTelescope" }, + config = true, + }, + { + "folke/neodev.nvim", + event = "VeryLazy", + config = function() + require("neodev").setup({ + library = { + plugins = { "nvim-dap-ui" }, + types = true, + }, + }) + end, + }, + { + "mfussenegger/nvim-dap", + config = function() + require("configs.dap") + end, + dependencies = { + "rcarriga/nvim-dap-ui", + "nvim-neotest/nvim-nio", + "theHamsta/nvim-dap-virtual-text", + }, + }, + -- Language specific plugins + { + "pmizio/typescript-tools.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "neovim/nvim-lspconfig", + }, + config = function() + require("configs.ts") + end, + ft = { + "javascript", + "typescript", + "javascriptreact", + "typescriptreact", + }, + }, + { + "ray-x/go.nvim", + dependencies = { + "neovim/nvim-lspconfig", + "nvim-treesitter/nvim-treesitter", + "mfussenegger/nvim-dap", + "rcarriga/nvim-dap-ui", + }, + event = { "CmdlineEnter" }, + config = function() + require("configs.go") + end, + ft = { + "go", + "gomod", + "gosum", + "gowork", + "gotmpl", + }, + build = ':lua require("go.install").update_all_sync()', + }, + { + "mrcjkb/rustaceanvim", + config = function() + require("configs.rust") + end, + version = "^4", + dependencies = { + "mfussenegger/nvim-dap", + "rcarriga/nvim-dap-ui", + }, + ft = { "rust" }, + }, } return plugins