init.lua @ c4ed73b2a3f3988d2ab40548dbd44a85ac717cb9

M lua/keymapings.lua

@@ -42,6 +42,20 @@ nmap("<leader>sT", "<cmd>Telescope grep_string<cr>")
 nmap("<leader>sp", "<cmd>Telescope projects<cr>")
 nmap("<leader>sr", "<cmd>Telescope oldfiles<cr>")
 nmap("<leader>sb", "<cmd>Telescope git_branches<cr>")
+nmap("<leader>sc", "<cmd>Telescope git_commits<cr>")
+nmap("<leader>sd", "<cmd>Telescope dap list_breakpoints<cr>")
+
+-- Dap
+nmap("<leader>dt", "<cmd>lua require'dap'.toggle_breakpoint()<cr>")
+nmap("<leader>db", "<cmd>lua require'dap'.step_back()<cr>")
+nmap("<leader>dc", "<cmd>lua require'dap'.continue()<cr>")
+nmap("<leader>dd", "<cmd>lua require'dap'.disconnect()<cr>")
+nmap("<leader>di", "<cmd>lua require'dap'.step_into()<cr>")
+nmap("<leader>do", "<cmd>lua require'dap'.step_over()<cr>")
+nmap("<leader>du", "<cmd>lua require'dap'.step_out()<cr>")
+nmap("<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>")
+nmap("<leader>dp", "<cmd>lua require'dap'.pause.toggle()<cr>")
+nmap("<leader>dq", "<cmd>lua require'dap'.close()<cr>")
 
 -- Ultest
 nmap("<leader>tt", "<cmd>Ultest<cr>")

A lua/plugin/configs/dap.lua

@@ -0,0 +1,26 @@
+local M = {}
+
+function M.setup()
+  require("nvim-dap-virtual-text").setup()
+
+  vim.fn.sign_define("DapBreakpoint", {
+    text = "",
+    texthl = "LspDiagnosticsSignError",
+    linehl = "",
+    numhl = "",
+  })
+  vim.fn.sign_define("DapBreakpointRejected", {
+    text = "",
+    texthl = "LspDiagnosticsSignHint",
+    linehl = "",
+    numhl = "",
+  })
+  vim.fn.sign_define("DapStopped", {
+    text = "",
+    texthl = "LspDiagnosticsSignInformation",
+    linehl = "DiagnosticUnderlineInfo",
+    numhl = "LspDiagnosticsSignInformation",
+  })
+end
+
+return M

M lua/plugin/configs/nvimtree.lua

@@ -6,6 +6,7 @@
   require("nvim-tree").setup {
     disable_netrw = true,
     hijack_netrw = true,
+    auto_close = true,
     auto_open = true,
     update_cwd = false,
     ignore_ft_on_setup = { ".git" },

M lua/plugin/configs/telescope.lua

@@ -49,6 +49,7 @@ },
   }
 
   require("telescope").load_extension "projects"
+  require("telescope").load_extension "dap"
 end
 
 return M

M lua/plugin/init.lua

@@ -4,7 +4,7 @@ use "nvim-lua/plenary.nvim"
   use "Mofiqul/vscode.nvim"
   use "kyazdani42/nvim-web-devicons"
   use "romgrk/barbar.nvim"
-  -- use { "tpope/vim-surround", keys = { "c", "y", "d" } }
+  use { "tpope/vim-surround", keys = { "c", "y", "d" } }
 
   use {
     "numToStr/Comment.nvim",
@@ -14,10 +14,9 @@ end,
   }
 
   use {
-    "folke/trouble.nvim",
-    cmd = "TroubleToggle",
+    "windwp/nvim-autopairs",
     config = function()
-      require("trouble").setup {}
+      require("nvim-autopairs").setup {}
     end,
   }
 
@@ -39,9 +38,29 @@ end,
   }
 
   use {
-    "windwp/nvim-autopairs",
+    "ahmedkhalf/project.nvim",
     config = function()
-      require("nvim-autopairs").setup {}
+      require("plugin.configs.project").setup()
+    end,
+  }
+
+  use {
+    "mfussenegger/nvim-dap",
+    requires = {
+      "Pocco81/DAPInstall.nvim",
+      "theHamsta/nvim-dap-virtual-text",
+      "nvim-telescope/telescope-dap.nvim",
+    },
+    config = function()
+      require("plugin.configs.dap").setup()
+    end,
+  }
+
+  use {
+    "folke/trouble.nvim",
+    cmd = "TroubleToggle",
+    config = function()
+      require("trouble").setup {}
     end,
   }
 
@@ -50,13 +69,6 @@ "ray-x/go.nvim",
     ft = "go",
     config = function()
       require("go").setup { gofmt = "gofumpt" }
-    end,
-  }
-
-  use {
-    "ahmedkhalf/project.nvim",
-    config = function()
-      require("plugin.configs.project").setup()
     end,
   }
 
@@ -97,7 +109,13 @@ requires = {
       { "hrsh7th/cmp-nvim-lua", after = "nvim-cmp" },
       { "hrsh7th/cmp-nvim-lsp", after = "nvim-cmp" },
       { "hrsh7th/cmp-buffer", after = "nvim-cmp" },
-      { "saadparwaiz1/cmp_luasnip", requires = { "L3MON4D3/LuaSnip", "rafamadriz/friendly-snippets" }, after = "nvim-cmp" },
+      {
+        "saadparwaiz1/cmp_luasnip",
+        requires = {
+          { "L3MON4D3/LuaSnip", after = "cmp_luasnip" },
+          { "rafamadriz/friendly-snippets", after = "LuaSnip" },
+        },
+      },
     },
     config = function()
       require("plugin.configs.cmp").setup()
@@ -138,6 +156,7 @@
   use {
     "Smirnov-O/ts-unit.nvim",
     after = "nvim-treesitter",
+    keys = { "vip", "cip", "dip", "yip" },
     config = function()
       require("ts-unit").setup { keymaps = true }
     end,