From 2222eb9b35d90873cb8f282675584757252068f2 Mon Sep 17 00:00:00 2001 From: CaseyStratton Date: Sun, 30 Apr 2023 18:02:24 -0500 Subject: [PATCH] add more plugins and change theme --- after/plugin/defaults.lua | 6 ++++++ init.lua | 15 +++------------ lua/custom/plugins/filetree.lua | 12 ++++++++++++ lua/custom/plugins/theme.lua | 8 ++++++++ lua/custom/plugins/vim-tmux-navigator.lua | 4 ++++ 5 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 after/plugin/defaults.lua create mode 100644 lua/custom/plugins/filetree.lua create mode 100644 lua/custom/plugins/theme.lua create mode 100644 lua/custom/plugins/vim-tmux-navigator.lua diff --git a/after/plugin/defaults.lua b/after/plugin/defaults.lua new file mode 100644 index 00000000..f671923b --- /dev/null +++ b/after/plugin/defaults.lua @@ -0,0 +1,6 @@ +-- Tab is 2 spaces. +vim.o.tabstop = 2 +vim.o.shiftwidth = 2 + +-- Line numbers are relative to current line. +vim.o.relativenumber = true diff --git a/init.lua b/init.lua index 7fd9c54f..18dd83ee 100644 --- a/init.lua +++ b/init.lua @@ -112,14 +112,6 @@ require('lazy').setup({ }, }, - { -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'onedark' - end, - }, - { -- Set lualine as statusline 'nvim-lualine/lualine.nvim', -- See `:help lualine.txt` @@ -290,7 +282,7 @@ require('nvim-treesitter.configs').setup { ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) - auto_install = false, + auto_install = true, highlight = { enable = true }, indent = { enable = true, disable = { 'python' } }, @@ -409,9 +401,8 @@ local servers = { -- clangd = {}, -- gopls = {}, -- pyright = {}, - -- rust_analyzer = {}, - -- tsserver = {}, - + rust_analyzer = {}, + tsserver = {}, lua_ls = { Lua = { workspace = { checkThirdParty = false }, diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua new file mode 100644 index 00000000..9b895dfc --- /dev/null +++ b/lua/custom/plugins/filetree.lua @@ -0,0 +1,12 @@ +return { + 'nvim-neo-tree/neo-tree.nvim', + version = '*', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', + 'MunifTanjim/nui.nvim', + }, + config = function () + require('neo-tree').setup {} + end +} diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua new file mode 100644 index 00000000..0abe2c47 --- /dev/null +++ b/lua/custom/plugins/theme.lua @@ -0,0 +1,8 @@ +return { + 'catppuccin/nvim', + priority = 1000, + config = function() + vim.cmd.colorscheme 'catppuccin' + end, +} + diff --git a/lua/custom/plugins/vim-tmux-navigator.lua b/lua/custom/plugins/vim-tmux-navigator.lua new file mode 100644 index 00000000..e7207303 --- /dev/null +++ b/lua/custom/plugins/vim-tmux-navigator.lua @@ -0,0 +1,4 @@ +return { + 'christoomey/vim-tmux-navigator', + lazy = false, +}