From 6c3c5b73d6f300928f5d2feab5d9bae35d896790 Mon Sep 17 00:00:00 2001
From: Jose Carvajal <josecarcar1@gmail.com>
Date: Thu, 29 May 2025 21:06:35 -0600
Subject: [PATCH] Update config from local

---
 lua/custom/plugins/theme.lua   | 33 ++++++++++++++++++++++++++++++---
 lua/kickstart/plugins/mini.lua |  6 ++++++
 lua/lazy-plugins.lua           |  4 ----
 lua/options.lua                |  9 +++++++++
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua
index 8ddbeb83..82bd6992 100644
--- a/lua/custom/plugins/theme.lua
+++ b/lua/custom/plugins/theme.lua
@@ -1,5 +1,32 @@
 return {
-  'catppuccin/nvim',
-  name = 'catppuccin',
-  priority = 1000,
+  {
+    'catppuccin/nvim',
+    name = 'catppuccin',
+    priority = 1000,
+    config = function()
+      require('catppuccin').setup()
+      vim.cmd.colorscheme 'catppuccin'
+    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.
+    config = function()
+      ---@diagnostic disable-next-line: missing-fields
+      require('tokyonight').setup {
+        styles = {
+          comments = { italic = false }, -- Disable italics in comments
+        },
+      }
+
+      -- 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'
+    end,
+  },
 }
diff --git a/lua/kickstart/plugins/mini.lua b/lua/kickstart/plugins/mini.lua
index d74fde42..52ba9e1d 100644
--- a/lua/kickstart/plugins/mini.lua
+++ b/lua/kickstart/plugins/mini.lua
@@ -32,6 +32,12 @@ return {
       -- return '%2l:%-2v'
       -- end
 
+      require('mini.bracketed').setup()
+      require('mini.operators').setup()
+      require('mini.bufremove').setup()
+      require('mini.jump').setup()
+      require('mini.jump2d').setup()
+
       -- ... and there is more!
       --  Check out: https://github.com/echasnovski/mini.nvim
     end,
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index e9205ee7..87604e3a 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -28,7 +28,6 @@ require('lazy').setup({
   require 'kickstart/plugins/lspconfig',
   require 'kickstart/plugins/conform',
   require 'kickstart/plugins/blink-cmp',
-  require 'kickstart/plugins/tokyonight',
   require 'kickstart/plugins/todo-comments',
   require 'kickstart/plugins/mini',
   require 'kickstart/plugins/treesitter',
@@ -87,8 +86,5 @@ require('lazy').setup({
     },
   },
 })
--- This goes in hand with custom/plugins/theme
-require('catppuccin').setup()
-vim.cmd.colorscheme 'catppuccin'
 
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/options.lua b/lua/options.lua
index 4be7408a..1dca713b 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -71,4 +71,13 @@ vim.o.scrolloff = 10
 -- See `:help 'confirm'`
 vim.o.confirm = true
 
+-- always use spaces for tabs
+vim.o.expandtab = true
+--[[ other tab settings to remember
+vim.o.tabstop = 8 -- Number of spaces that a <Tab> in the file counts for.
+vim.o.softtabstop = 8 -- Number of spaces that a <Tab> counts for pressing Tab or Backspace(<BS>)
+vim.o.shiftwidth = 8 -- Number of spaces to use for each step of (auto)indent.
+vim.o.autoindent = true -- Copy indent from current line when starting a new line
+]]
+
 -- vim: ts=2 sts=2 sw=2 et