Update gitsigns, trouble, and lock file

4 files changed, 51 insertions, 72 deletions

diff --git a/fnl/plugins/editor/gitsigns.fnl b/fnl/plugins/editor/gitsigns.fnl
index 0634138..1dc74c7 100644
--- a/fnl/plugins/editor/gitsigns.fnl
+++ b/fnl/plugins/editor/gitsigns.fnl
@@ -53,40 +53,26 @@
 
 (local icons (require :plugins.icons))
 
-(local signs {:add {:hl :GitSignsAdd
-                    :text (. icons :git-add)
-                    :numhl :GitSignsAddNr
-                    :linehl :GitSignsAddLn}
-              :change {:hl :GitSignsChange
-                       :text (. icons :git-add)
-                       :numhl :GitSignsChangeNr
-                       :linehl :GitSignsChangeLn}
-              :delete {:hl :GitSignsDelete
-                       :text (. icons :git-delete)
-                       :numhl :GitSignsDeleteNr
-                       :linehl :GitSignsDeleteLn}
-              :topdelete {:hl :GitSignsDelete
-                          :text (. icons :git-top-delete)
-                          :numhl :GitSignsDeleteNr
-                          :linehl :GitSignsDeleteLn}
-              :changedelete {:hl :GitSignsChange
-                             :text (. icons :git-change-delete)
-                             :numhl :GitSignsChangeNr
-                             :linehl :GitSignsChangeLn}})
+(local signs {:add {:text (. icons :git-add)}
+              :change {:text (. icons :git-add)}
+              :delete {:text (. icons :git-delete)}
+              :topdelete {:text (. icons :git-top-delete)}
+              :changedelete {:text (. icons :git-change-delete)}
+              :untracked {:text (. icons :git-untracked)}})
 
 (local opts {: signs
              :signcolumn true
              :numhl false
              :linehl false
              :word_diff false
-             :watch_gitdir {:interval 1000 :follow_files true}
+             :watch_gitdir {:follow_files true}
              :attach_to_untracked true
              :current_line_blame false
              :current_line_blame_opts {:virt_text true
                                        :virt_text_pos :eol
                                        :delay 1000
                                        :ignore_whitespace false}
-             :current_line_blame_formatter_opts {:relative_time false}
+             :current_line_blame_formatter "<author>, <author_time:%Y-%m-%d> - <summary>"
              :sign_priority 6
              :update_debounce 100
              :status_formatter nil
@@ -96,8 +82,10 @@
                               :relative :cursor
                               :row 0
                               :col 1}
-             :yadm {:enable false}
-             :on_attach (fn [bufnr]
-                          (on-attach bufnr))})
+             :yadm {:enable false}})
 
-{1 :lewis6991/gitsigns.nvim :event [:BufReadPost :BufNewFile] : opts}
+{1 :lewis6991/gitsigns.nvim
+ :event [:BufReadPost :BufNewFile]
+ : opts
+ :on_attach (fn [bufnr]
+              (on-attach bufnr))}
diff --git a/fnl/plugins/editor/trouble.fnl b/fnl/plugins/editor/trouble.fnl
index 839bba4..f0996fd 100644
--- a/fnl/plugins/editor/trouble.fnl
+++ b/fnl/plugins/editor/trouble.fnl
@@ -1,9 +1,7 @@
 ;; Pretty diagnostics.
 
-(local icons (require :plugins.icons))
-
 (local opts {:position :bottom
-             ;; position of the list can be: bottom, top, left, right
+             ; position of the list can be: bottom, top, left, right
              :height 10
              ;; height of the trouble list when position is top or bottom
              :width 50
@@ -70,19 +68,11 @@
              ;; automatically fold a file trouble list at creation
              :auto_jump [:lsp_definitions]
              ;; for the given modes, automatically jump if there is only a single result
-             :signs {;; icons / text used for a diagnostic
-                     :error (. icons :error)
-                     :warning (. icons :warn)
-                     :hint (. icons :hint)
-                     :information (. icons :info)
-                     :other (. icons :other)}
-             :use_diagnostic_signs false
-             ;; enabling this will use the signs defined in your lsp client
-             })
+             :use_diagnostic_signs true})
 
 {1 :folke/trouble.nvim
- ; :cmd [:Trouble :TroubleToggle]
+ :cmd [:TroubleToggle :Trouble]
+ : opts
  :keys [{1 :<leader>jt
          2 "<cmd>TroubleToggle workspace_diagnostics<cr>"
-         :desc :Trouble}]
- : opts}
+         :desc :Trouble}]}
diff --git a/fnl/plugins/icons.fnl b/fnl/plugins/icons.fnl
index 870aa3d..329cceb 100644
--- a/fnl/plugins/icons.fnl
+++ b/fnl/plugins/icons.fnl
@@ -22,6 +22,7 @@
  :git-delete "_"
  :git-top-delete "‾"
  :git-change-delete "~"
+ :git-untracked "┆"
  :telescope ""
  :caret ">"
  :cmd ""
diff --git a/lazy-lock.json b/lazy-lock.json
index 3441b31..e7e59f1 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,64 +1,64 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "c8043290f2d77f61025494d839d88e414608c460" },
-  "LuaSnip": { "branch": "master", "commit": "a13af80734eb28f744de6c875330c9d3c24b5f3b" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "f323ed8e03d2484a1abdaa267b839315f4b34c80" },
+  "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" },
+  "LuaSnip": { "branch": "master", "commit": "3d2ad0c0fa25e4e272ade48a62a185ebd0fe26c1" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "7322390c9abff6f137774d9e04bddb3cd725afd1" },
   "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" },
   "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "dial.nvim": { "branch": "master", "commit": "747d6fd009dbc1904627868125e16cfa7c524b0d" },
