From 40592e984cb53e5b7dfef5c05e740795ae2c7134 Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Mon, 19 Feb 2024 13:57:13 +0100 Subject: [PATCH] Stuff --- nvchad/.config/nvim/lua/custom/init.lua | 2 + nvchad/.config/nvim/lua/custom/plugins.lua | 127 +++++++++++---------- 2 files changed, 68 insertions(+), 61 deletions(-) diff --git a/nvchad/.config/nvim/lua/custom/init.lua b/nvchad/.config/nvim/lua/custom/init.lua index 608a8d9..87c0db3 100644 --- a/nvchad/.config/nvim/lua/custom/init.lua +++ b/nvchad/.config/nvim/lua/custom/init.lua @@ -5,3 +5,5 @@ -- pattern = "*", -- command = "tabdo wincmd =", -- }) + +vim.opt.mouse = "" diff --git a/nvchad/.config/nvim/lua/custom/plugins.lua b/nvchad/.config/nvim/lua/custom/plugins.lua index c4eda81..a867c32 100644 --- a/nvchad/.config/nvim/lua/custom/plugins.lua +++ b/nvchad/.config/nvim/lua/custom/plugins.lua @@ -3,76 +3,81 @@ local overrides = require("custom.configs.overrides") ---@type NvPluginSpec[] local plugins = { - -- Override plugin definition options + -- Override plugin definition options - { - "neovim/nvim-lspconfig", - config = function() - require "plugins.configs.lspconfig" - require "custom.configs.lspconfig" - end, -- Override to setup mason-lspconfig - }, + { + "neovim/nvim-lspconfig", + config = function() + require("plugins.configs.lspconfig") + require("custom.configs.lspconfig") + end, -- Override to setup mason-lspconfig + }, - -- override plugin configs - { - "williamboman/mason.nvim", - opts = overrides.mason - }, + -- override plugin configs + { + "williamboman/mason.nvim", + opts = overrides.mason, + }, - { - "nvim-treesitter/nvim-treesitter", - opts = overrides.treesitter, - }, + { + "nvim-treesitter/nvim-treesitter", + opts = overrides.treesitter, + }, - { - "nvim-tree/nvim-tree.lua", - opts = overrides.nvimtree, - }, + { + "nvim-tree/nvim-tree.lua", + opts = overrides.nvimtree, + }, - -- Install a plugin - { - "max397574/better-escape.nvim", - event = "InsertEnter", - config = function() - require("better_escape").setup() - end, - }, + -- Install a plugin + { + "max397574/better-escape.nvim", + event = "InsertEnter", + config = function() + require("better_escape").setup() + end, + }, - { - "stevearc/conform.nvim", - -- for users those who want auto-save conform + lazyloading! - -- event = "BufWritePre" - config = function() - require "custom.configs.conform" - end, - }, + { + "stevearc/conform.nvim", + -- for users those who want auto-save conform + lazyloading! + -- event = "BufWritePre" + config = function() + require("custom.configs.conform") + end, + }, - { - "github/copilot.vim", - lazy = false, - config = function() - -- Mapping tab is already used by NvChad - vim.g.copilot_no_tab_map = true; - vim.g.copilot_assume_mapped = true; - vim.g.copilot_tab_fallback = ""; - -- The mapping is set to other key, see custom/lua/mappings - -- or run ch to see copilot mapping section - end - }, + { + "nvim-treesitter/nvim-treesitter", + dependencies = { + "JoosepAlviste/nvim-ts-context-commentstring", + }, + opts = overrides.treesitter, + }, - -- To make a plugin not be loaded - -- { - -- "NvChad/nvim-colorizer.lua", - -- enabled = false - -- }, + { + "numToStr/Comment.nvim", + dependencies = "JoosepAlviste/nvim-ts-context-commentstring", + config = function() + require("Comment").setup({ + pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(), + }) + end, + }, - -- All NvChad plugins are lazy-loaded by default - -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` - -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example - -- { - -- "mg979/vim-visual-multi", - -- lazy = false, - -- } + -- To make a plugin not be loaded + -- { + -- "NvChad/nvim-colorizer.lua", + -- enabled = false + -- }, + + -- All NvChad plugins are lazy-loaded by default + -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` + -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example + -- { + -- "mg979/vim-visual-multi", + -- lazy = false, + -- } } return plugins