From bdf862102e4066560a8bc5c5e96d91a3019bf44b Mon Sep 17 00:00:00 2001
From: GillesMarkvoort <92788320+GillesMarkvoort@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:52:28 +0200
Subject: [PATCH 1/5] Update init.lua with plugins from win config

---
 lua/custom/plugins/init.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index be0eb9d8d7a..786f40288c6 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -2,4 +2,16 @@
 --  I promise not to create any merge conflicts in this directory :)
 --
 -- See the kickstart.nvim README for more information
-return {}
+return {
+{  
+    'stevearc/oil.nvim',
+    opts = {},
+    -- Optional dependencies
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+},
+
+{
+  "cappyzawa/trim.nvim",
+  opts = {}
+},
+}

From 9fb9d1a1ddeccc61387313179bbcd1181c919252 Mon Sep 17 00:00:00 2001
From: GillesMarkvoort <92788320+GillesMarkvoort@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:39:13 +0100
Subject: [PATCH 2/5] Update init.lua with copilot

---
 lua/custom/plugins/init.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 786f40288c6..11da9b8db5c 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -14,4 +14,8 @@ return {
   "cappyzawa/trim.nvim",
   opts = {}
 },
+{
+  "github/copilot.vim",
+  opts = {}
+},
 }

From 943a77666e0d4fedda6bd98cf9b18592b7f66e71 Mon Sep 17 00:00:00 2001
From: GillesMarkvoort <92788320+GillesMarkvoort@users.noreply.github.com>
Date: Thu, 20 Mar 2025 10:13:24 +0100
Subject: [PATCH 3/5] Update init.lua

---
 lua/custom/plugins/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 11da9b8db5c..96db8dfa529 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -7,7 +7,7 @@ return {
     'stevearc/oil.nvim',
     opts = {},
     -- Optional dependencies
-    dependencies = { "nvim-tree/nvim-web-devicons" },
+    -- dependencies = { "nvim-tree/nvim-web-devicons" },
 },
 
 {

From 2a5d51257248570b816243e4ed6011fde2bcb026 Mon Sep 17 00:00:00 2001
From: GillesMarkvoort <92788320+GillesMarkvoort@users.noreply.github.com>
Date: Thu, 20 Mar 2025 10:23:26 +0100
Subject: [PATCH 4/5] Update init.lua

---
 init.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/init.lua b/init.lua
index 1427b6c7d5d..1581e00f2c8 100644
--- a/init.lua
+++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
 -- Set to true if you have a Nerd Font installed and selected in the terminal
-vim.g.have_nerd_font = false
+vim.g.have_nerd_font = true
 
 -- [[ Setting options ]]
 -- See `:help vim.opt`
@@ -102,7 +102,7 @@ vim.g.have_nerd_font = false
 vim.opt.number = true
 -- You can also add relative line numbers, to help with jumping.
 --  Experiment for yourself to see if you like it!
--- vim.opt.relativenumber = true
+vim.opt.relativenumber = true
 
 -- Enable mouse mode, can be useful for resizing splits for example!
 vim.opt.mouse = 'a'
@@ -894,11 +894,11 @@ require('lazy').setup({
     -- 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',
+    'catppuccin/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 {
+      require('catppuccin').setup {
         styles = {
           comments = { italic = false }, -- Disable italics in comments
         },
@@ -907,7 +907,7 @@ require('lazy').setup({
       -- 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'
+      vim.cmd.colorscheme 'catppuccin'
     end,
   },
 

From 16b4fd2fe29e8d92366da38d8ea44183f270907d Mon Sep 17 00:00:00 2001
From: GillesMarkvoort <92788320+GillesMarkvoort@users.noreply.github.com>
Date: Thu, 20 Mar 2025 10:34:34 +0100
Subject: [PATCH 5/5] Update init.lua

---
 init.lua | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/init.lua b/init.lua
index 1581e00f2c8..511c8a6962c 100644
--- a/init.lua
+++ b/init.lua
@@ -896,18 +896,14 @@ require('lazy').setup({
     -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
     'catppuccin/nvim',
     priority = 1000, -- Make sure to load this before all the other start plugins.
-    config = function()
-      ---@diagnostic disable-next-line: missing-fields
-      require('catppuccin').setup {
-        styles = {
-          comments = { italic = false }, -- Disable italics in comments
-        },
-      }
-
+    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 'catppuccin'
+
+      -- You can configure highlights by doing something like:
+      -- vim.cmd.hi 'Comment gui=none'
     end,
   },