Fix which-key and icons

3 files changed, 66 insertions, 39 deletions

diff --git a/fnl/plugins/which-key.fnl b/fnl/plugins/which-key.fnl
index cc40d17..269978e 100644
--- a/fnl/plugins/which-key.fnl
+++ b/fnl/plugins/which-key.fnl
@@ -5,43 +5,56 @@
 (local opts {:plugins {:marks true
                        :registers true
                        :spelling {:enabled true :suggestions 20}
-                       :presets {:operators false
-                                 :motions false
-                                 :text_objects false
+                       :presets {:operators true
+                                 :motions true
+                                 :text_objects true
                                  :windows true
                                  :nav true
                                  :z true
                                  :g true}}
              :icons {:breadcrumb (. icons :guillemet)
                      :separator (.. (. icons :small-right-arrow) " ")
-                     :group "+"}
-             :popup_mappings {:scroll_down :<c-d> :scroll_up :<c-u>}
-             :window {:border :rounded :position :bottom :winblend 0}
+                     :group "+"
+                     :colors false
+                     :keys {:Up (.. (. icons :up-arrow) " ")
+                            :Down (.. (. icons :down-arrow) " ")
+                            :Left (.. (. icons :left-arrow) " ")
+                            :Right (.. (. icons :right-arrow) " ")
+                            :C (.. (. icons :up-caret) " ")
+                            :M (.. (. icons :meta) " ")
+                            :D (.. (. icons :openbased) " ")
+                            :S (.. (. icons :shift) " ")
+                            :CR (.. (. icons :cr) " ")
+                            :Esc (.. (. icons :esc) " ")
+                            :NL (.. (. icons :cr) " ")
+                            :BS (.. (. icons :bs) " ")
+                            :Space (.. (. icons :space) " ")
+                            :Tab (.. (. icons :tab) " ")}}
              :layout {:height {:min 4 :max 25}
                       :width {:min 20 :max 50}
                       :spacing 3
                       :align :left}
-             :hidden [:<silent> :<cmd> :<Cmd> :<CR> :call :lua "^:" "^ "]
              :show_help true
-             :triggers :auto
-             :disable {:filetypes [:netrw]}
-             :triggers_blacklist {:i [:j :k] :v [:j :k]}})
+             :disable {:filetypes [:netrw]}})
 
-(local groups {:mode [:n :v]
-               :<leader>d {:name :+db}
-               :<leader>f {:name :+find}
-               :<leader>g {:name :+git}
-               :<leader>i {:name :+diffview}
-               :<leader>j {:name :+diagnostics}
-               :<leader>l {:name :+lsp}
-               :<leader>o {:name :+orgmode}
-               :<leader>r {:name :+replace}
-               :<leader>s {:name :+session}
-               :<leader>w {:name :+worktree}})
+(local groups [{:mode [:n :v]
+                1 {1 :<leader>d :group :+db}
+                2 {1 :<leader>f :group :+find}
+                3 {1 :<leader>g :group :+git}
+                4 {1 :<leader>i :group :+diffview}
+                5 {1 :<leader>j :group :+diagnostics}
+                6 {1 :<leader>l :group :+lsp}
+                7 {1 :<leader>o :group :+orgmode}
+                8 {1 :<leader>r :group :+replace}
+                9 {1 :<leader>s :group :+session}
+                10 {1 :<leader>w :group :+worktree}}])
 
 (fn config []
   (let [which-key (require :which-key)]
     (which-key.setup opts)
-    (which-key.register groups)))
+    (which-key.add groups)))
 
-{1 :folke/which-key.nvim :event :VeryLazy : config}
+{1 :folke/which-key.nvim
+ :event :VeryLazy
+ : config
+ :dependencies :nvim-tree/nvim-web-devicons}
diff --git a/fnl/settings/icons.fnl b/fnl/settings/icons.fnl
index 6cbf106..2e40804 100644
--- a/fnl/settings/icons.fnl
+++ b/fnl/settings/icons.fnl
@@ -1,15 +1,20 @@
 ;; Icons.
 
