added fzf-thumb script. config edits. more fugitive setup. telescope rg setup. disabled auto dapui.

2 files changed, 35 insertions, 17 deletions

diff --git a/env/.config/nvim/after/plugin/dap.lua b/env/.config/nvim/after/plugin/dap.lua
index 88d552c..b52a5e4 100644
--- a/env/.config/nvim/after/plugin/dap.lua
+++ b/env/.config/nvim/after/plugin/dap.lua
@@ -1,18 +1,5 @@
 local ok, dap = pcall(require, 'dap')
 if ok then
-    vim.keymap.set("n", "<Leader>dl", function() dap.step_into() end)
-    vim.keymap.set("n", "<Leader>dj", function() dap.step_over() end)
-    vim.keymap.set("n", "<Leader>dk", function() dap.step_out() end)
-    vim.keymap.set("n", "<Leader>dc", function() dap.continue() end)
-    vim.keymap.set("n", "<Leader>db", function() dap.toggle_breakpoint() end)
-    vim.keymap.set("n", "<Leader>db>", function()
-        dap.set_breakpoint(vim.fn.input('Breakpoint condition: '))
-    end)
-    vim.keymap.set("n", "<Leader>dd", function() dap.terminate() end)
-    vim.keymap.set("n", "<Leader>dr", function() dap.run_last() end)
-    --vim.keymap.set("n", "<Leader>dt", "<cmd>lua vim.cmd('RustLsp testables')<Cr>")
-
-
     -- vim.api.nvim_set_hl(namespace, 'DapBreakpoint', { fg='#993939', bg='#31353f' })
     -- vim.api.nvim_set_hl(namespace, 'DapLogPoint', { fg='#61afef', bg='#31353f' })
     -- vim.api.nvim_set_hl(namespace, 'DapStopped', { fg='#98c379', bg='#31353f' })
@@ -41,6 +28,21 @@ if ok then
     local ok, dapui = pcall(require, 'dapui')
     if ok then
         dapui.setup()
+
+        vim.keymap.set("n", "<Leader>dl", function() dap.step_into() end)
+        vim.keymap.set("n", "<Leader>dj", function() dap.step_over() end)
+        vim.keymap.set("n", "<Leader>dk", function() dap.step_out() end)
+        vim.keymap.set("n", "<Leader>dc", function() dap.continue() end)
+        vim.keymap.set("n", "<Leader>db", function() dap.toggle_breakpoint() end)
+        vim.keymap.set("n", "<Leader>dB", function()
+            dap.set_breakpoint(vim.fn.input('Breakpoint condition: '))
+        end)
+        vim.keymap.set("n", "<Leader>dd", function() dap.terminate() end)
+        vim.keymap.set("n", "<Leader>dr", function() dap.run_last() end)
+        --vim.keymap.set("n", "<Leader>dt", "<cmd>lua vim.cmd('RustLsp testables')<Cr>")
+        vim.keymap.set("n", "<Leader>ds", function() dapui.toggle() end)
+
+        --[[
         dap.listeners.before.attach.dapui_config = function()
             dapui.open()
         end
@@ -53,6 +55,7 @@ if ok then
         dap.listeners.before.event_exited.dapui_config = function()
             dapui.close()
         end
+        ]]--
     end
 
     dap.configurations.rust = {
diff --git a/env/.config/nvim/after/plugin/telescope.lua b/env/.config/nvim/after/plugin/telescope.lua
index 6eb028d..8cc8efd 100755
--- a/env/.config/nvim/after/plugin/telescope.lua
+++ b/env/.config/nvim/after/plugin/telescope.lua
@@ -1,6 +1,5 @@
-local ok, _ = pcall(require, 'telescope')
+local ok, telescope  = pcall(require, 'telescope')
 if ok then
-    local telescope = require('telescope')
     local builtin = require('telescope.builtin')
     local action = require('telescope.actions')
     telescope.setup{
@@ -11,8 +10,21 @@ if ok then
                     ["q"] = action.close,
                 }
             }
-        }
+        },
+        pickers = {
+            find_files = {
+                find_command = {
+                    "rg",
+                    "--files",
+                    "--hidden",
+                    "--ignore-vcs",
+                    "--no-ignore",
+                    "-g", "!**/.git/*",
+                },
+            },
+        },
     }
+    --[[
     if string.find(vim.loop.cwd(),"iceys%-linux%-stuffs") then
         telescope.setup{
             pickers = {
@@ -22,6 +34,7 @@ if ok then
             }
         }
     end
+    ]]--
     -- vim.keymap.set('n', '<leader>pf', "<cmd>Telescope find_files initial_mode=normal<cr>", {})
     -- sort_mru=true sort by most recently used
     -- sort_lastused=true
@@ -40,5 +53,7 @@ if ok then
         local word = vim.fn.expand("<cWORD>")
         builtin.grep_string({ search = word })
     end)
-    vim.keymap.set('n', '<leadere>pg', builtin.git_files, {})
+    vim.keymap.set('n', '<leader>gg', builtin.git_files, {})
+    vim.keymap.set('n', '<leader>gs', builtin.git_status, {})
+    vim.keymap.set('n', '<leader>gm', builtin.git_commits, {})
 end