From e9ea9e8fd3a8fa986d2d664f6423d5f0270900bd Mon Sep 17 00:00:00 2001
From: StuartStephens <contact@stuartstephens.com>
Date: Mon, 17 Mar 2025 18:21:12 -0400
Subject: [PATCH] rebase

---
 init.lua                                      | 11 ++++++---
 lazy-lock.json                                | 18 +++++++++++++++
 lua/custom/plugins/copilot.lua                |  3 +++
 lua/custom/plugins/fugitive-azure_dev_ops.lua |  6 +++++
 lua/custom/plugins/fugitive.lua               |  6 +++++
 lua/custom/plugins/git-blame.lua              |  1 +
 lua/custom/plugins/harpoon-remaps.lua         | 20 ++++++++++++++++
 lua/custom/plugins/harpoon.lua                |  7 ++++++
 lua/custom/plugins/markdown-preview.lua       | 10 ++++++++
 lua/custom/plugins/neorg.lua                  |  6 +++++
 lua/custom/plugins/noice.lua                  | 15 ++++++++++++
 lua/custom/plugins/nvim-colorizer.lua         |  6 +++++
 lua/custom/plugins/nvim-surround.lua          | 10 ++++++++
 lua/custom/plugins/tree-sitter-context.lua    | 23 +++++++++++++++++++
 14 files changed, 139 insertions(+), 3 deletions(-)
 create mode 100644 lua/custom/plugins/copilot.lua
 create mode 100644 lua/custom/plugins/fugitive-azure_dev_ops.lua
 create mode 100644 lua/custom/plugins/fugitive.lua
 create mode 100644 lua/custom/plugins/git-blame.lua
 create mode 100644 lua/custom/plugins/harpoon-remaps.lua
 create mode 100644 lua/custom/plugins/harpoon.lua
 create mode 100644 lua/custom/plugins/markdown-preview.lua
 create mode 100644 lua/custom/plugins/neorg.lua
 create mode 100644 lua/custom/plugins/noice.lua
 create mode 100644 lua/custom/plugins/nvim-colorizer.lua
 create mode 100644 lua/custom/plugins/nvim-surround.lua
 create mode 100644 lua/custom/plugins/tree-sitter-context.lua

diff --git a/init.lua b/init.lua
index 02269d49..47f2c1a4 100644
--- a/init.lua
+++ b/init.lua
@@ -894,11 +894,12 @@ 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',
+    'craftzdog/solarized-osaka.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('solarized-osaka').setup {
+        -- require('tokyonight').setup {
         styles = {
           comments = { italic = false }, -- Disable italics in comments
         },
@@ -907,7 +908,11 @@ 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 'tokyonight-night'
+      vim.cmd.colorscheme 'solarized-osaka'
+
+      -- You can configure highlights by doing something like:
+      vim.cmd.hi 'Comment gui=none'
     end,
   },
 
diff --git a/lazy-lock.json b/lazy-lock.json
index e90d6e61..b4dcdf19 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -5,29 +5,47 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" },
+  "copilot.vim": { "branch": "release", "commit": "782461159655b259cff10ecff05efa761e3d4764" },
   "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
+  "fugitive-azure-devops.vim": { "branch": "master", "commit": "f5fc65a35a08662f8f3b1df457cc37597004f43a" },
+  "git-blame.nvim": { "branch": "master", "commit": "2883a7460f611c2705b23f12d58d398d5ce6ec00" },
   "gitsigns.nvim": { "branch": "main", "commit": "356df59308d8b87486644d2324d7558ac0f3db36" },
+  "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
   "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
   "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
+<<<<<<< HEAD
+=======
+  "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+>>>>>>> 2bc06d4 (initial plugin setup)
   "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.nvim": { "branch": "main", "commit": "64e95aa77587d04f97a5579b2106a82a08a7d968" },
   "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "neorg": { "branch": "main", "commit": "ba35900b21921c439e676b063a79c8fad914eac9" },
+  "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
   "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" },
   "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" },
   "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
   "nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" },
   "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
+  "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
   "nvim-treesitter": { "branch": "master", "commit": "679883ad31f1752cac92a4ca182cee8b2751d4f1" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "3d5390c49e3f8fe457b376df2a49aa39d75b7911" },
   "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" },