-  "diffview.nvim": { "branch": "main", "commit": "77cd1e12e5acff62b7be9027325a6c3d9521dcdb" },
+  "dial.nvim": { "branch": "master", "commit": "b3916370c24c498117a4c790b2752c437dab661a" },
+  "diffview.nvim": { "branch": "main", "commit": "b3a763f8c7810b352226c95faa7d3ac9fb93b8d9" },
   "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" },
-  "flit.nvim": { "branch": "main", "commit": "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e" },
-  "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" },
+  "flit.nvim": { "branch": "main", "commit": "5c9a78b97f7f4301473ea5e37501b5b1d4da167b" },
+  "friendly-snippets": { "branch": "main", "commit": "5749f093759c29e3694053d048ceb940fe12c3d3" },
+  "gitsigns.nvim": { "branch": "main", "commit": "a36bc3360d584d39b4fb076d855c4180842d4444" },
   "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
   "hotpot.nvim": { "branch": "master", "commit": "9fd5d6e341861c776ec9c69a2fc524deae67b541" },
-  "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" },
-  "leap.nvim": { "branch": "main", "commit": "14b5a65190fe69388a8f59c695ed3394a10d6af8" },
+  "lazy.nvim": { "branch": "main", "commit": "b7043f2983d7aead78ca902f3f2053907081859a" },
+  "leap.nvim": { "branch": "main", "commit": "3cc0e6a0b99dc18d4e5a88baa3cbe3c7b8b34566" },
   "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "54d702020bf94e4eefd357f0b738317af30217eb" },
-  "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "d381fcb78d7a562c3244e1c8f76406954649db36" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "73c68abdf65279e41526eb152876511a8ae84ea2" },
+  "mason.nvim": { "branch": "main", "commit": "664c987c3b14d2262a4e580f993a3e5045baded0" },
   "minibar.nvim": { "branch": "master", "commit": "353ca4efaf7fff1566bb02e0d7cb51133c41f660" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "eb9bbba751dbfca5dc717fe3e4e1b9708e6479a1" },
   "neogit": { "branch": "master", "commit": "68a3e90e9d1ed9e362317817851d0f34b19e426b" },
   "no-clown-fiesta.nvim": { "branch": "master", "commit": "f8e2b3fe8ecefaddf9ded87db03daa891a6975e2" },
-  "nui.nvim": { "branch": "main", "commit": "f2841533540eb60d6878964a3cd3f8196e1f200c" },
-  "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" },
-  "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" },
-  "nvim-bqf": { "branch": "main", "commit": "5895e26e34d032f48d0b9a843da1eb24e25680ea" },
+  "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" },
+  "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" },
+  "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" },
+  "nvim-bqf": { "branch": "main", "commit": "3460a1ccf4dc92a52ed7fe2012f02a9194cd84d2" },
   "nvim-bufdel": { "branch": "main", "commit": "96c4f7ab053ddab0025bebe5f7c71e4795430e47" },
-  "nvim-cmp": { "branch": "main", "commit": "09ff53ff579cfa3368f8051b0dbe88406891aabe" },
+  "nvim-cmp": { "branch": "main", "commit": "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "179803f537807fff5b5961a2b3efd9e7ddac54a2" },
-  "nvim-spectre": { "branch": "master", "commit": "8adb05dbfbd36862d700b5c3d1c26f0febf3f10d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b6b34b9acf84949f0ac1c00747765e62b81fb38d" },
+  "nvim-spectre": { "branch": "master", "commit": "f4dc98ec45ecded2344aa3aac2d7cc43ad236858" },
   "nvim-surround": { "branch": "main", "commit": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18" },
-  "nvim-treesitter": { "branch": "master", "commit": "f9d701176cb9a3e206a4c690920a8993630c3ec8" },
-  "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
-  "nvim-window-picker": { "branch": "main", "commit": "d3e26ba70dcf3248b2d8a9a9cb6e5ce2e3863bb8" },
-  "orgmode": { "branch": "master", "commit": "2737ef2be69b92fb58c6fb3861ca0bbb8f5d499e" },
+  "nvim-treesitter": { "branch": "master", "commit": "e9984bb744d3a413f58f4151df081db746df9c48" },
+  "nvim-web-devicons": { "branch": "master", "commit": "14b3a5ba63b82b60cde98d0a40319d80f25e8301" },
+  "nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" },
+  "orgmode": { "branch": "master", "commit": "4a7b92671094de130897519ca3e060b640a34006" },
   "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
-  "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" },
+  "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
   "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" },
   "stay-in-place.nvim": { "branch": "main", "commit": "0628b6db8970fc731abf9608d6f80659b58932c9" },
-  "telescope-frecency.nvim": { "branch": "master", "commit": "3ddaaa0a6084592eed451ded5fcd279e4a60c122" },
+  "telescope-frecency.nvim": { "branch": "master", "commit": "62d3381a32ae541233b03a129ece0aeced30ad5e" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
   "telescope-orgmode.nvim": { "branch": "main", "commit": "eabff061c3852a9aa94e672a7d2fa4a1ef63f9e2" },
-  "telescope.nvim": { "branch": "master", "commit": "69e8715786d1ee86249eff326f9d6804ee388502" },
+  "telescope.nvim": { "branch": "master", "commit": "ffe35cb433192fcb5080b557c1aef14d37092035" },
   "toggleterm.nvim": { "branch": "main", "commit": "cf146a267a6a7db62b1e2aff40414b20081048a1" },
   "trim.nvim": { "branch": "master", "commit": "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e" },
-  "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" },
+  "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" },
   "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
   "vim-slash": { "branch": "master", "commit": "31aee09b7ea8893a18fa34f65e63e364fc998444" },
-  "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" },
+  "which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" },
   "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" }
 }
\ No newline at end of file