-{:caret ">"
+{
+ :bs "󰭜"
+ :caret ">"
  :checkmark ""
  :close ""
  :cmd ""
  :code ""
  :cog ""
  :conflict ""
+ :cr "󰌑"
  :document ""
+ :down-arrow "󰁅"
  :down :
  :error ""
+ :esc "󱊷"
  :git " "
  :git-add "|"
  :git-change-delete "~"
@@ -24,29 +29,37 @@
  :import ""
  :info ""
  :keyboard ""
+ :left-arrow "󰁍"
  :lightning ""
  :line "‒"
+ :meta "◆"
  :notebook ""
+ :octagon "󰏄"
+ :octagon-filled "󰏃"
+ :openbased ""
  :orb "○"
  :orb-filled "●"
  :org ""
  :package "󰏗"
  :pentagon "󰜀"
  :pentagon-filled "󰜁"
- :octagon "󰏄"
- :octagon-filled "󰏃"
  :play ""
  :recent-files "󱋢"
  :right-arrow ""
  :search-files "󰱽"
  :search-project "󰺅"
  :search-text "󱎸"
+ :shift "󰘶"
  :sleep "󰒲"
  :small-right-arrow ""
+ :space ""
  :staged ""
  :star ""
+ :tab "󰌒"
  :telescope ""
  :unstaged ""
+ :up-caret "󰅃"
+ :up-arrow ""
  :up :
  :vim ""
  :warn ""
diff --git a/lazy-lock.json b/lazy-lock.json
index 307c781..f8fde57 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -7,7 +7,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "cc1ba956b61543641ddeeb7694c7cdaa33cd157c" },
+  "conform.nvim": { "branch": "master", "commit": "acc7d93f4a080fec587a99fcb36cffa29adc4bad" },
   "dial.nvim": { "branch": "master", "commit": "ed4d6a5bbd5e479b4c4a3019d148561a2e6c1490" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" },
@@ -15,43 +15,44 @@
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
   "git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" },
   "git-worktree.nvim": { "branch": "master", "commit": "666f84ba8dd9172f0a7b45c9f7c24bc5e55f6fc2" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d9f997dba757be01434ed3538d202f88286df476" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "hotpot.nvim": { "branch": "master", "commit": "5462d3eb5c191ab380ca911e1e931836d27f6a79" },
   "inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" },
-  "lazy.nvim": { "branch": "main", "commit": "9d445ebbd89401544a538c6af080e4d2785abb49" },
+  "lazy.nvim": { "branch": "main", "commit": "c92c6b5fd2b3a13c8999ab8379e43a79c9406e59" },
   "leap-spooky.nvim": { "branch": "main", "commit": "5f44a1f63dc1c4ce50244e92da5bc0d8d1f6eb47" },
-  "leap.nvim": { "branch": "main", "commit": "c099aecaf858574909bd38cbadb8543c4dd16611" },
+  "leap.nvim": { "branch": "main", "commit": "a9a9faee45066f2796c9a0e0ef52bf571d144492" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
   "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
   "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
-  "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" },
-  "neogit": { "branch": "master", "commit": "4fb60b903e8a01c9dfd3a59f56292dae667b8339" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "neogit": { "branch": "master", "commit": "af1d8d88f426a4da63c913f3b81a37350dbe8d02" },
   "no-clown-fiesta.nvim": { "branch": "master", "commit": "b164c148d497b843ad7c5255fee58ea8b6c5dd41" },
   "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
   "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
-  "nvim-cmp": { "branch": "main", "commit": "e1757aea6145d14208f3035f6b56c99e36593799" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
   "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
-  "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" },
+  "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" },
   "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "a6b2f4ecc8a47011868632142a9b687d7e0f9aaf" },
+  "nvim-treesitter": { "branch": "master", "commit": "de8d91d0efb9016004f04279aae115edb4ef5bf2" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
   "nvim-various-textobjs": { "branch": "main", "commit": "c2fd8bf4c86ec8d85bd0265074711027e640863a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
   "nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" },
   "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" },
   "org-bullets.nvim": { "branch": "main", "commit": "7e76e04827ac3fb13fc645a6309ac14203c4ca6a" },
   "org-roam.nvim": { "branch": "main", "commit": "45153562e7bfe806d84747d6518cad714c63ca2e" },
-  "orgmode": { "branch": "master", "commit": "85c1b443387ec4dd4eee5f7e2d837c13dd82d452" },
+  "orgmode": { "branch": "master", "commit": "c0584ec5fbe472ad7e7556bc97746b09aa7b8221" },
   "persistence.nvim": { "branch": "main", "commit": "40a137dd9240c9c6760c53df48d2b155f52c252b" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
   "rest.nvim": { "branch": "fix/getregtype", "commit": "7d6de91881a1b702fca2fe1e7f5ae88670a42b2a" },
-  "schemastore.nvim": { "branch": "main", "commit": "2580d32172f66fa37c0e57fb14e1b5bc94ed9e15" },
+  "schemastore.nvim": { "branch": "main", "commit": "58a965eedbfe7c358938b0e535ed2d98a4520987" },
   "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
   "stay-in-place.nvim": { "branch": "main", "commit": "0628b6db8970fc731abf9608d6f80659b58932c9" },
   "telescope-frecency.nvim": { "branch": "master", "commit": "bb2c63ee5375ede81c1945b58638412af42b2d62" },
@@ -66,6 +67,6 @@
   "vim-dadbod-completion": { "branch": "master", "commit": "c3a56c652af9367c5a7b658ed7ed4dc494f430b0" },
   "vim-dadbod-ui": { "branch": "master", "commit": "954877c3396ad4bf5624fcbe7b5673ac43cd0928" },
   "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
-  "which-key.nvim": { "branch": "main", "commit": "b55a568ae69724e334aec3ef291ea4e1768ba47a" },
+  "which-key.nvim": { "branch": "main", "commit": "8600b0029896ad2e36eb27a0808614ab8a0c057a" },
   "zen-mode.nvim": { "branch": "main", "commit": "a31cf7113db34646ca320f8c2df22cf1fbfc6f2a" }
-}
\ No newline at end of file
+}