+  "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "solarized-osaka.nvim": { "branch": "main", "commit": "126d394c0c979a99206214a2b6b8c86e456c9c0f" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
new file mode 100644
index 00000000..1a804873
--- /dev/null
+++ b/lua/custom/plugins/copilot.lua
@@ -0,0 +1,3 @@
+return {
+  'github/copilot.vim',
+}
diff --git a/lua/custom/plugins/fugitive-azure_dev_ops.lua b/lua/custom/plugins/fugitive-azure_dev_ops.lua
new file mode 100644
index 00000000..1bd5e3fc
--- /dev/null
+++ b/lua/custom/plugins/fugitive-azure_dev_ops.lua
@@ -0,0 +1,6 @@
+return {
+  'cedarbaum/fugitive-azure-devops.vim',
+  config = function()
+    vim.cmd [[command -nargs=1 Browse silent exe '!xdg-open ' . "<args>"]]
+  end,
+}
diff --git a/lua/custom/plugins/fugitive.lua b/lua/custom/plugins/fugitive.lua
new file mode 100644
index 00000000..6f89f17d
--- /dev/null
+++ b/lua/custom/plugins/fugitive.lua
@@ -0,0 +1,6 @@
+return {
+  'tpope/vim-fugitive',
+  config = function()
+    vim.keymap.set('n', '<leader>G', '<cmd>vertical G<cr>', { desc = 'Markdown Preview' })
+  end,
+}
diff --git a/lua/custom/plugins/git-blame.lua b/lua/custom/plugins/git-blame.lua
new file mode 100644
index 00000000..c3ecf05a
--- /dev/null
+++ b/lua/custom/plugins/git-blame.lua
@@ -0,0 +1 @@
+return { 'f-person/git-blame.nvim' }
diff --git a/lua/custom/plugins/harpoon-remaps.lua b/lua/custom/plugins/harpoon-remaps.lua
new file mode 100644
index 00000000..3175038b
--- /dev/null
+++ b/lua/custom/plugins/harpoon-remaps.lua
@@ -0,0 +1,20 @@
+local mark = require 'harpoon.mark'
+local ui = require 'harpoon.ui'
+
+vim.keymap.set('n', '<leader>pa', mark.add_file)
+vim.keymap.set('n', '<C-e>', ui.toggle_quick_menu)
+
+vim.keymap.set('n', '<C-y>', function()
+  ui.nav_file(1)
+end)
+vim.keymap.set('n', '<C-t>', function()
+  ui.nav_file(2)
+end)
+vim.keymap.set('n', '<C-m>', function()
+  ui.nav_file(3)
+end)
+vim.keymap.set('n', '<C-s>', function()
+  ui.nav_file(4)
+end)
+
+return {}
diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua
new file mode 100644
index 00000000..bd34a525
--- /dev/null
+++ b/lua/custom/plugins/harpoon.lua
@@ -0,0 +1,7 @@
+return {
+  'ThePrimeagen/harpoon',
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  config = function()
+    require('harpoon').setup {}
+  end,
+}
diff --git a/lua/custom/plugins/markdown-preview.lua b/lua/custom/plugins/markdown-preview.lua
new file mode 100644
index 00000000..3518c063
--- /dev/null
+++ b/lua/custom/plugins/markdown-preview.lua
@@ -0,0 +1,10 @@
+return {
+  'iamcco/markdown-preview.nvim',
+  -- keys = {
+  --     { "<C-s>", "<cmd>MarkdownPreview<cr>", desc = "Markdown Preview" }
+  -- },
+  config = function()
+    vim.fn['mkdp#util#install']()
+    vim.keymap.set('n', '<leader>md', '<cmd>MarkdownPreview<cr>', { desc = 'Markdown Preview' })
+  end,
+}
diff --git a/lua/custom/plugins/neorg.lua b/lua/custom/plugins/neorg.lua
new file mode 100644
index 00000000..2e21f1d1
--- /dev/null
+++ b/lua/custom/plugins/neorg.lua
@@ -0,0 +1,6 @@
+return {
+  'nvim-neorg/neorg',
+  lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
+  version = '*', -- Pin Neorg to the latest stable release
+  config = true,
+}
diff --git a/lua/custom/plugins/noice.lua b/lua/custom/plugins/noice.lua
new file mode 100644
index 00000000..29373a85
--- /dev/null
+++ b/lua/custom/plugins/noice.lua
@@ -0,0 +1,15 @@
+return {
+  'folke/noice.nvim',
+  event = 'VeryLazy',
+  opts = {
+    -- add any options here
+  },
+  dependencies = {
+    -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
+    'MunifTanjim/nui.nvim',
+    -- OPTIONAL:
+    --   `nvim-notify` is only needed, if you want to use the notification view.
+    --   If not available, we use `mini` as the fallback
+    'rcarriga/nvim-notify',
+  },
+}
diff --git a/lua/custom/plugins/nvim-colorizer.lua b/lua/custom/plugins/nvim-colorizer.lua
new file mode 100644
index 00000000..416f2d12
--- /dev/null
+++ b/lua/custom/plugins/nvim-colorizer.lua
@@ -0,0 +1,6 @@
+return {
+  'norcalli/nvim-colorizer.lua',
+  config = function()
+    require('colorizer').setup()
+  end,
+}
diff --git a/lua/custom/plugins/nvim-surround.lua b/lua/custom/plugins/nvim-surround.lua
new file mode 100644
index 00000000..e32286cc
--- /dev/null
+++ b/lua/custom/plugins/nvim-surround.lua
@@ -0,0 +1,10 @@
+return {
+  'kylechui/nvim-surround',
+  version = '*', -- Use for stability; omit to use `main` branch for the latest features
+  event = 'VeryLazy',
+  config = function()
+    require('nvim-surround').setup {
+      -- Configuration here, or leave empty to use defaults
+    }
+  end,
+}
diff --git a/lua/custom/plugins/tree-sitter-context.lua b/lua/custom/plugins/tree-sitter-context.lua
new file mode 100644
index 00000000..64b9da9e
--- /dev/null
+++ b/lua/custom/plugins/tree-sitter-context.lua
@@ -0,0 +1,23 @@
+vim.keymap.set('n', '[c', function()
+  require('treesitter-context').go_to_context()
+end, { silent = true })
+
+return {
+  'nvim-treesitter/nvim-treesitter-context',
+  config = function()
+    require('treesitter-context').setup {
+      enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
+      max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+      min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+      line_numbers = true,
+      multiline_threshold = 20, -- Maximum number of lines to show for a single context
+      trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+      mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
+      -- Separator between context and content. Should be a single character string, like '-'.
+      -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+      separator = nil,
+      zindex = 20, -- The Z-index of the context window
+      on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
+    }
+  end,
+}