From 78a7d107e5c6b8122a783d04eb1c9ca81b326dc9 Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Mon, 3 Feb 2025 02:16:10 -0600
Subject: [PATCH] rm debugger, add jj

---
 nix/mkNeovim.nix           |   2 +-
 nix/neovim-overlay.nix     |  13 +++--
 nvim/lua/plugins/debug.lua | 114 ++++++++++++++++++-------------------
 3 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/nix/mkNeovim.nix b/nix/mkNeovim.nix
index 02725a1..95975ff 100644
--- a/nix/mkNeovim.nix
+++ b/nix/mkNeovim.nix
@@ -28,7 +28,7 @@ with lib;
     extraPython3Packages ? p: [], # Additional python 3 packages
     withPython3 ? false, # Build Neovim with Python 3 support?
     withRuby ? false, # Build Neovim with Ruby support?
-    withNodeJs ? true, # Build Neovim with NodeJS support?
+    withNodeJs ? false, # Build Neovim with NodeJS support?
     withSqlite ? true, # Add sqlite? This is a dependency for some plugins
     # You probably don't want to create vi or vim aliases
     # if the appName is something different than "nvim"
diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix
index aaf9213..5b80814 100644
--- a/nix/neovim-overlay.nix
+++ b/nix/neovim-overlay.nix
@@ -32,11 +32,11 @@ with final.pkgs.lib; let
     none-ls-nvim
     nightfox-nvim
     nvim-autopairs
-    nvim-dap
-    nvim-dap-go
-    nvim-dap-ui
+    # nvim-dap
+    # nvim-dap-go
+    # nvim-dap-ui
     nvim-lspconfig
-    nvim-nio
+    # nvim-nio
     nvim-treesitter-context
     nvim-treesitter-textobjects
     nvim-treesitter.withAllGrammars
@@ -67,12 +67,16 @@ with final.pkgs.lib; let
 
     # debuggers
     delve
+
+    #other
+    jujutsu
   ];
 in {
   nvim-pkg = mkNeovim {
     plugins = all-plugins;
     appName = "nvim";
     extraPackages = basePackages ++ extraPackages;
+    withNodeJs = true;
   };
 
   nvim-min-pkg = mkNeovim {
@@ -82,6 +86,7 @@ in {
     ignoreConfigRegexes = [
       ".*lsp.lua"
       ".*debug.lua"
+      ".*ai.lua"
     ];
   };
 
diff --git a/nvim/lua/plugins/debug.lua b/nvim/lua/plugins/debug.lua
index 852e1c9..ba69c5a 100644
--- a/nvim/lua/plugins/debug.lua
+++ b/nvim/lua/plugins/debug.lua
@@ -1,57 +1,57 @@
-return {
-  {
-    'rcarriga/nvim-dap-ui',
-    event = 'VeryLazy',
-    dependencies = {
-      'nvim-neotest/nvim-nio',
-    },
-  },
-  {
-    'mfussenegger/nvim-dap',
-    event = 'VeryLazy',
-    dependencies = {
-      'leoluz/nvim-dap-go',
-      'rcarriga/nvim-dap-ui',
-    },
-    config = function()
-      local d = require('dap')
-      local w = require('dap.ui.widgets')
-      local ui = require('dapui')
-      require('dap-go').setup()
-      ui.setup()
-
-      local scopes = nil
-      vim.keymap.set('n', '<leader>za', function()
-        ui.toggle()
-      end, { desc = 'toggle dapui' })
-      vim.keymap.set('n', '<leader>zz', function()
-        d.continue()
-      end, { desc = 'start debugger' })
-      vim.keymap.set('n', '<leader>zn', function()
-        d.step_over()
-      end, { desc = 'step over' })
-      vim.keymap.set('n', '<leader>zi', function()
-        d.step_into()
-      end, { desc = 'step into' })
-      vim.keymap.set('n', '<leader>zo', function()
-        d.step_out()
-      end, { desc = 'step out' })
-      vim.keymap.set('n', '<leader>zx', function()
-        d.toggle_breakpoint()
-      end, { desc = 'toggle_breakpoint' })
-      vim.keymap.set('n', '<leader>zr', function()
-        d.run_last()
-      end, { desc = 'run prev' })
-      vim.keymap.set({ 'n', 'v' }, '<leader>zh', function()
-        ui.eval()
-      end, { desc = 'hover' })
-      vim.keymap.set({ 'n', 'v' }, '<leader>zp', function()
-        require('dap.ui.widgets').preview()
-      end, { desc = 'preview' })
-      vim.keymap.set('n', '<leader>zf', function()
-        local widgets = require('dap.ui.widgets')
-        widgets.centered_float(widgets.frames)
-      end, { desc = 'view frames' })
-    end,
-  },
-}
+-- return {
+--   {
+--     'rcarriga/nvim-dap-ui',
+--     event = 'VeryLazy',
+--     dependencies = {
+--       'nvim-neotest/nvim-nio',
+--     },
+--   },
+--   {
+--     'mfussenegger/nvim-dap',
+--     event = 'VeryLazy',
+--     dependencies = {
+--       'leoluz/nvim-dap-go',
+--       'rcarriga/nvim-dap-ui',
+--     },
+--     config = function()
+--       local d = require('dap')
+--       local w = require('dap.ui.widgets')
+--       local ui = require('dapui')
+--       require('dap-go').setup()
+--       ui.setup()
+--
+--       local scopes = nil
+--       vim.keymap.set('n', '<leader>za', function()
+--         ui.toggle()
+--       end, { desc = 'toggle dapui' })
+--       vim.keymap.set('n', '<leader>zz', function()
+--         d.continue()
+--       end, { desc = 'start debugger' })
+--       vim.keymap.set('n', '<leader>zn', function()
+--         d.step_over()
+--       end, { desc = 'step over' })
+--       vim.keymap.set('n', '<leader>zi', function()
+--         d.step_into()
+--       end, { desc = 'step into' })
+--       vim.keymap.set('n', '<leader>zo', function()
+--         d.step_out()
+--       end, { desc = 'step out' })
+--       vim.keymap.set('n', '<leader>zx', function()
+--         d.toggle_breakpoint()
+--       end, { desc = 'toggle_breakpoint' })
+--       vim.keymap.set('n', '<leader>zr', function()
+--         d.run_last()
+--       end, { desc = 'run prev' })
+--       vim.keymap.set({ 'n', 'v' }, '<leader>zh', function()
+--         ui.eval()
+--       end, { desc = 'hover' })
+--       vim.keymap.set({ 'n', 'v' }, '<leader>zp', function()
+--         require('dap.ui.widgets').preview()
+--       end, { desc = 'preview' })
+--       vim.keymap.set('n', '<leader>zf', function()
+--         local widgets = require('dap.ui.widgets')
+--         widgets.centered_float(widgets.frames)
+--       end, { desc = 'view frames' })
+--     end,
+--   },
+-- }