lua/plugins/init.lua

@@ -11,15 +11,11 @@ return {
     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.g.tokyonight_style = "night"
+      vim.g.tokyonight_italic_functions = true
       vim.o.termguicolors = true
       -- load the colorscheme here
-      vim.cmd([[colorscheme tokyonight-night]])
+      vim.cmd([[colorscheme tokyonight]])
     end,
   },
   {

lua/plugins/neo-tree-jj.lua

@@ -0,0 +1,32 @@
+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" },
+  },
+}

lua/plugins/nvim-aider.lua

@@ -1,17 +0,0 @@
-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,
-}

lua/plugins/snacks.lua

@@ -1,7 +0,0 @@
-return {
-  "folke/snacks.nvim",
-  priority = 1000,
-  lazy = false,
-  ---@type snacks.Config
-  opts = {},
-}

lua/plugins/telescope.lua

@@ -6,6 +6,7 @@ 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({
@@ -21,6 +22,7 @@ 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")

lua/plugins/texlabconfig.lua

@@ -8,7 +8,7 @@ return {
     vim.g.vimtex_compiler_method = "tectonic"
 
     -- nvim-texlabconfig
-    local tex_preview_executable = "skim"
+    local tex_preview_executable = "/Applications/Skim.app/Contents/SharedSupport/displayline"
     local tex_preview_args = { "%l", "%p", "%f" }
     local texlab_build_executable = "tectonic"
     local texlab_build_args = {