astro-nvim-v3 - distant api

lazy-lock.json

@@ -21,12 +21,12 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" },
   "cyberdream.nvim": { "branch": "main", "commit": "fb68c9184afe80ed7b88a62f475b14b848a0645d" },
+  "distant.nvim": { "branch": "v0.3", "commit": "823267cf3b77cf9a7ae28454926eabc18fec1ba0" },
   "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" },
   "duplicate.nvim": { "branch": "main", "commit": "ab057af7872c44e6fbd48df9b03983c8e67c50a7" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
   "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
-  "grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" },
   "grug-far.nvim": { "branch": "main", "commit": "23f26dc09c6d61d574c92b4077598501dbe9aa06" },
   "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
   "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
@@ -46,6 +46,7 @@
   "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
   "mini.bufremove": { "branch": "main", "commit": "e6044aa28e61d4dd9ec86194d6f81743eced0c1c" },
   "mini.icons": { "branch": "main", "commit": "352a25dce86c41ab9fe854dd37f60c36ea7048df" },
+  "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" },
   "mini.move": { "branch": "main", "commit": "cde3747eec9bb3941296e6fa1d874e0da5a10256" },
   "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" },
   "multiple-cursors.nvim": { "branch": "main", "commit": "2f5e786c43aa9c0fc34b295cfcc9bfbacef8e926" },

lua/plugins/code-runner.lua

