From ba8875ce204f81df5e7c8a5f679c1eddc558e58d Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 26 Oct 2022 20:49:18 +0000 Subject: [PATCH] stuff --- .../.config/nvim/plugin/packer_compiled.lua | 18 +++++------ vim/.vim/lua/catppuccin-config.lua | 31 +------------------ vim/.vim/lua/plugins.lua | 19 ++---------- 3 files changed, 13 insertions(+), 55 deletions(-) diff --git a/config/.config/nvim/plugin/packer_compiled.lua b/config/.config/nvim/plugin/packer_compiled.lua index 7b40d62..6c47e92 100644 --- a/config/.config/nvim/plugin/packer_compiled.lua +++ b/config/.config/nvim/plugin/packer_compiled.lua @@ -96,6 +96,7 @@ _G.packer_plugins = { url = "https://github.com/rmagatti/auto-session" }, catppuccin = { + config = { 'require("catppuccin-config")' }, loaded = true, path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/catppuccin", url = "https://github.com/catppuccin/nvim" @@ -318,11 +319,6 @@ _G.packer_plugins = { path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-case-convert", url = "https://github.com/chiedo/vim-case-convert" }, - ["vim-gitgutter"] = { - loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-gitgutter", - url = "https://github.com/airblade/vim-gitgutter" - }, ["vim-indent-guides"] = { loaded = true, path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-indent-guides", @@ -409,10 +405,6 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-scrollbar -time([[Config for nvim-scrollbar]], true) -require("scrollbar").setup() -time([[Config for nvim-scrollbar]], false) -- Config for: lsp_lines.nvim time([[Config for lsp_lines.nvim]], true) require("lsp_lines").setup() @@ -425,6 +417,14 @@ time([[Config for fidget.nvim]], false) time([[Config for auto-session]], true) try_loadstring("\27LJ\2\n‰\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\31auto_session_suppress_dirs\1\4\0\0\a~/\16~/Downloads\6/\1\0\1\14log_level\nerror\nsetup\17auto-session\frequire\0", "config", "auto-session") time([[Config for auto-session]], false) +-- Config for: nvim-scrollbar +time([[Config for nvim-scrollbar]], true) +require("scrollbar").setup() +time([[Config for nvim-scrollbar]], false) +-- Config for: catppuccin +time([[Config for catppuccin]], true) +require("catppuccin-config") +time([[Config for catppuccin]], false) -- Config for: git-conflict.nvim time([[Config for git-conflict.nvim]], true) require('git-conflict').setup() diff --git a/vim/.vim/lua/catppuccin-config.lua b/vim/.vim/lua/catppuccin-config.lua index d5ae6d0..1e3ad44 100644 --- a/vim/.vim/lua/catppuccin-config.lua +++ b/vim/.vim/lua/catppuccin-config.lua @@ -1,30 +1,8 @@ vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha - local colors = require("catppuccin.palettes").get_palette() require("catppuccin").setup({ - compile_path = vim.fn.stdpath("cache") .. "/catppuccin", - transparent_background = false, - term_colors = false, - dim_inactive = { - enabled = true, - shade = "dark", - percentage = 0.15, - }, - styles = { - comments = { "italic" }, - conditionals = { "italic" }, - loops = {}, - functions = {}, - keywords = {}, - strings = {}, - variables = {}, - numbers = {}, - booleans = {}, - properties = {}, - types = {}, - operators = {}, - }, + -- flavour = "macchiato", integrations = { cmp = true, -- coc_nvim = false, @@ -81,12 +59,7 @@ require("catppuccin").setup({ information = { "underline" }, }, }, - navic = { - enabled = false, - custom_bg = "NONE", - }, }, - color_overrides = {}, custom_highlights = { Identifier = { fg = colors.lavender }, Statement = { fg = colors.rosewater }, @@ -95,6 +68,4 @@ require("catppuccin").setup({ }, }) -require('catppuccin').compile() - vim.api.nvim_command "colorscheme catppuccin" diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua index 8316652..10c11f6 100644 --- a/vim/.vim/lua/plugins.lua +++ b/vim/.vim/lua/plugins.lua @@ -8,7 +8,7 @@ end local packerGroup = vim.api.nvim_create_augroup("packer_auto_compile", { clear = true }) vim.api.nvim_create_autocmd("BufWritePost", { pattern = "*/vim/lua/plugins.lua", - command = "source | PackerCompile", + command = "luafile | PackerCompile", group = packerGroup, }) @@ -54,18 +54,6 @@ require('packer').startup(function(use) } use 'folke/trouble.nvim' - use { - 'LucHermitte/vim-refactor', - requires = { - 'LucHermitte/lh-vim-lib', - 'LucHermitte/lh-tags', - 'LucHermitte/lh-dev', - 'LucHermitte/lh-style', - 'LucHermitte/lh-brackets', - }, - cmd = 'ExtractFunction' - } - use 'hrsh7th/vim-vsnip' use 'kosayoda/nvim-lightbulb' use {'andymass/vim-matchup', event = 'VimEnter'} @@ -109,7 +97,8 @@ require('packer').startup(function(use) } } - use { "catppuccin/nvim", as = "catppuccin"} + -- use { "catppuccin/nvim", as = "catppuccin" } + use { "catppuccin/nvim", as = "catppuccin", config = [[require("catppuccin-config")]]} -- mine use { @@ -124,7 +113,6 @@ require('packer').startup(function(use) use 'nathanaelkane/vim-indent-guides' use 'tversteeg/registers.nvim' - use 'airblade/vim-gitgutter' use 'preservim/vimux' use 'tmux-plugins/vim-tmux' use 'christoomey/vim-tmux-navigator' @@ -168,7 +156,6 @@ require("treesitter") require("telescope_config") require("lualine_config") require("notify_config") -require("catppuccin-config") require("symbols-outline-config") -- redundant w/ lsp_lines