From a2f7557e846850a65790c31973b968e7375ce2e0 Mon Sep 17 00:00:00 2001 From: Slayter Teal Date: Thu, 29 Aug 2024 18:37:32 -0500 Subject: [PATCH] colorscheme and reorganization stuff --- init.lua | 64 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/init.lua b/init.lua index df1a7194..0f89da1a 100644 --- a/init.lua +++ b/init.lua @@ -136,16 +136,7 @@ end ---@diagnostic disable-next-line: undefined-field vim.opt.rtp:prepend(lazypath) -- [[ Configure and install plugins ]] --- --- To check the current status of your plugins, run --- :Lazy --- --- You can press `?` in this menu for help. Use `:q` to close the window --- --- Te update plugins you can run --- :Lazy update --- --- NOTE: Here is where you install your plugins. +-- NOTE: Here is plugins are setup! require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically @@ -683,23 +674,47 @@ require('lazy').setup({ end, }, - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. + -- ADD COLORSCHEMES HERE (or at least around here) + -- { + -- -- Change the name of the colorscheme plugin below, and then + -- -- change the command in the config to whatever the name of that colorscheme is. + -- -- + -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + -- 'folke/tokyonight.nvim', + -- priority = 1000, -- Make sure to load this before all the other start plugins. + -- init = function() + -- vim.cmd.colorscheme 'catppuccin' + -- + -- vim.cmd.hi 'Comment gui=none' + -- end, + -- }, + { + 'catppuccin/nvim', + name = 'catppuccin', + priority = 1000, + config = function() + require('catppuccin').setup { + -- name = 'catppuccin', + -- priority = 1000, + integrations = { + cmp = true, + -- gitsigns = true, + nvimtree = true, + treesitter = true, + -- notify = false, + mini = { + enabled = true, + indentscope_color = '', + }, + }, + } + end, init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - - -- You can configure highlights by doing something like: + vim.cmd.colorscheme 'catppuccin-frappe' vim.cmd.hi 'Comment gui=none' end, }, + -- END COLORSCHEMES CONFIG -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, @@ -829,6 +844,7 @@ require('lazy').setup({ require('autoclose').setup {} end, }, + -- ADD COLORSCHEMES here! -- Here are some example plugins that I've included in the Kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim). @@ -838,7 +854,7 @@ require('lazy').setup({ -- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.autopairs', -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + 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` -- This is the easiest way to modularize your config.