@@ -19,7 +19,6 @@ return {
     },
   },
   keys = {
-
     { "<leader>r", ":RunCode<CR>", mode = "n", noremap = true, silent = false, desc = "Run code" },
     { "<leader>rf", ":RunFile<CR>", mode = "n", noremap = true, silent = false, desc = "Run file" },
     { "<leader>rft", ":RunFile tab<CR>", mode = "n", noremap = true, silent = false, desc = "Run file in new tab" },

lua/plugins/disabled.lua

@@ -1,7 +1,7 @@
 -- Plugins to disable
 return {
   { "nvim-neo-tree/neo-tree.nvim", enabled = true },
-  { "lukas-reineke/indent-blankline.nvim", enabled = false},
+  { "lukas-reineke/indent-blankline.nvim", enabled = true},
   { "s1n7ax/nvim-window-picker", enabled = false },
   { "akinsho/toggleterm.nvim", enabled = false },
   { "NvChad/nvim-colorizer.lua", enabled = false },

lua/plugins/distant.lua

@@ -0,0 +1,21 @@
+-- if true then return {} end
+
+return {
+  "chipsenkbeil/distant.nvim",
+  branch = "v0.3",
+  event = "VimEnter",
+  cmd = {
+    "DistantLaunch",
+    "DistantOpen",
+    "DistantConnect",
+    "DistantInstall",
+    "DistantMetadata",
+    "DistantShell",
+    "DistantShell",
+    "DistantSystemInfo",
+    "DistantClientVersion",
+    "DistantSessionInfo",
+    "DistantCopy",
+  },
+  config = function() require("distant"):setup() end,
+}

lua/plugins/editor.lua

@@ -31,31 +31,31 @@ return {
     end,
   },
   -- File tagging and navigation
-  {
+  -- {
-    "cbochs/grapple.nvim",
+  --   "cbochs/grapple.nvim",
-    dependencies = {
+  --   dependencies = {
-      "nvim-lua/plenary.nvim",
+  --     "nvim-lua/plenary.nvim",
-      {
+  --     {
-        "AstroNvim/astrocore",
+  --       "AstroNvim/astrocore",
-        opts = function(_, opts)
+  --       opts = function(_, opts)
-          opts.mappings.n["<Leader><Leader>"] = { desc = require("astroui").get_icon("Grapple", 1, true) .. "Grapple" }
+  --         opts.mappings.n["<Leader><Leader>"] = { desc = require("astroui").get_icon("Grapple", 1, true) .. "Grapple" }
-        end,
+  --       end,
-      },
+  --     },
-    },
+  --   },
-    opts = {
+  --   opts = {
-      scope = "git_branch",
+  --     scope = "git_branch",
-    },
+  --   },
-    cmd = { "Grapple" },
+  --   cmd = { "Grapple" },
-    keys = {
+  --   keys = {
-      { "<Leader><Leader>a", "<Cmd>Grapple tag<CR>", desc = "Add tag to file" },
+  --     { "<Leader><Leader>a", "<Cmd>Grapple tag<CR>", desc = "Add tag to file" },
-      { "<Leader><Leader>d", "<Cmd>Grapple untag<CR>", desc = "Delete tag from file" },
+  --     { "<Leader><Leader>d", "<Cmd>Grapple untag<CR>", desc = "Delete tag from file" },
-      { "<Leader><Leader>e", "<Cmd>Grapple toggle_tags<CR>", desc = "Select from tags" },
+  --     { "<Leader><Leader>e", "<Cmd>Grapple toggle_tags<CR>", desc = "Select from tags" },
-      { "<Leader><Leader>s", "<Cmd>Grapple toggle_scopes<CR>", desc = "Select a project scope" },
+  --     { "<Leader><Leader>s", "<Cmd>Grapple toggle_scopes<CR>", desc = "Select a project scope" },
-      { "<Leader><Leader>x", "<Cmd>Grapple reset<CR>", desc = "Clear tags" },
+  --     { "<Leader><Leader>x", "<Cmd>Grapple reset<CR>", desc = "Clear tags" },
-      { "<C-e>", "<Cmd>Grapple cycle forward<CR>", desc = "Select next tag" },
+  --     { "<C-e>", "<Cmd>Grapple cycle forward<CR>", desc = "Select next tag" },
-      { "<C-p>", "<Cmd>Grapple cycle backward<CR>", desc = "Select previous tag" },
+  --     { "<C-p>", "<Cmd>Grapple cycle backward<CR>", desc = "Select previous tag" },
-    },
+  --   },
-  },
+  -- },
   -- Better escape support
   -- {
   --   "max397574/better-escape.nvim",
@@ -84,14 +84,14 @@ return {
           delay = 25,
         },
         indent = {
-          enable = true,
+          enable = false,
           use_treesitter = true,
           chars = {
             "│",
           },
         },
         blank = {
-          enable = true,
+          enable = false,
           chars = {
             " ",
           },

lua/plugins/indent-scope.lua

@@ -0,0 +1,89 @@
+local ignore_filetypes = {
+  "aerial",
+  "alpha",
+  "dashboard",
+  "help",
+  "lazy",
+  "mason",
+  "neo-tree",
+  "NvimTree",
+  "neogitstatus",
+  "notify",
+  "startify",
+  "toggleterm",
+  "Trouble",
+}
+local ignore_buftypes = {
+  "nofile",
+  "prompt",
+  "quickfix",
+  "terminal",
+}
+local char = "||"
+
+
+return {
+  "echasnovski/mini.indentscope",
+  event = "User AstroFile",
+  opts = function()
+    return {
+      options = { try_as_border = true },
+      symbol = require("astrocore").plugin_opts("indent-blankline.nvim").context_char or char,
+    }
+  end,
+  dependencies = {
+    { "lukas-reineke/indent-blankline.nvim", optional = true, opts = { scope = { enabled = false } } },
+    {
+      "AstroNvim/astrocore",
+      opts = {
+        autocmds = {
+          mini_indentscope = {
+            {
+              event = "FileType",
+              desc = "Disable indentscope for certain filetypes",
+              callback = function(event)
+                if vim.b[event.buf].miniindentscope_disable == nil then
+                  local filetype = vim.bo[event.buf].filetype
+                  local blankline_opts = require("astrocore").plugin_opts "indent-blankline.nvim"
+                  if vim.tbl_contains(blankline_opts.filetype_exclude or ignore_filetypes, filetype) then
+                    vim.b[event.buf].miniindentscope_disable = true
+                  end
+                end
+              end,
+            },
+            {
+              event = "BufWinEnter",
+              desc = "Disable indentscope for certain buftypes",
+              callback = function(event)
+                if vim.b[event.buf].miniindentscope_disable == nil then
+                  local buftype = vim.bo[event.buf].buftype
+                  local blankline_opts = require("astrocore").plugin_opts "indent-blankline.nvim"
+                  if vim.tbl_contains(blankline_opts.buftype_exclude or ignore_buftypes, buftype) then
+                    vim.b[event.buf].miniindentscope_disable = true
+                  end
+                end
+              end,
+            },
+            {
+              event = "TermOpen",
+              desc = "Disable indentscope for terminals",
+              callback = function(event)
+                if vim.b[event.buf].miniindentscope_disable == nil then
+                  vim.b[event.buf].miniindentscope_disable = true
+                end
+              end,
+            },
+          },
+        },
+      },
+    },
+  },
+  -- specs = {
+  --   {
+  --     "catppuccin",
+  --     optional = true,
+  --     ---@type CatppuccinOptions
+  --     opts = { integrations = { mini = true } },
+  --   },
+  -- },
+}