update

lua/plugins/tools/gitsigns.lua

@@ -1,37 +1,14 @@
 local gitsigns = require('gitsigns')
+local icons = require('lib.icons')
 
 gitsigns.setup({
     signs = {
-        add = {
-            hl = 'GitSignsAdd',
-            text = '│',
-            numhl = 'GitSignsAddNr',
-            linehl = 'GitSignsAddLn',
-        },
-        change = {
-            hl = 'GitSignsChange',
-            text = '│',
-            numhl = 'GitSignsChangeNr',
-            linehl = 'GitSignsChangeLn',
-        },
-        delete = {
-            hl = 'GitSignsDelete',
-            text = '_',
-            numhl = 'GitSignsDeleteNr',
-            linehl = 'GitSignsDeleteLn',
-        },
-        topdelete = {
-            hl = 'GitSignsDelete',
-            text = '‾',
-            numhl = 'GitSignsDeleteNr',
-            linehl = 'GitSignsDeleteLn',
-        },
-        changedelete = {
-            hl = 'GitSignsChange',
-            text = '~',
-            numhl = 'GitSignsChangeNr',
-            linehl = 'GitSignsChangeLn',
-        },
+        add = { text = icons.ui.SeparatorLight },
+        change = { text = icons.ui.SeparatorLight },
+        delete = { text = icons.ui.SeparatorLight },
+        topdelete = { text = icons.ui.Topline },
+        changedelete = { text = icons.ui.SeparatorLight },
+        untracked = { text = icons.ui.SeparatorDashed },
     },
     signcolumn = true,
     numhl = false,
@@ -51,8 +28,7 @@ gitsigns.setup({
     update_debounce = 100,
     status_formatter = nil,
     max_file_length = 40000,
-    preview_config = { border = 'single', style = 'minimal', relative = 'cursor', row = 0, col = 1 },
-    yadm = { enable = false },
+    preview_config = { border = 'rounded', style = 'minimal', relative = 'cursor', row = 0, col = 1 },
     on_attach = function(bufnr)
         local gs = package.loaded.gitsigns
 
@@ -82,10 +58,6 @@ gitsigns.setup({
             return '<Ignore>'
         end, { expr = true, desc = 'Previous Change' })
 
-        map('n', '<leader>gB', function()
-            gs.blame_line({ full = true })
-        end, { desc = 'Blame With Preview' })
-
         map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
     end,
 })

lua/plugins/tools/oil.lua

@@ -1,4 +1,7 @@
       require("oil").setup({
+        default_file_explorer = true,
+        delete_to_trash = true,
+        skip_confirm_for_simple_edits = true,
         use_default_keymaps = false,
         keymaps = {
           ["q"] = "actions.close",
@@ -19,6 +22,10 @@
           ["h"] = "actions.toggle_hidden",
         },
         view_options = {
+          natural_order = true,
           show_hidden = false,
         },
+        win_options = {
+          wrap = true,
+        },
       })

lua/plugins/tools/telescope.lua

@@ -1,6 +1,5 @@
 local telescope = require('telescope')
 local actions = require('telescope.actions')
-local multi_open_mappings = require('plugins.tools.telescope-multiopen')
 local icons = require('lib.icons')
 
 local function flash(prompt_bufnr)
@@ -52,11 +51,8 @@ telescope.setup({
         prompt_prefix = icons.ui.Telescope .. icons.ui.ChevronRight,
         selection_caret = icons.ui.Play,
         multi_icon = icons.ui.Check,
-        path_display = {
-            filename_first = {
-                reverse_directories = false,
-            },
-        },
+        path_display = { 'smart' },
+        -- path_display = { filename_first = { reverse_directories = false } },
         sorting_strategy = 'ascending',
 
         mappings = {
@@ -129,11 +125,6 @@ telescope.setup({
             },
         },
     },
-    pickers = {
-        find_files = { mappings = multi_open_mappings },
-        git_files = { mappings = multi_open_mappings },
-        oldfiles = { mappings = multi_open_mappings },
-    },
     extensions = {
         fzf = {
             fuzzy = true,

lua/plugins/tools/which-key.lua

@@ -175,11 +175,12 @@ local mappings = {
         f = { '<cmd>lua require("telescope").extensions.menufacture.git_files()<cr>', 'Find files' },
         g = { '<cmd>lua require("telescope").extensions.menufacture.live_grep()<cr>', 'Find Text' },
         l = { '<cmd>Telescope loclist<cr>', 'Location List' },
-        r = { '<cmd>Telescope oldfiles<cr>', 'Recent Files' },
+        m = { '<cmd>Telescope git_status<cr>', 'Modified files' },
+        o = { '<cmd>Telescope live_grep grep_open_files=true<cr>', 'Find in Open Files' },
         p = { '<cmd>Telescope resume<cr>', 'Last Search' },
         q = { '<cmd>Telescope quickfix<cr>', 'Quickfix' },
+        r = { '<cmd>Telescope oldfiles<cr>', 'Recent Files' },
         s = { '<cmd>Telescope current_buffer_fuzzy_find<cr>', 'Fuzzy Find in File' },
-        S = { '<cmd>Telescope live_grep grep_open_files=true<cr>', 'Find in Open Files' },
         t = { '<cmd>Telescope<cr>', 'Panel' },
         u = { '<cmd>Telescope undo<cr>', 'Undo History' },
         w = { '<cmd>lua require("telescope").extensions.menufacture.grep_string()<cr>', 'Find Word' },
@@ -189,23 +190,23 @@ local mappings = {
         a = { '<cmd>Gitsigns stage_hunk<cr>', 'Stage Hunk' },
         A = { '<cmd>Gitsigns stage_buffer<cr>', 'Stage Buffer' },
         b = { "<cmd>lua require('gitsigns').blame_line({full = true})<cr>", 'Blame' },
-        B = { '<cmd>Telescope git_branches<cr>', 'Branches' },
-        c = { '<cmd>Git<cr>', 'Git Console' },
+        c = { '<cmd>Telescope git_commits<cr>', 'Find Commits' },
         C = { '<cmd>CoAuthor<cr>', 'Co-Authors' },
-        d = { '<cmd>Gitsigns preview_hunk<cr>', 'Preview Hunk' },
-        D = { '<cmd>Gitsigns diffthis HEAD<cr>', 'Diff' },
-        f = { '<cmd>Telescope git_commits<cr>', 'Find Commits' },
+        d = { '<cmd>Gitsigns diffthis HEAD<cr>', 'Diff' },
+        f = { '<cmd>Git<cr>', 'Fugitive Panel' },
         g = { '<cmd>Fterm lazygit<cr>', 'Lazygit' },
+        i = { '<cmd>Gitsigns preview_hunk<cr>', 'Hunk Info' },
         j = { '<cmd>Gitsigns next_hunk<cr>', 'Next Hunk' },
         k = { '<cmd>Gitsigns prev_hunk<cr>', 'Prev Hunk' },
-        l = { '<cmd>Git pull<cr>', 'Pull' },
-        p = { '<cmd>Git push<cr>', 'Push' },
+        l = { '<cmd>Git log<cr>', 'Log' },
+        p = { '<cmd>Git pull<cr>', 'Pull' },
+        P = { '<cmd>Git push<cr>', 'Push' },
         r = { '<cmd>Gitsigns reset_hunk<cr>', 'Reset Hunk' },
         R = { '<cmd>Gitsigns reset_buffer<cr>', 'Reset Buffer' },
-        s = { '<cmd>Telescope git_status<cr>', 'Changed files' },
+        s = { '<cmd>Telescope git_branches<cr>', 'Switch Branch' },
         S = { '<cmd>Telescope git_stash<cr>', 'Stashed Changes' },
         t = {
-            name = 'Git Toggle',
+            name = 'Toggle',
             b = { '<cmd>Gitsigns toggle_current_line_blame<cr>', 'Blame' },
             d = { '<cmd>Gitsigns toggle_deleted<cr>', 'Deleted' },
             l = { '<cmd>Gitsigns toggle_linehl<cr>', 'Line HL' },