From 660573bcd0c645086a1ef29997432021f7d40ed3 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Sun, 19 Oct 2025 16:44:00 -0700
Subject: [PATCH 01/11] Enable more lsp servers

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

diff --git a/init.lua b/init.lua
index b98ffc6198a..bb28c9e2f66 100644
--- a/init.lua
+++ b/init.lua
@@ -671,9 +671,9 @@ require('lazy').setup({
       --  - settings (table): Override the default settings passed when initializing the server.
       --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
       local servers = {
-        -- clangd = {},
+        clangd = {},
         -- gopls = {},
-        -- pyright = {},
+        pyright = {},
         -- rust_analyzer = {},
         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
         --

From 9cc437bea1bb95c5866e2220044f0907e83b3a90 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Sun, 19 Oct 2025 16:44:19 -0700
Subject: [PATCH 02/11] Enable indent_line

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

diff --git a/init.lua b/init.lua
index bb28c9e2f66..ebc51cca118 100644
--- a/init.lua
+++ b/init.lua
@@ -974,7 +974,7 @@ require('lazy').setup({
   --  Uncomment any of the lines below to enable them (you will need to restart nvim).
   --
   -- require 'kickstart.plugins.debug',
-  -- require 'kickstart.plugins.indent_line',
+  require 'kickstart.plugins.indent_line',
   -- require 'kickstart.plugins.lint',
   -- require 'kickstart.plugins.autopairs',
   -- require 'kickstart.plugins.neo-tree',

From e1e4d6f222bb2dd91acdd7a42201850ce814d556 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Mon, 20 Oct 2025 14:44:51 -0700
Subject: [PATCH 03/11] Enable neotree

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

diff --git a/init.lua b/init.lua
index ebc51cca118..0ff00ba4afb 100644
--- a/init.lua
+++ b/init.lua
@@ -977,7 +977,7 @@ require('lazy').setup({
   require 'kickstart.plugins.indent_line',
   -- require 'kickstart.plugins.lint',
   -- require 'kickstart.plugins.autopairs',
-  -- require 'kickstart.plugins.neo-tree',
+  require 'kickstart.plugins.neo-tree',
   -- 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`

From 46c7fe37d880e0215162fd2265241a2f113df998 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Mon, 20 Oct 2025 14:45:03 -0700
Subject: [PATCH 04/11] Add orgmode

---
 init.lua                          |  1 +
 lua/kickstart/plugins/orgmode.lua | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 lua/kickstart/plugins/orgmode.lua

diff --git a/init.lua b/init.lua
index 0ff00ba4afb..f4cf502b76e 100644
--- a/init.lua
+++ b/init.lua
@@ -975,6 +975,7 @@ require('lazy').setup({
   --
   -- require 'kickstart.plugins.debug',
   require 'kickstart.plugins.indent_line',
+  require 'kickstart.plugins.orgmode',
   -- require 'kickstart.plugins.lint',
   -- require 'kickstart.plugins.autopairs',
   require 'kickstart.plugins.neo-tree',
diff --git a/lua/kickstart/plugins/orgmode.lua b/lua/kickstart/plugins/orgmode.lua
new file mode 100644
index 00000000000..1644e521f56
--- /dev/null
+++ b/lua/kickstart/plugins/orgmode.lua
@@ -0,0 +1,21 @@
+-- Orgmode for Lua
+
+return {
+  'nvim-orgmode/orgmode',
+  event = 'VeryLazy',
+  ft = { 'org' },
+  config = function()
+    -- Setup orgmode
+    require('orgmode').setup({
+      org_agenda_files = '~/orgfiles/**/*',
+      org_default_notes_file = '~/orgfiles/refile.org',
+    })
+
+    -- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option
+    -- add ~org~ to ignore_install
+    -- require('nvim-treesitter.configs').setup({
+    --   ensure_installed = 'all',
+    --   ignore_install = { 'org' },
+    -- })
+  end,
+}

From cf10453450e1dd5d9e2b07dddbe6162b5db7b855 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Mon, 20 Oct 2025 14:48:37 -0700
Subject: [PATCH 05/11] Remove lazy-lock.json from .gitignore

---
 .gitignore     |  1 -
 lazy-lock.json | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 lazy-lock.json

diff --git a/.gitignore b/.gitignore
index 005b535b606..8a192cab54d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ test.sh
 nvim
 
 spell/
-lazy-lock.json
diff --git a/lazy-lock.json b/lazy-lock.json
new file mode 100644
index 00000000000..8b931de0709
--- /dev/null
+++ b/lazy-lock.json
@@ -0,0 +1,27 @@
+{
+  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
+  "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
+  "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
+  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
+  "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
+  "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "mini.nvim": { "branch": "main", "commit": "e04b5c69e43a6387cb3d54b75635ee432f9b853a" },
+  "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "orgmode": { "branch": "master", "commit": "03777caca5c2df4c5b2067734b7829e9df07a423" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
+  "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },
+  "tokyonight.nvim": { "branch": "main", "commit": "e63c42a42b11cd6225f009dd949b9ee0fccc15ef" },
+  "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
+}

From 5aac9c0a63d2f7b39f35579a1d4a7166541f47cd Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Tue, 21 Oct 2025 22:44:42 -0700
Subject: [PATCH 06/11] Add OCS-52 module

For accessing clipboard over ssh
---
 init.lua                        |  1 +
 lazy-lock.json                  |  1 +
 lua/kickstart/plugins/ocs52.lua | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 lua/kickstart/plugins/ocs52.lua

diff --git a/init.lua b/init.lua
index f4cf502b76e..18a29aa50bb 100644
--- a/init.lua
+++ b/init.lua
@@ -978,6 +978,7 @@ require('lazy').setup({
   require 'kickstart.plugins.orgmode',
   -- require 'kickstart.plugins.lint',
   -- require 'kickstart.plugins.autopairs',
+  require 'kickstart.plugins.ocs52',
   require 'kickstart.plugins.neo-tree',
   -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
 
diff --git a/lazy-lock.json b/lazy-lock.json
index 8b931de0709..45779f0fd74 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -15,6 +15,7 @@
   "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
+  "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "orgmode": { "branch": "master", "commit": "03777caca5c2df4c5b2067734b7829e9df07a423" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
diff --git a/lua/kickstart/plugins/ocs52.lua b/lua/kickstart/plugins/ocs52.lua
new file mode 100644
index 00000000000..9d904b38cbb
--- /dev/null
+++ b/lua/kickstart/plugins/ocs52.lua
@@ -0,0 +1,20 @@
+return {
+  'ojroques/nvim-osc52',
+  event = 'VeryLazy',
+  opts = { max_length = 0, silent = true },
+  config = function(_, opts)
+    require('osc52').setup(opts)
+
+    -- Send *any* yank to the local clipboard automatically
+    vim.api.nvim_create_autocmd('TextYankPost', {
+      callback = function()
+        if vim.v.event.operator == 'y' then
+          require('osc52').copy_register(vim.v.event.regname == '' and '"' or vim.v.event.regname)
+        end
+      end,
+    })
+
+    -- Optional: explicit mappings
+    vim.keymap.set({ 'n', 'x' }, '<leader>y', require('osc52').copy_visual, { desc = 'Yank→local clipboard' })
+  end,
+}

From f9f81650457e18dc07ee841a5a96a0f8bc353447 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Tue, 21 Oct 2025 22:51:09 -0700
Subject: [PATCH 07/11] Add default indentation config

---
 init.lua | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/init.lua b/init.lua
index 18a29aa50bb..55ccc7f9a3b 100644
--- a/init.lua
+++ b/init.lua
@@ -247,7 +247,29 @@ rtp:prepend(lazypath)
 -- NOTE: Here is where you install your plugins.
 require('lazy').setup({
   -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
-  'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
+  {
+    'NMAC427/guess-indent.nvim',
+    event = 'BufReadPre',
+    -- 👇 First, set global defaults
+    init = function()
+      vim.opt.expandtab = true
+      vim.opt.tabstop = 4
+      vim.opt.softtabstop = 4
+      vim.opt.shiftwidth = 4
+    end,
+    opts = {
+      auto_cmd = true, -- automatically guess indent on file open
+      filetype_exclude = { 'netrw', 'tutor' },
+      buftype_exclude = { 'help', 'nofile', 'terminal', 'prompt' },
+
+      -- 👇 your fallback defaults
+      default_indent = {
+        tabstop = 4,
+        shiftwidth = 4,
+        expandtab = true,
+      },
+    },
+  },
 
   -- NOTE: Plugins can also be added by using a table,
   -- with the first argument being the link and the following

From a754c65b4fef74ff2c90f2ca0fe1b0e44d384937 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Tue, 28 Oct 2025 13:32:36 -0700
Subject: [PATCH 08/11] Enable spell check

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

diff --git a/init.lua b/init.lua
index 55ccc7f9a3b..bd5ceee7177 100644
--- a/init.lua
+++ b/init.lua
@@ -166,6 +166,10 @@ vim.o.scrolloff = 10
 -- See `:help 'confirm'`
 vim.o.confirm = true
 
+-- Enable spell checking
+vim.opt.spell = true
+vim.opt.spelllang = 'en_us'
+
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`
 

From 383bf939b9b00b832e0559777f512463578e568a Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Thu, 30 Oct 2025 15:20:40 -0700
Subject: [PATCH 09/11] Move custom modules

---
 init.lua                                      | 4 +---
 lazy-lock.json                                | 2 +-
 lua/{kickstart => custom}/plugins/ocs52.lua   | 0
 lua/{kickstart => custom}/plugins/orgmode.lua | 0
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename lua/{kickstart => custom}/plugins/ocs52.lua (100%)
 rename lua/{kickstart => custom}/plugins/orgmode.lua (100%)

diff --git a/init.lua b/init.lua
index bd5ceee7177..2dc104b19ac 100644
--- a/init.lua
+++ b/init.lua
@@ -1001,10 +1001,8 @@ require('lazy').setup({
   --
   -- require 'kickstart.plugins.debug',
   require 'kickstart.plugins.indent_line',
-  require 'kickstart.plugins.orgmode',
   -- require 'kickstart.plugins.lint',
   -- require 'kickstart.plugins.autopairs',
-  require 'kickstart.plugins.ocs52',
   require 'kickstart.plugins.neo-tree',
   -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
 
@@ -1012,7 +1010,7 @@ require('lazy').setup({
   --    This is the easiest way to modularize your config.
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  -- { import = 'custom.plugins' },
+  { import = 'custom.plugins' },
   --
   -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
   -- Or use telescope!
diff --git a/lazy-lock.json b/lazy-lock.json
index 45779f0fd74..5e0bfe0d60c 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -17,7 +17,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
   "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "orgmode": { "branch": "master", "commit": "03777caca5c2df4c5b2067734b7829e9df07a423" },
+  "orgmode": { "branch": "master", "commit": "f37b31b5fb6e5efd99963d9d38652df40b91690a" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
diff --git a/lua/kickstart/plugins/ocs52.lua b/lua/custom/plugins/ocs52.lua
similarity index 100%
rename from lua/kickstart/plugins/ocs52.lua
rename to lua/custom/plugins/ocs52.lua
diff --git a/lua/kickstart/plugins/orgmode.lua b/lua/custom/plugins/orgmode.lua
similarity index 100%
rename from lua/kickstart/plugins/orgmode.lua
rename to lua/custom/plugins/orgmode.lua

From fba13a38bf385b1002f82336c65ee643fb4ffcde Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Thu, 30 Oct 2025 16:02:37 -0700
Subject: [PATCH 10/11] Add Github copilot

---
 lazy-lock.json                 |  1 +
 lua/custom/plugins/copilot.lua | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 lua/custom/plugins/copilot.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 5e0bfe0d60c..d677b719d6d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,6 +2,7 @@
   "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
   "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
   "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
+  "copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" },
   "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
   "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
new file mode 100644
index 00000000000..75e93c2885c
--- /dev/null
+++ b/lua/custom/plugins/copilot.lua
@@ -0,0 +1,19 @@
+-- Copilot
+
+return {
+  {
+    "github/copilot.vim",
+    cmd = "Copilot",
+    event = "InsertEnter",
+    config = function()
+      -- Optional: enable copilot globally
+      vim.g.copilot_no_tab_map = true
+      vim.api.nvim_set_keymap("i", "<C-J>", 'copilot#Accept("<CR>")', { silent = true, expr = true })
+      vim.g.copilot_assume_mapped = true
+      vim.g.copilot_filetypes = {
+        ["*"] = true, -- enable for all filetypes
+        ["markdown"] = false, -- disable for markdown if desired
+      }
+    end,
+  },
+}

From 220a47a19e4337b04fd28b2a449f2bdd0e10a8c5 Mon Sep 17 00:00:00 2001
From: 40DEEA <40deea@gmail.com>
Date: Thu, 30 Oct 2025 16:11:15 -0700
Subject: [PATCH 11/11] Add copilot chat

---
 lazy-lock.json                      |  1 +
 lua/custom/plugins/copilot-chat.lua | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 lua/custom/plugins/copilot-chat.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index d677b719d6d..c5cb7243512 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,4 +1,5 @@
 {
+  "CopilotChat.nvim": { "branch": "main", "commit": "a7138a0ee04d8af42c262554eccee168bbf1454f" },
   "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
   "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
   "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
diff --git a/lua/custom/plugins/copilot-chat.lua b/lua/custom/plugins/copilot-chat.lua
new file mode 100644
index 00000000000..5a510f06fbf
--- /dev/null
+++ b/lua/custom/plugins/copilot-chat.lua
@@ -0,0 +1,13 @@
+--Copilot chat
+return {
+  {
+    "CopilotC-Nvim/CopilotChat.nvim",
+    dependencies = {
+      { "nvim-lua/plenary.nvim", branch = "master" },
+    },
+    build = "make tiktoken",
+    opts = {
+      -- See Configuration section for options
+    },
+  },
+}