git: Added gitconfig to dotfiles

6 files changed, 40 insertions, 2 deletions

diff --git a/nvim/.config/nvim/lua/config/autocmds.lua b/nvim/.config/nvim/lua/config/autocmds.lua
index 8f6bb40..f3d156f 100644
--- a/nvim/.config/nvim/lua/config/autocmds.lua
+++ b/nvim/.config/nvim/lua/config/autocmds.lua
@@ -22,3 +22,4 @@
 --     end
 --   end,
 -- })
+--
diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua
index e5aa308..76a5f63 100644
--- a/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/nvim/.config/nvim/lua/config/keymaps.lua
@@ -72,6 +72,21 @@ vim.cmd([[
     cnoreabbrev Qall qall
 ]])
 
+-- dap keymaps
+
+-- Eval var under cursor
+vim.keymap.set("n", "<space>;", function()
+  require("dapui").eval(nil, { enter = true })
+end)
+
+vim.keymap.set("n", "<space>b", require("dap").toggle_breakpoint)
+
+vim.keymap.set("n", "<F1>", require("dap").continue)
+vim.keymap.set("n", "<F7>", require("dap").step_over)
+vim.keymap.set("n", "<F8>", require("dap").step_into)
+vim.keymap.set("n", "<F9>", require("dap").step_out)
+vim.keymap.set("n", "<F12>", require("dap").restart)
+
 -- load the session for the current directory
 vim.keymap.set("n", "<leader>ql", function()
   require("persistence").load()
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua
index ef5c5f7..6905561 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/config/options.lua
@@ -9,8 +9,6 @@ vim.opt.confirm = false
 vim.o.guifont = "Monaspace Radon:bold,Noto Color Emoji:h10" -- text below applies for VimScript
 vim.o.undofile = true
 
-vim.o.spell = false
-
 -- Best search settings :)
 vim.opt.smartcase = true
 vim.opt.ignorecase = true
diff --git a/nvim/.config/nvim/lua/plugins/diffview.lua b/nvim/.config/nvim/lua/plugins/diffview.lua
new file mode 100644
index 0000000..b223c0d
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/diffview.lua
@@ -0,0 +1,4 @@
+return {
+  "sindrets/diffview.nvim",
+  lazy = false,
+}
diff --git a/nvim/.config/nvim/lua/plugins/neo-tree.lua b/nvim/.config/nvim/lua/plugins/neo-tree.lua.old
index 488ca77..488ca77 100644
--- a/nvim/.config/nvim/lua/plugins/neo-tree.lua
+++ b/nvim/.config/nvim/lua/plugins/neo-tree.lua.old
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
index 40817dc..11ddbbc 100644
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -55,6 +55,26 @@ return {
       desc = "Find Keymaps",
     },
     {
+      "<leader>cd",
+      function()
+        local actions = require("telescope.actions")
+        local action_state = require("telescope.actions.state")
+
+        require("telescope.builtin").git_commits({
+          attach_mappings = function(prompt_bufnr, _)
+            actions.select_default:replace(function()
+              actions.close(prompt_bufnr)
+              local entry = action_state.get_selected_entry()
+              local commit = entry.value
+              vim.cmd("DiffviewOpen " .. commit .. "..HEAD")
+            end)
+            return true
+          end,
+        })
+      end,
+      desc = "Diff between current commit and an arbitrary commit",
+    },
+    {
       "<leader>fw",
       function()
         require("telescope.builtin").live_grep()