diff --git a/init.lua b/init.lua index e316607d..4cb5a443 100644 --- a/init.lua +++ b/init.lua @@ -291,6 +291,7 @@ require('lazy').setup({ ['o'] = { name = 'Harp[O]on', _ = 'which_key_ignore' }, ['t'] = { name = '[T]oggleTerminal', _ = 'which_key_ignore' }, ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, + ['C'] = { name = '[C]term', _ = 'which_key_ignore' }, ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, ['f'] = { name = '[F]ind', _ = 'which_key_ignore' }, @@ -486,7 +487,7 @@ require('lazy').setup({ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', opts = { - ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, + ensure_installed = { 'python', 'javascript', 'cpp', 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, -- Autoinstall languages that are not installed auto_install = true, highlight = { @@ -538,6 +539,9 @@ require('lazy').setup({ require 'custom.plugins.toggleterm', require 'custom.plugins.refactoring', require 'custom.plugins.trouble', + require 'custom.plugins.mason', + -- + -- ad hoc lsp line -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` diff --git a/lua/custom/mappings/init.lua b/lua/custom/mappings/init.lua index 671ffaed..aa707f6d 100644 --- a/lua/custom/mappings/init.lua +++ b/lua/custom/mappings/init.lua @@ -17,5 +17,5 @@ vim.keymap.set('v', 'K', ":m '>-2gv=gv") -- Move down/up lines but recenter vim.keymap.set('n', '', 'zz', { noremap = true, silent = true }) vim.keymap.set('n', '', 'zz', { noremap = true, silent = true }) -vim.keymap.set('n', 'j', 'jzz', { noremap = true, silent = true }) -vim.keymap.set('n', 'k', 'kzz', { noremap = true, silent = true }) +-- vim.keymap.set('n', 'j', 'jzz', { noremap = true, silent = true }) +-- vim.keymap.set('n', 'k', 'kzz', { noremap = true, silent = true }) diff --git a/lua/custom/plugins/catppuccin.lua b/lua/custom/plugins/catppuccin.lua index c9d50e46..6e88ffe5 100644 --- a/lua/custom/plugins/catppuccin.lua +++ b/lua/custom/plugins/catppuccin.lua @@ -17,7 +17,7 @@ return { shade = 'dark', percentage = 0.15, }, - transparent_background = true, + -- transparent_background = true, --[[ color_overrides = { mocha = { base = '#000000', diff --git a/lua/custom/plugins/mason.lua b/lua/custom/plugins/mason.lua new file mode 100644 index 00000000..8c605594 --- /dev/null +++ b/lua/custom/plugins/mason.lua @@ -0,0 +1,22 @@ +return { + 'williamboman/mason.nvim', + opts = { + ensure_installed = { + 'yamllint', + 'codespell', + 'stylua', -- Used to format Lua code + 'cpplint', + 'clangd', + 'clang-format', + 'codelldb', + 'cmake-language-server', + 'ruff', + 'pyright', + 'prettier', + 'autopep8', + 'djlint', + 'typescript-language-server', + 'deno', + }, + }, +} diff --git a/setup.sh b/setup.sh index e3c3b3e4..cda689fe 100755 --- a/setup.sh +++ b/setup.sh @@ -5,7 +5,7 @@ python3 -m venv .venv .venv/bin/pip install debugpy # Install dependencies -PKGS=("cppcheck" "clang" "cmake" "npm", "eslint") +PKGS=("cppcheck" "clang" "cmake" "npm" "eslint") # Get distro distro=$(cat /etc/os-release | grep PRETTY_NAME= | awk '{print $1}' | cut -d \" -f 2)