From 396b23be3b4ddede29dce45a2f0a2ba2ba5131fc Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Thu, 22 Dec 2022 18:17:53 +0000 Subject: [PATCH] Orgnanize lua config --- vim/.vim/lua/cmp.lua | 0 .../google-comments.lua} | 0 vim/.vim/lua/{ => config}/lsp.lua | 0 .../lualine.lua} | 0 .../{notify_config.lua => config/notify.lua} | 0 .../lua/{null_lsp.lua => config/null-ls.lua} | 0 .../nvim-treesitter.lua} | 0 .../symbols-outline.lua} | 0 .../lua/{zettel.lua => config/telekasten.lua} | 0 .../telescope.lua} | 0 .../{diagnostics.lua => config/trouble.lua} | 0 vim/.vim/lua/orgconfig.lua | 4 -- vim/.vim/lua/plugins.lua | 48 ++++++++++--------- vim/.vim/lua/spell_config.lua | 2 - vim/.vim/prefs/1 | 15 ++++++ vim/.vimrc | 22 +++++++++ 16 files changed, 63 insertions(+), 28 deletions(-) delete mode 100644 vim/.vim/lua/cmp.lua rename vim/.vim/lua/{google_comments.lua => config/google-comments.lua} (100%) rename vim/.vim/lua/{ => config}/lsp.lua (100%) rename vim/.vim/lua/{lualine_config.lua => config/lualine.lua} (100%) rename vim/.vim/lua/{notify_config.lua => config/notify.lua} (100%) rename vim/.vim/lua/{null_lsp.lua => config/null-ls.lua} (100%) rename vim/.vim/lua/{treesitter.lua => config/nvim-treesitter.lua} (100%) rename vim/.vim/lua/{symbols-outline-config.lua => config/symbols-outline.lua} (100%) rename vim/.vim/lua/{zettel.lua => config/telekasten.lua} (100%) rename vim/.vim/lua/{telescope_config.lua => config/telescope.lua} (100%) rename vim/.vim/lua/{diagnostics.lua => config/trouble.lua} (100%) delete mode 100644 vim/.vim/lua/orgconfig.lua delete mode 100644 vim/.vim/lua/spell_config.lua create mode 100644 vim/.vim/prefs/1 diff --git a/vim/.vim/lua/cmp.lua b/vim/.vim/lua/cmp.lua deleted file mode 100644 index e69de29..0000000 diff --git a/vim/.vim/lua/google_comments.lua b/vim/.vim/lua/config/google-comments.lua similarity index 100% rename from vim/.vim/lua/google_comments.lua rename to vim/.vim/lua/config/google-comments.lua diff --git a/vim/.vim/lua/lsp.lua b/vim/.vim/lua/config/lsp.lua similarity index 100% rename from vim/.vim/lua/lsp.lua rename to vim/.vim/lua/config/lsp.lua diff --git a/vim/.vim/lua/lualine_config.lua b/vim/.vim/lua/config/lualine.lua similarity index 100% rename from vim/.vim/lua/lualine_config.lua rename to vim/.vim/lua/config/lualine.lua diff --git a/vim/.vim/lua/notify_config.lua b/vim/.vim/lua/config/notify.lua similarity index 100% rename from vim/.vim/lua/notify_config.lua rename to vim/.vim/lua/config/notify.lua diff --git a/vim/.vim/lua/null_lsp.lua b/vim/.vim/lua/config/null-ls.lua similarity index 100% rename from vim/.vim/lua/null_lsp.lua rename to vim/.vim/lua/config/null-ls.lua diff --git a/vim/.vim/lua/treesitter.lua b/vim/.vim/lua/config/nvim-treesitter.lua similarity index 100% rename from vim/.vim/lua/treesitter.lua rename to vim/.vim/lua/config/nvim-treesitter.lua diff --git a/vim/.vim/lua/symbols-outline-config.lua b/vim/.vim/lua/config/symbols-outline.lua similarity index 100% rename from vim/.vim/lua/symbols-outline-config.lua rename to vim/.vim/lua/config/symbols-outline.lua diff --git a/vim/.vim/lua/zettel.lua b/vim/.vim/lua/config/telekasten.lua similarity index 100% rename from vim/.vim/lua/zettel.lua rename to vim/.vim/lua/config/telekasten.lua diff --git a/vim/.vim/lua/telescope_config.lua b/vim/.vim/lua/config/telescope.lua similarity index 100% rename from vim/.vim/lua/telescope_config.lua rename to vim/.vim/lua/config/telescope.lua diff --git a/vim/.vim/lua/diagnostics.lua b/vim/.vim/lua/config/trouble.lua similarity index 100% rename from vim/.vim/lua/diagnostics.lua rename to vim/.vim/lua/config/trouble.lua diff --git a/vim/.vim/lua/orgconfig.lua b/vim/.vim/lua/orgconfig.lua deleted file mode 100644 index 193e4da..0000000 --- a/vim/.vim/lua/orgconfig.lua +++ /dev/null @@ -1,4 +0,0 @@ -require('orgmode').setup({ - org_agenda_files = {'~/org/*'}, - org_default_notes_file = '~/org/refile.org', -}) diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua index 6f701ce..c1cbbd1 100644 --- a/vim/.vim/lua/plugins.lua +++ b/vim/.vim/lua/plugins.lua @@ -13,13 +13,19 @@ autocmd BufWritePost plugins.lua source | PackerCompile augroup end ]]) +require('lspconfig') + require('packer').startup(function(use) -- Packer can manage itself use 'wbthomason/packer.nvim' use 'lewis6991/impatient.nvim' use 'dstein64/vim-startuptime' - use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate', + config =[[ require("config.nvim-treesitter") ]] + } -- Undo tree use { @@ -31,7 +37,7 @@ require('packer').startup(function(use) use 'nvim-lua/plenary.nvim' use { 'renerocksai/telekasten.nvim', - config = [[ require("zettel") ]] + config = [[ require("config.telekasten") ]] } use 'renerocksai/calendar-vim' @@ -63,7 +69,7 @@ require('packer').startup(function(use) 'ray-x/cmp-treesitter', { 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} }, }, - -- config = [[require('lsp')]], + config = [[ require("config.lsp") ]], -- event = 'InsertEnter', } use { @@ -77,7 +83,7 @@ require('packer').startup(function(use) } use { 'jose-elias-alvarez/null-ls.nvim', - config = [[ require("null_lsp") ]] + config = [[ require("config.null-ls") ]] } use { 'saecki/crates.nvim', @@ -86,22 +92,26 @@ require('packer').startup(function(use) config = [[ require('crates').setup() ]] } use 'simrat39/rust-tools.nvim' - use 'folke/trouble.nvim' + use { + 'folke/trouble.nvim', + config = [[ require("config.trouble")]] + } use 'hrsh7th/vim-vsnip' use 'kosayoda/nvim-lightbulb' use {'andymass/vim-matchup', event = 'VimEnter'} - use { 'ErichDonGubler/lsp_lines.nvim', config = [[require("lsp_lines").setup()]] } + use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] } use 'jghauser/mkdir.nvim' - use { 'simrat39/symbols-outline.nvim' } - use { 'petertriho/nvim-scrollbar', config = [[require("scrollbar").setup()]] } + use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline") ]] } + use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup() ]] } use { - 'nvim-telescope/telescope.nvim' , branch = '0.1.x', - 'nvim-telescope/telescope-file-browser.nvim', - requires = { {'nvim-lua/plenary.nvim'} } + 'nvim-telescope/telescope.nvim', + branch = '0.1.x', + config = [[ require("config.telescope") ]] } + use 'nvim-telescope/telescope-file-browser.nvim' use { "nvim-telescope/telescope-frecency.nvim", @@ -139,7 +149,7 @@ require('packer').startup(function(use) -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments', disable = not use_google(), requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'}, - config = [[ require("google_comments") ]] + config = [[ require("config.google-comments") ]] } use { @@ -151,11 +161,11 @@ require('packer').startup(function(use) use 'nvim-lua/lsp-status.nvim' use { 'nvim-lualine/lualine.nvim', - config = [[ require("lualine_config") ]] + config = [[ require("config.lualine") ]] } use { 'rcarriga/nvim-notify', - config = [[ require("notify_config") ]] + config = [[ require("config.notify") ]] } -- Git @@ -234,14 +244,8 @@ vim.opt.completeopt = { "menu", "menuone", "noselect" } -- Don't show the dumb matching stuff vim.opt.shortmess:append("c") -require('lspconfig') -require("lsp") - -require("diagnostics") -require("treesitter") -require("telescope_config") -require("symbols-outline-config") -require("spell_config") +vim.opt.spell = true +vim.opt.spelllang = { 'en_us' } -- redundant w/ lsp_lines vim.diagnostic.config({ diff --git a/vim/.vim/lua/spell_config.lua b/vim/.vim/lua/spell_config.lua deleted file mode 100644 index a6820c3..0000000 --- a/vim/.vim/lua/spell_config.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.opt.spell = true -vim.opt.spelllang = { 'en_us' } diff --git a/vim/.vim/prefs/1 b/vim/.vim/prefs/1 new file mode 100644 index 0000000..3beadb1 --- /dev/null +++ b/vim/.vim/prefs/1 @@ -0,0 +1,15 @@ +" perl plugins + + +" node plugins + + +" python3 plugins + + +" ruby plugins + + +" python plugins + + diff --git a/vim/.vimrc b/vim/.vimrc index beb7418..dff1fe9 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -78,6 +78,11 @@ set omnifunc= completeopt=menuone,noinsert,noselect set updatetime=100 +lua require('impatient') +" Enable profiling data +" lua require'impatient'.enable_profile() + + call plug#begin('~/.vim/plugged') if filereadable(expand("~/.vimrc.local")) source ~/.vimrc.local @@ -164,3 +169,20 @@ set mouse= " makes sure that when opening, files are normal, i.e. not folded. set nofoldenable + +" Disable built in neovim plugins to speed up +let g:loaded_matchparen = 1 +let g:loaded_matchit = 1 +let g:loaded_logiPat = 1 +let g:loaded_rrhelper = 1 +let g:loaded_tarPlugin = 1 +" let g:loaded_man = 1 +let g:loaded_gzip = 1 +let g:loaded_zipPlugin = 1 +let g:loaded_2html_plugin = 1 +let g:loaded_shada_plugin = 1 +let g:loaded_spellfile_plugin = 1 +let g:loaded_netrw = 1 +let g:loaded_netrwPlugin = 1 +let g:loaded_tutor_mode_plugin = 1 +let g:loaded_remote_plugins = 1