From 0e32e25ef48fcdcba2e25f4f6c835eb2c64e3322 Mon Sep 17 00:00:00 2001
From: softinio <softinio@noreply.code.softinio.com>
Date: Fri, 15 Nov 2024 23:40:05 -0800
Subject: [PATCH 01/25] revert 63c054848fdfeeb898b2a3702026e5a5a1ce4779

revert Merge pull request 'add new plugins to support jujitsu' (#33) from push-utyvykwmwlyl into main

Reviewed-on: https://code.softinio.com/softinio/nvim-config/pulls/33
---
 lua/plugins/neo-tree-jj.lua | 32 --------------------------------
 lua/plugins/telescope.lua   |  2 --
 2 files changed, 34 deletions(-)
 delete mode 100644 lua/plugins/neo-tree-jj.lua

diff --git a/lua/plugins/neo-tree-jj.lua b/lua/plugins/neo-tree-jj.lua
deleted file mode 100644
index db36945..0000000
--- a/lua/plugins/neo-tree-jj.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-return {
-  "Cretezy/neo-tree-jj.nvim",
-  dependencies = {
-    {
-      "nvim-neo-tree/neo-tree.nvim",
-      opts = function(_, opts)
-        -- Register the source
-        table.insert(opts.sources, "jj")
-
-        -- Optional: Replace git tab in neo-tree when in jj repo
-        if require("neo-tree.sources.jj.utils").get_repository_root() then
-          -- Remove git tab
-          for i, source in ipairs(opts.source_selector.sources) do
-            if source.source == "git_status" then
-              table.remove(opts.source_selector.sources, i)
-              break
-            end
-          end
-
-          -- Add jj tab
-          table.insert(opts.source_selector.sources, {
-            display_name = "󰊢 JJ",
-            source = "jj",
-          })
-        end
-      end,
-    },
-  },
-  keys = {
-    { "<leader>mj", "<cmd>Neotree jj<cr>", desc = "NeoTree JJ" },
-  },
-}
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 239c587..c460410 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -6,7 +6,6 @@ return {
     { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
     "debugloop/telescope-undo.nvim",
     "nvim-telescope/telescope-ui-select.nvim",
-    "zschreur/telescope-jj.nvim",
   },
   config = function()
     require("telescope").setup({
@@ -22,7 +21,6 @@ return {
 
     -- Enable telescope fzf native, if installed
     pcall(require("telescope").load_extension, "fzf")
-    pcall(require("telescope").load_extension, "jj")
     pcall(require("telescope").load_extension, "scaladex")
     pcall(require("telescope").load_extension, "ui-select")
     pcall(require("telescope").load_extension, "undo")

From 04861de924b90c3e82ff002427a6fc0c796a8426 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 17 Nov 2024 14:06:19 -0800
Subject: [PATCH 02/25] update latex config to zathura

---
 lua/plugins/texlabconfig.lua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lua/plugins/texlabconfig.lua b/lua/plugins/texlabconfig.lua
index 0d745fa..f23f1c1 100644
--- a/lua/plugins/texlabconfig.lua
+++ b/lua/plugins/texlabconfig.lua
@@ -4,12 +4,18 @@ return {
   dependencies = { "lervag/vimtex" },
   config = function()
     -- vimtex
-    vim.g.vimtex_view_method = "skim"
+    vim.g.vimtex_view_method = "zathura"
     vim.g.vimtex_compiler_method = "tectonic"
 
     -- nvim-texlabconfig
-    local tex_preview_executable = "/Applications/Skim.app/Contents/SharedSupport/displayline"
-    local tex_preview_args = { "%l", "%p", "%f" }
+    local tex_preview_executable = "zathura"
+    local tex_preview_args = {
+      "--synctex-editor-command",
+      [[nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
+      "--synctex-forward",
+      "%l:1:%f",
+      "%p",
+    }
     local texlab_build_executable = "tectonic"
     local texlab_build_args = {
       "-X",

From 5649da4647543b1bc976bc079a6a19339d883c2b Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 17 Nov 2024 14:50:40 -0800
Subject: [PATCH 03/25] switch latex to use sioyek

---
 lua/plugins/texlabconfig.lua | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lua/plugins/texlabconfig.lua b/lua/plugins/texlabconfig.lua
index f23f1c1..d710c2b 100644
--- a/lua/plugins/texlabconfig.lua
+++ b/lua/plugins/texlabconfig.lua
@@ -4,16 +4,21 @@ return {
   dependencies = { "lervag/vimtex" },
   config = function()
     -- vimtex
-    vim.g.vimtex_view_method = "zathura"
+    vim.g.vimtex_view_method = "sioyek"
     vim.g.vimtex_compiler_method = "tectonic"
 
     -- nvim-texlabconfig
     local tex_preview_executable = "zathura"
     local tex_preview_args = {
-      "--synctex-editor-command",
-      [[nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
-      "--synctex-forward",
-      "%l:1:%f",
+      "--reuse-window",
+      "--execute-command",
+      "toggle_synctex", -- Open Sioyek in synctex mode.
+      "--inverse-search",
+      [[nvim-texlabconfig -file %%%1 -line %%%2 -server ]] .. vim.v.servername,
+      "--forward-search-file",
+      "%f",
+      "--forward-search-line",
+      "%l",
       "%p",
     }
     local texlab_build_executable = "tectonic"

From bfde2a57854d8fb3fed9489ea4c76913cbdcb75c Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 17 Nov 2024 16:19:42 -0800
Subject: [PATCH 04/25] add path for nvim texlab

---
 lua/plugins/texlabconfig.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/plugins/texlabconfig.lua b/lua/plugins/texlabconfig.lua
index d710c2b..3166e02 100644
--- a/lua/plugins/texlabconfig.lua
+++ b/lua/plugins/texlabconfig.lua
@@ -14,7 +14,8 @@ return {
       "--execute-command",
       "toggle_synctex", -- Open Sioyek in synctex mode.
       "--inverse-search",
-      [[nvim-texlabconfig -file %%%1 -line %%%2 -server ]] .. vim.v.servername,
+      [[/Users/salar/.local/share/nvim/lazy/nvim-texl/nvim-texlabconfig -file %%%1 -line %%%2 -server ]]
+        .. vim.v.servername,
       "--forward-search-file",
       "%f",
       "--forward-search-line",

From e8b0fe4b5199a86438afebbc5747357e2cbd4dc8 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 17 Nov 2024 16:25:28 -0800
Subject: [PATCH 05/25] move back to skim for latex preview

---
 lua/plugins/texlabconfig.lua | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/lua/plugins/texlabconfig.lua b/lua/plugins/texlabconfig.lua
index 3166e02..6b7611d 100644
--- a/lua/plugins/texlabconfig.lua
+++ b/lua/plugins/texlabconfig.lua
@@ -4,24 +4,12 @@ return {
   dependencies = { "lervag/vimtex" },
   config = function()
     -- vimtex
-    vim.g.vimtex_view_method = "sioyek"
+    vim.g.vimtex_view_method = "skim"
     vim.g.vimtex_compiler_method = "tectonic"
 
     -- nvim-texlabconfig
-    local tex_preview_executable = "zathura"
-    local tex_preview_args = {
-      "--reuse-window",
-      "--execute-command",
-      "toggle_synctex", -- Open Sioyek in synctex mode.
-      "--inverse-search",
-      [[/Users/salar/.local/share/nvim/lazy/nvim-texl/nvim-texlabconfig -file %%%1 -line %%%2 -server ]]
-        .. vim.v.servername,
-      "--forward-search-file",
-      "%f",
-      "--forward-search-line",
-      "%l",
-      "%p",
-    }
+    local tex_preview_executable = "skim"
+    local tex_preview_args = { "%l", "%p", "%f" }
     local texlab_build_executable = "tectonic"
     local texlab_build_args = {
       "-X",

From 1ea7d94bfc0021569b85472c84b90469d4c92da3 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 26 Jan 2025 16:09:42 -0800
Subject: [PATCH 06/25] tokyo night updates for a darker background

---
 lua/plugins/init.lua | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 02ce023..db768cc 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,21 +1,29 @@
 return {
   { "folke/neoconf.nvim", cmd = "Neoconf" },
-  {
-    "folke/neodev.nvim",
-    config = function()
-      require("neodev").setup()
-    end,
-  },
   {
     "folke/tokyonight.nvim",
     lazy = false, -- make sure we load this during startup if it is your main colorscheme
     priority = 1000, -- make sure to load this before all the other start plugins
+    opts = {
+      style = "night",
+      transparent = true,
+      terminal_colors = true,
+      on_colors = function(colors)
+        colors.bg = "#000000"
+      end,
+      config = function()
+        vim.g.tokyonight_style = "night"
+        vim.g.tokyonight_italic_functions = true
+        vim.o.termguicolors = true
+        -- load the colorscheme here
+        vim.cmd([[colorscheme tokyonight-night]])
+      end,
+    },
+  },
+  {
+    "folke/neodev.nvim",
     config = function()
-      vim.g.tokyonight_style = "night"
-      vim.g.tokyonight_italic_functions = true
-      vim.o.termguicolors = true
-      -- load the colorscheme here
-      vim.cmd([[colorscheme tokyonight]])
+      require("neodev").setup()
     end,
   },
   {

From d226c17b0609075861f7c11afc0e668406974b49 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 26 Jan 2025 16:22:39 -0800
Subject: [PATCH 07/25] Tokyo night option corrections

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

diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index db768cc..4a59794 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -11,7 +11,10 @@ return {
       on_colors = function(colors)
         colors.bg = "#000000"
       end,
-      config = function()
+      config = function(_, opts)
+        local tokyonight = require("tokyonight")
+        tokyonight.setup(opts)
+        tokyonight.load()
         vim.g.tokyonight_style = "night"
         vim.g.tokyonight_italic_functions = true
         vim.o.termguicolors = true

From ce43f554fc56b5ef63e7dabde740307f4a778af0 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 26 Jan 2025 16:40:12 -0800
Subject: [PATCH 08/25] tokyo night refactor

---
 lua/plugins/init.lua | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 4a59794..fee8d09 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,34 +1,27 @@
 return {
   { "folke/neoconf.nvim", cmd = "Neoconf" },
-  {
-    "folke/tokyonight.nvim",
-    lazy = false, -- make sure we load this during startup if it is your main colorscheme
-    priority = 1000, -- make sure to load this before all the other start plugins
-    opts = {
-      style = "night",
-      transparent = true,
-      terminal_colors = true,
-      on_colors = function(colors)
-        colors.bg = "#000000"
-      end,
-      config = function(_, opts)
-        local tokyonight = require("tokyonight")
-        tokyonight.setup(opts)
-        tokyonight.load()
-        vim.g.tokyonight_style = "night"
-        vim.g.tokyonight_italic_functions = true
-        vim.o.termguicolors = true
-        -- load the colorscheme here
-        vim.cmd([[colorscheme tokyonight-night]])
-      end,
-    },
-  },
   {
     "folke/neodev.nvim",
     config = function()
       require("neodev").setup()
     end,
   },
+  {
+    "folke/tokyonight.nvim",
+    lazy = false, -- make sure we load this during startup if it is your main colorscheme
+    priority = 1000, -- make sure to load this before all the other start plugins
+    config = function()
+      require("tokyonight").setup({
+        style = "night",
+        on_colors = function(colors)
+          colors.bg = "#000000" -- "#1a1b26"
+        end,
+      })
+      vim.o.termguicolors = true
+      -- load the colorscheme here
+      vim.cmd([[colorscheme tokyonight-night]])
+    end,
+  },
   {
     "folke/trouble.nvim",
     config = function()

From 5b931a90a58bebcedf713f78925cc416e6d07683 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sat, 1 Feb 2025 11:35:21 -0800
Subject: [PATCH 09/25] Add snacks and nvim-aider plugins

---
 lua/plugins/nvim-aider.lua | 17 +++++++++++++++++
 lua/plugins/snacks.lua     |  7 +++++++
 2 files changed, 24 insertions(+)
 create mode 100644 lua/plugins/nvim-aider.lua
 create mode 100644 lua/plugins/snacks.lua

diff --git a/lua/plugins/nvim-aider.lua b/lua/plugins/nvim-aider.lua
new file mode 100644
index 0000000..8913bff
--- /dev/null
+++ b/lua/plugins/nvim-aider.lua
@@ -0,0 +1,17 @@
+return {
+  "GeorgesAlkhouri/nvim-aider",
+  cmd = {
+    "AiderTerminalToggle",
+    "AiderHealth",
+  },
+  keys = {
+    { "<leader>a/", "<cmd>AiderTerminalToggle<cr>", desc = "Open Aider" },
+    { "<leader>as", "<cmd>AiderTerminalSend<cr>", desc = "Send to Aider", mode = { "n", "v" } },
+    { "<leader>ac", "<cmd>AiderQuickSendCommand<cr>", desc = "Send Command To Aider" },
+    { "<leader>ab", "<cmd>AiderQuickSendBuffer<cr>", desc = "Send Buffer To Aider" },
+    { "<leader>a+", "<cmd>AiderQuickAddFile<cr>", desc = "Add File to Aider" },
+    { "<leader>a-", "<cmd>AiderQuickDropFile<cr>", desc = "Drop File from Aider" },
+    { "<leader>ar", "<cmd>AiderQuickReadOnlyFile<cr>", desc = "Add File as Read-Only" },
+  },
+  config = true,
+}
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
new file mode 100644
index 0000000..c003c2b
--- /dev/null
+++ b/lua/plugins/snacks.lua
@@ -0,0 +1,7 @@
+return {
+  "folke/snacks.nvim",
+  priority = 1000,
+  lazy = false,
+  ---@type snacks.Config
+  opts = {},
+}

From fa1a1f4803f96d18b6df10b4380537207bfb65d9 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 23 Feb 2025 21:38:34 -0800
Subject: [PATCH 10/25] remove smart-splits

---
 lua/plugins/smart-splits.lua | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 lua/plugins/smart-splits.lua

diff --git a/lua/plugins/smart-splits.lua b/lua/plugins/smart-splits.lua
deleted file mode 100644
index 7a48e84..0000000
--- a/lua/plugins/smart-splits.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-return {
-  "mrjones2014/smart-splits.nvim",
-  lazy = false,
-  keys = {
-    -- resizing splits
-    { "<A-a>", ":lua require('smart-splits').resize_left()<CR>", desc = "smart split: resize left" },
-    { "<A-o>", ":lua require('smart-splits').resize_down()<CR>", desc = "smart split: resize down" },
-    { "<A-e>", ":lua require('smart-splits').resize_up()<CR>", desc = "smart split: resize up" },
-    { "<A-u>", ":lua require('smart-splits').resize_right()<CR>", desc = "smart split: resize right" },
-    -- moving between splits
-    { "<C-a>", ":lua require('smart-splits').move_cursor_left()<CR>", desc = "smart split: move cursor left" },
-    { "<C-o>", ":lua require('smart-splits').move_cursor_down()<CR>", desc = "smart split: move cursor up" },
-    { "<C-e>", ":lua require('smart-splits').move_cursor_up()<CR>", desc = "smart split: move cursor up" },
-    { "<C-u>", ":lua require('smart-splits').move_cursor_right()<CR>", desc = "smart split: move cursor right" },
-    {
-      "<C-\\>",
-      ":lua require('smart-splits').move_cursor_previous()<CR>",
-      desc = "smart split: move cursor to previous",
-    },
-    -- swapping buffers between windows
-    { "<leader><leader>a", ":lua require('smart-splits').swap_buf_left()<CR>", desc = "smart split: swap left" },
-    { "<leader><leader>o", ":lua require('smart-splits').swap_buf_down()<CR>", desc = "smart split: swap down" },
-    { "<leader><leader>e", ":lua require('smart-splits').swap_buf_up()<CR>", desc = "smart split: swap up" },
-    { "<leader><leader>u", ":lua require('smart-splits').swap_buf_right()<CR>", desc = "smart split: swap right" },
-  },
-}

From f962e982b648af6090a3f491996efcfd2cc37ee1 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Fri, 28 Feb 2025 13:48:33 -0800
Subject: [PATCH 11/25] try new highlight yank setting

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

diff --git a/init.lua b/init.lua
index 97c23c0..78719bb 100644
--- a/init.lua
+++ b/init.lua
@@ -82,7 +82,7 @@ else
   local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
   vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function()
-      vim.highlight.on_yank()
+      vim.highlight.on_yank({ higroup = "Search" })
     end,
     group = highlight_group,
     pattern = "*",

From 82f5352d1adc763d68fa882bf54b5e1cb1a6e2dc Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Fri, 28 Feb 2025 14:09:10 -0800
Subject: [PATCH 12/25] try new highlight yank setting - part2

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

diff --git a/init.lua b/init.lua
index 78719bb..8a3e8a9 100644
--- a/init.lua
+++ b/init.lua
@@ -79,10 +79,11 @@ else
 
   -- [[ Highlight on yank ]]
   -- See `:help vim.highlight.on_yank()`
+  vim.api.nvim_set_hl(0, "YankHighlight", { guibg = "#d19a66" })
   local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
   vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function()
-      vim.highlight.on_yank({ higroup = "Search" })
+      vim.highlight.on_yank({ higroup = "YankHighlight", timeout = 1000 })
     end,
     group = highlight_group,
     pattern = "*",

From 942200da6a1ee6910e34e44ad086d8b33ffecdeb Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Fri, 28 Feb 2025 15:14:08 -0800
Subject: [PATCH 13/25] Correction

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

diff --git a/init.lua b/init.lua
index 8a3e8a9..c38297b 100644
--- a/init.lua
+++ b/init.lua
@@ -79,11 +79,10 @@ else
 
   -- [[ Highlight on yank ]]
   -- See `:help vim.highlight.on_yank()`
-  vim.api.nvim_set_hl(0, "YankHighlight", { guibg = "#d19a66" })
   local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
   vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function()
-      vim.highlight.on_yank({ higroup = "YankHighlight", timeout = 1000 })
+      vim.highlight.on_yank({ higroup = "IncSearch", timeout = 1000 })
     end,
     group = highlight_group,
     pattern = "*",

From c5f6c482495281614010c0bf6f883011e3f5fe28 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sat, 1 Mar 2025 05:58:04 -0800
Subject: [PATCH 14/25] updates to avante and vscode yank settings

---
 init.lua                    |  2 +-
 lua/plugins/avante.lua      | 16 +++++++++++++++-
 lua/user/vscode_keymaps.lua |  9 +++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/init.lua b/init.lua
index c38297b..97c23c0 100644
--- a/init.lua
+++ b/init.lua
@@ -82,7 +82,7 @@ else
   local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
   vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function()
-      vim.highlight.on_yank({ higroup = "IncSearch", timeout = 1000 })
+      vim.highlight.on_yank()
     end,
     group = highlight_group,
     pattern = "*",
diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua
index e06c9a9..03b02d8 100644
--- a/lua/plugins/avante.lua
+++ b/lua/plugins/avante.lua
@@ -4,10 +4,24 @@ return {
   lazy = false,
   version = false,
   opts = {
-    provider = "openai",
+    provider = "claude",
+    claude = {
+      model = "claude-3-7-sonnet-latest",
+      api_key_name = "cmd:cat " .. vim.fn.expand("~/.anthropic"),
+    },
     openai = {
+      model = "o3-mini",
+      reasoning_effort = "high",
       api_key_name = "cmd:cat " .. vim.fn.expand("~/.openai"),
     },
+    vendors = {
+      ollama = {
+        __inherited_from = "openai",
+        api_key_name = "",
+        endpoint = "http://127.0.0.1:11434/v1",
+        model = "qwen2.5-coder",
+      },
+    },
   },
   -- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
   build = "make",
diff --git a/lua/user/vscode_keymaps.lua b/lua/user/vscode_keymaps.lua
index c58727b..3b11e1f 100644
--- a/lua/user/vscode_keymaps.lua
+++ b/lua/user/vscode_keymaps.lua
@@ -6,6 +6,15 @@ keymap("n", "<Space>", "", opts)
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
+-- highligh yank
+vim.api.nvim_set_hl(0, "YankHighlight", { guibg = "#d19a66" })
+vim.api.nvim_create_autocmd("TextYankPost", {
+  callback = function()
+    vim.highlight.on_yank({ higroup = "YankHighlight", timeout = 1000 })
+  end,
+  pattern = "*",
+})
+
 -- yank to system clipboard
 keymap({ "n", "v" }, "<leader>y", '"+y', opts)
 

From ddb8d1eb6e5875bd6671449465d8a06cf5e794ab Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sat, 1 Mar 2025 06:05:35 -0800
Subject: [PATCH 15/25] correction to vscode yank bg

---
 lua/user/vscode_keymaps.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/user/vscode_keymaps.lua b/lua/user/vscode_keymaps.lua
index 3b11e1f..d703c65 100644
--- a/lua/user/vscode_keymaps.lua
+++ b/lua/user/vscode_keymaps.lua
@@ -7,7 +7,7 @@ vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
 -- highligh yank
-vim.api.nvim_set_hl(0, "YankHighlight", { guibg = "#d19a66" })
+vim.api.nvim_set_hl(0, "YankHighlight", { bg = "#d19a66" })
 vim.api.nvim_create_autocmd("TextYankPost", {
   callback = function()
     vim.highlight.on_yank({ higroup = "YankHighlight", timeout = 1000 })

From 50e56d40254e170c776e3740f50a3fd3d58a2f84 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sat, 1 Mar 2025 06:08:49 -0800
Subject: [PATCH 16/25] highlight delay updated for vscode yank

---
 lua/user/vscode_keymaps.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/user/vscode_keymaps.lua b/lua/user/vscode_keymaps.lua
index d703c65..d239c88 100644
--- a/lua/user/vscode_keymaps.lua
+++ b/lua/user/vscode_keymaps.lua
@@ -10,7 +10,7 @@ vim.g.maplocalleader = " "
 vim.api.nvim_set_hl(0, "YankHighlight", { bg = "#d19a66" })
 vim.api.nvim_create_autocmd("TextYankPost", {
   callback = function()
-    vim.highlight.on_yank({ higroup = "YankHighlight", timeout = 1000 })
+    vim.highlight.on_yank({ higroup = "YankHighlight", timeout = 200 })
   end,
   pattern = "*",
 })

From e5d9a171a78811dddbe1a658e301a05b1340fac7 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 4 May 2025 21:37:30 -0700
Subject: [PATCH 17/25] add obsidian plugin

---
 lua/plugins/obsidian.lua | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 lua/plugins/obsidian.lua

diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua
new file mode 100644
index 0000000..c6407b7
--- /dev/null
+++ b/lua/plugins/obsidian.lua
@@ -0,0 +1,26 @@
+return {
+  "epwalsh/obsidian.nvim",
+  lazy = true,
+  event = {
+    "BufReadPre " .. "'/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio'",
+    "BufNewFile " .. "'/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio'",
+  },
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+  },
+  keys = {
+    { "<leader>fo", "<cmd>ObsidianQuickSwitch<cr>", desc = "Obsidian Quick Switch (Telescope)" },
+    { "<leader>fn", "<cmd>ObsidianNew<cr>", desc = "Create a new obsidian note" },
+    { "<leader>fs", "<cmd>ObsidianSearch<cr>", desc = "Obsidian Search" },
+    { "<leader>fd", "<cmd>ObsidianToday<cr>", desc = "Obsidian new daily note" },
+  },
+  opts = {
+    workspaces = {
+      {
+        name = "personal",
+        path = "'/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio'",
+      },
+    },
+    use_advanced_uri = false,
+  },
+}

From df43254bc9a68e661fc5fd9fac63fbc5b8de7df4 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 4 May 2025 22:04:26 -0700
Subject: [PATCH 18/25] obsidian plugin config cleanup

---
 lua/plugins/obsidian.lua | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua
index c6407b7..d1b6770 100644
--- a/lua/plugins/obsidian.lua
+++ b/lua/plugins/obsidian.lua
@@ -1,10 +1,7 @@
 return {
   "epwalsh/obsidian.nvim",
   lazy = true,
-  event = {
-    "BufReadPre " .. "'/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio'",
-    "BufNewFile " .. "'/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio'",
-  },
+  ft = "markdown",
   dependencies = {
     "nvim-lua/plenary.nvim",
   },
@@ -21,6 +18,5 @@ return {
         path = "'/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio'",
       },
     },
-    use_advanced_uri = false,
   },
 }

From 590f972e4b2eb4f33bbf374704a2da6071e83e03 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 4 May 2025 22:09:12 -0700
Subject: [PATCH 19/25] obsidian plugin path fix

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

diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua
index d1b6770..0637aa1 100644
--- a/lua/plugins/obsidian.lua
+++ b/lua/plugins/obsidian.lua
@@ -15,7 +15,7 @@ return {
     workspaces = {
       {
         name = "personal",
-        path = "'/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio'",
+        path = "/Users/salar/Library/Mobile Documents/iCloud~md~obsidian/Documents/Softinio",
       },
     },
   },

From f3886dfc499f6eab80357a0e340fcc3ba5e39802 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 4 May 2025 22:16:45 -0700
Subject: [PATCH 20/25] set conceal level as needed by obsidian plugin

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

diff --git a/init.lua b/init.lua
index 97c23c0..345aa71 100644
--- a/init.lua
+++ b/init.lua
@@ -31,6 +31,9 @@ else
   -- [[ Setting options ]]
   -- See `:help vim.o`
 
+  -- conceal level (needed for obsidian)
+  vim.o.conceallevel = 1
+
   -- Set highlight on search
   vim.o.hlsearch = true
   vim.o.incsearch = true

From 997bece059d23d8e87f2d8dbe4c8cc5781e3f485 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sat, 28 Jun 2025 10:17:21 -0700
Subject: [PATCH 21/25] Avante plugin updates

---
 lua/plugins/avante.lua | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua
index 03b02d8..e2dddab 100644
--- a/lua/plugins/avante.lua
+++ b/lua/plugins/avante.lua
@@ -5,20 +5,22 @@ return {
   version = false,
   opts = {
     provider = "claude",
-    claude = {
-      model = "claude-3-7-sonnet-latest",
-      api_key_name = "cmd:cat " .. vim.fn.expand("~/.anthropic"),
-    },
-    openai = {
-      model = "o3-mini",
-      reasoning_effort = "high",
-      api_key_name = "cmd:cat " .. vim.fn.expand("~/.openai"),
-    },
-    vendors = {
+    providers = {
+      claude = {
+        model = "claude-sonnet-4-20250514",
+        api_key_name = "cmd:cat " .. vim.fn.expand("~/.anthropic"),
+      },
+      openai = {
+        model = "o4-mini",
+        api_key_name = "cmd:cat " .. vim.fn.expand("~/.openai"),
+        extra_request_body = {
+          reasoning_effort = "high",
+        },
+      },
       ollama = {
         __inherited_from = "openai",
         api_key_name = "",
-        endpoint = "http://127.0.0.1:11434/v1",
+        endpoint = "http://127.0.0.1:11434",
         model = "qwen2.5-coder",
       },
     },
@@ -26,12 +28,12 @@ return {
   -- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
   build = "make",
   dependencies = {
+    "nvim-lua/plenary.nvim",
+    "MunifTanjim/nui.nvim",
     "HakonHarnes/img-clip.nvim",
     "MeanderingProgrammer/render-markdown.nvim",
-    "MunifTanjim/nui.nvim",
-    "nvim-lua/plenary.nvim",
     "nvim-tree/nvim-web-devicons",
     "nvim-treesitter/nvim-treesitter",
-    "stevearc/dressing.nvim",
+    "folke/snacks.nvim",
   },
 }

From 3ac11faa28b682e93eebdba08d2b26cc6ac490e1 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 29 Jun 2025 09:23:49 -0700
Subject: [PATCH 22/25] Add pyrefly to lsp

---
 lua/plugins/lsp.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 46f9eee..53dfcfe 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -98,6 +98,7 @@ return {
       marksman = {},
       nil_ls = {},
       nixd = {},
+      pyrefly = {},
       rust_analyzer = {
         diagnostics = {
           enable = true,

From 4eb4d93850e6219203c11d6075d599bb38e1d0ce Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 29 Jun 2025 10:49:12 -0700
Subject: [PATCH 23/25] Remove latex support

---
 lua/plugins/texlabconfig.lua | 40 ------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 lua/plugins/texlabconfig.lua

diff --git a/lua/plugins/texlabconfig.lua b/lua/plugins/texlabconfig.lua
deleted file mode 100644
index 6b7611d..0000000
--- a/lua/plugins/texlabconfig.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-return {
-  "f3fora/nvim-texlabconfig",
-  build = "go build",
-  dependencies = { "lervag/vimtex" },
-  config = function()
-    -- vimtex
-    vim.g.vimtex_view_method = "skim"
-    vim.g.vimtex_compiler_method = "tectonic"
-
-    -- nvim-texlabconfig
-    local tex_preview_executable = "skim"
-    local tex_preview_args = { "%l", "%p", "%f" }
-    local texlab_build_executable = "tectonic"
-    local texlab_build_args = {
-      "-X",
-      "compile",
-      "%f",
-      "--synctex",
-      "--keep-logs",
-      "--keep-intermediates",
-    }
-    require("texlabconfig").setup({
-      cache_activate = true,
-      cache_filetypes = { "tex", "bib" },
-      reverse_search_edit_cmd = vim.cmd.edit,
-      settings = {
-        texlab = {
-          build = {
-            executable = texlab_build_executable,
-            args = texlab_build_args,
-          },
-          forwardSearch = {
-            executable = tex_preview_executable,
-            args = tex_preview_args,
-          },
-        },
-      },
-    })
-  end,
-}

From 913025121496e56550f9f4b58f95f48c7e028117 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 29 Jun 2025 10:50:46 -0700
Subject: [PATCH 24/25] comment out render-markdown

---
 lua/plugins/avante.lua          |  2 +-
 lua/plugins/render-markdown.lua | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua
index e2dddab..04599d3 100644
--- a/lua/plugins/avante.lua
+++ b/lua/plugins/avante.lua
@@ -31,7 +31,7 @@ return {
     "nvim-lua/plenary.nvim",
     "MunifTanjim/nui.nvim",
     "HakonHarnes/img-clip.nvim",
-    "MeanderingProgrammer/render-markdown.nvim",
+    -- "MeanderingProgrammer/render-markdown.nvim",
     "nvim-tree/nvim-web-devicons",
     "nvim-treesitter/nvim-treesitter",
     "folke/snacks.nvim",
diff --git a/lua/plugins/render-markdown.lua b/lua/plugins/render-markdown.lua
index 4ceee58..f5f201f 100644
--- a/lua/plugins/render-markdown.lua
+++ b/lua/plugins/render-markdown.lua
@@ -1,11 +1,11 @@
-return {
-  "MeanderingProgrammer/render-markdown.nvim",
-  dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
-  ---@module 'render-markdown'
-  ---@type render.md.UserConfig
-  opts = {
-    file_types = { "markdown", "Avante" },
-    render_modes = true,
-  },
-  ft = { "markdown", "Avante" },
-}
+-- return {
+--   "MeanderingProgrammer/render-markdown.nvim",
+--   dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
+--   ---@module 'render-markdown'
+--   ---@type render.md.UserConfig
+--   opts = {
+--     file_types = { "markdown", "Avante" },
+--     render_modes = true,
+--   },
+--   ft = { "markdown", "Avante" },
+-- }

From 595b6d78f0dbd2d352c8f903988cd989d11d62fd Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 29 Jun 2025 11:12:17 -0700
Subject: [PATCH 25/25] Actually remove render-markdown instead of commeting
 out

---
 lua/plugins/avante.lua          |  1 -
 lua/plugins/render-markdown.lua | 11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 lua/plugins/render-markdown.lua

diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua
index 04599d3..b1ca857 100644
--- a/lua/plugins/avante.lua
+++ b/lua/plugins/avante.lua
@@ -31,7 +31,6 @@ return {
     "nvim-lua/plenary.nvim",
     "MunifTanjim/nui.nvim",
     "HakonHarnes/img-clip.nvim",
-    -- "MeanderingProgrammer/render-markdown.nvim",
     "nvim-tree/nvim-web-devicons",
     "nvim-treesitter/nvim-treesitter",
     "folke/snacks.nvim",
diff --git a/lua/plugins/render-markdown.lua b/lua/plugins/render-markdown.lua
deleted file mode 100644
index f5f201f..0000000
--- a/lua/plugins/render-markdown.lua
+++ /dev/null
@@ -1,11 +0,0 @@
--- return {
---   "MeanderingProgrammer/render-markdown.nvim",
---   dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
---   ---@module 'render-markdown'
---   ---@type render.md.UserConfig
---   opts = {
---     file_types = { "markdown", "Avante" },
---     render_modes = true,
---   },
---   ft = { "markdown", "Avante" },
--- }