From 39e0e8c6efdf40d6dfddbe8767ca355c3bb245fd Mon Sep 17 00:00:00 2001 From: Jack Sangdahl Date: Sun, 6 Oct 2024 11:06:21 -0600 Subject: Nvim improvements, temp Waybar fix, other changes --- .config/nvim/init.lua | 2 +- .config/nvim/lua/chadrc.lua | 12 +++++++++++- .config/nvim/lua/mappings.lua | 5 +++++ .config/nvim/lua/plugins.lua | 14 -------------- 4 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 .config/nvim/lua/mappings.lua (limited to '.config/nvim') diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 7b9f5b1c..6a78ddf6 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -35,5 +35,5 @@ dofile(vim.g.base46_cache .. "statusline") require("nvchad.autocmds") vim.schedule(function() - require("nvchad.mappings") + require("mappings") end) diff --git a/.config/nvim/lua/chadrc.lua b/.config/nvim/lua/chadrc.lua index 47c113b0..01e52de3 100644 --- a/.config/nvim/lua/chadrc.lua +++ b/.config/nvim/lua/chadrc.lua @@ -3,10 +3,20 @@ local M = {} M.ui = { theme = "solarized_dark", - theme_toggle = { "onenord", "onenord_light" }, statusline = { theme = "vscode_colored" }, tabufline = { lazyload = true }, nvdash = { load_on_startup = true }, } +M.mason.pkgs = { + "lua-language-server", + "stylua", + "html-lsp", + "css-lsp", + "prettier", + "texlab", + "ruff", + "python-lsp-server", +} + return M diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua new file mode 100644 index 00000000..73fba0de --- /dev/null +++ b/.config/nvim/lua/mappings.lua @@ -0,0 +1,5 @@ +require("nvchad.mappings") + +local map = vim.keymap.set + +map("n", ";", ":", { desc = "CMD enter command mode" }) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index a1b8d0be..ac64bcac 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -13,20 +13,6 @@ return { require("configs.lspconfig") end, }, - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "lua-language-server", - "stylua", - "html-lsp", - "css-lsp", - "prettier", - "bash-language-server", - "texlab", - }, - }, - }, { "nvim-treesitter/nvim-treesitter", opts = { -- cgit v1.2.3