This commit is contained in:
Christian Nieves
2022-10-26 20:49:18 +00:00
parent dfaa396435
commit ba8875ce20
3 changed files with 13 additions and 55 deletions

View File

@ -96,6 +96,7 @@ _G.packer_plugins = {
url = "https://github.com/rmagatti/auto-session" url = "https://github.com/rmagatti/auto-session"
}, },
catppuccin = { catppuccin = {
config = { 'require("catppuccin-config")' },
loaded = true, loaded = true,
path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/catppuccin", path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/catppuccin",
url = "https://github.com/catppuccin/nvim" 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", path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-case-convert",
url = "https://github.com/chiedo/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"] = { ["vim-indent-guides"] = {
loaded = true, loaded = true,
path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-indent-guides", 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) 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 -- Config for: lsp_lines.nvim
time([[Config for lsp_lines.nvim]], true) time([[Config for lsp_lines.nvim]], true)
require("lsp_lines").setup() require("lsp_lines").setup()
@ -425,6 +417,14 @@ time([[Config for fidget.nvim]], false)
time([[Config for auto-session]], true) time([[Config for auto-session]], true)
try_loadstring("\27LJ\2\n<EFBFBD>\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") try_loadstring("\27LJ\2\n<EFBFBD>\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) 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 -- Config for: git-conflict.nvim
time([[Config for git-conflict.nvim]], true) time([[Config for git-conflict.nvim]], true)
require('git-conflict').setup() require('git-conflict').setup()

View File

@ -1,30 +1,8 @@
vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
local colors = require("catppuccin.palettes").get_palette() local colors = require("catppuccin.palettes").get_palette()
require("catppuccin").setup({ require("catppuccin").setup({
compile_path = vim.fn.stdpath("cache") .. "/catppuccin", -- flavour = "macchiato",
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 = {},
},
integrations = { integrations = {
cmp = true, cmp = true,
-- coc_nvim = false, -- coc_nvim = false,
@ -81,12 +59,7 @@ require("catppuccin").setup({
information = { "underline" }, information = { "underline" },
}, },
}, },
navic = {
enabled = false,
custom_bg = "NONE",
},
}, },
color_overrides = {},
custom_highlights = { custom_highlights = {
Identifier = { fg = colors.lavender }, Identifier = { fg = colors.lavender },
Statement = { fg = colors.rosewater }, Statement = { fg = colors.rosewater },
@ -95,6 +68,4 @@ require("catppuccin").setup({
}, },
}) })
require('catppuccin').compile()
vim.api.nvim_command "colorscheme catppuccin" vim.api.nvim_command "colorscheme catppuccin"

View File

@ -8,7 +8,7 @@ end
local packerGroup = vim.api.nvim_create_augroup("packer_auto_compile", { clear = true }) local packerGroup = vim.api.nvim_create_augroup("packer_auto_compile", { clear = true })
vim.api.nvim_create_autocmd("BufWritePost", { vim.api.nvim_create_autocmd("BufWritePost", {
pattern = "*/vim/lua/plugins.lua", pattern = "*/vim/lua/plugins.lua",
command = "source <afile> | PackerCompile", command = "luafile <afile> | PackerCompile",
group = packerGroup, group = packerGroup,
}) })
@ -54,18 +54,6 @@ require('packer').startup(function(use)
} }
use 'folke/trouble.nvim' 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 'hrsh7th/vim-vsnip'
use 'kosayoda/nvim-lightbulb' use 'kosayoda/nvim-lightbulb'
use {'andymass/vim-matchup', event = 'VimEnter'} 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 -- mine
use { use {
@ -124,7 +113,6 @@ require('packer').startup(function(use)
use 'nathanaelkane/vim-indent-guides' use 'nathanaelkane/vim-indent-guides'
use 'tversteeg/registers.nvim' use 'tversteeg/registers.nvim'
use 'airblade/vim-gitgutter'
use 'preservim/vimux' use 'preservim/vimux'
use 'tmux-plugins/vim-tmux' use 'tmux-plugins/vim-tmux'
use 'christoomey/vim-tmux-navigator' use 'christoomey/vim-tmux-navigator'
@ -168,7 +156,6 @@ require("treesitter")
require("telescope_config") require("telescope_config")
require("lualine_config") require("lualine_config")
require("notify_config") require("notify_config")
require("catppuccin-config")
require("symbols-outline-config") require("symbols-outline-config")
-- redundant w/ lsp_lines -- redundant w/ lsp_lines