From a688a66c4f9cbf1f88052eb32e476d53e158773b Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Mon, 10 Oct 2022 23:31:56 +0200
Subject: Remove nvim-tree command in which-key

---
 fnl/config/which-key.fnl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'fnl/config/which-key.fnl')

diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl
index 1d196fa..48a39be 100644
--- a/fnl/config/which-key.fnl
+++ b/fnl/config/which-key.fnl
@@ -137,7 +137,6 @@
 (def- nmappings {:a ["<cmd>Telescope lsp_document_symbols<cr>"
                      "Document Symbols"]
                  :c [:<cmd>Bdelete!<CR> "Close Buffer"]
-                 :e [:<cmd>NvimTreeToggle<cr> :Explorer]
                  :f find
                  :g git
                  :h [:<cmd>Alpha<cr> :Alpha]
-- 
cgit v1.2.3-70-g09d2


From 34d5c56462ddf6aef4c754ba39e650fe540c67c3 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Tue, 11 Oct 2022 00:25:05 +0200
Subject: Remap neogit to mmappings

---
 fnl/config/which-key.fnl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'fnl/config/which-key.fnl')

diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl
index 48a39be..8e89095 100644
--- a/fnl/config/which-key.fnl
+++ b/fnl/config/which-key.fnl
@@ -50,9 +50,10 @@
                      "Harpoon Prev"]
                  :t ["<cmd>Telescope harpoon marks<cr>" "Search Files"]
                  :v ["<cmd>lua vim.lsp.buf.rename()<cr>" :Rename]
-                 :p ["<cmd>SaveSession<cr>" "Save Session"]
+                 :p [:<cmd>SaveSession<cr> "Save Session"]
                  :r ["<cmd>lua require('harpoon.ui').toggle_quick_menu()<cr>"
-                     "Harpoon UI"]})
+                     "Harpoon UI"]
+                 :n [:<cmd>Neogit<cr> :Neogit]})
 
 (def- nopts {:mode :n
              :prefix :<leader>
@@ -78,8 +79,8 @@
             :C ["<cmd>Telescope commands<cr>" :Commands]})
 
 (def- git {:name :Git
-           :d ["<cmd>DiffviewOpen<cr>" "Diffview"]
-           :D ["<cmd>DiffviewFileHistory<cr>" "DiffviewFileHistory"]
+           :d ["<cmd>Gitsigns diffthis HEAD<cr>" :Diff]
+           :D [:<cmd>DiffviewFileHistory<cr> :DiffviewFileHistory]
            :j ["<cmd>lua require 'gitsigns'.next_hunk()<cr>" "Next Hunk"]
            :k ["<cmd>lua require 'gitsigns'.prev_hunk()<cr>" "Prev Hunk"]
            :l ["<cmd>lua require 'gitsigns'.blame_line()<cr>" :Blame]
@@ -92,8 +93,7 @@
            :o ["<cmd>Telescope git_status<cr>" "Open changed file"]
            :b ["<cmd>Telescope git_branches<cr>" "Checkout branch"]
            :c ["<cmd>Telescope git_commits<cr>" "Checkout commit"]
-           :d ["<cmd>Gitsigns diffthis HEAD<cr>" :Diff]
-           :n [:<cmd>Neogit<cr> :Neogit]})
+           :d ["<cmd>Gitsigns diffthis HEAD<cr>" :Diff]})
 
 (def- lsp {:name :LSP
            :a ["<cmd>lua vim.lsp.buf.code_action()<cr>" "Code Action"]
-- 
cgit v1.2.3-70-g09d2


From 69483c9b53e8d14e7c4398380ac64b2ea8c27887 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Tue, 11 Oct 2022 00:42:44 +0200
Subject: Add dropdown theme on most telescope commands

---
 fnl/config/which-key.fnl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'fnl/config/which-key.fnl')

diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl
index 8e89095..148ee29 100644
--- a/fnl/config/which-key.fnl
+++ b/fnl/config/which-key.fnl
@@ -40,7 +40,7 @@
                  :b ["<cmd>lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{sort_lastused = true, initial_mode = 'normal', previewer = false})<cr>"
                      "Switch buffers"]
                  :d [:<cmd>TroubleToggle<cr> :Trouble]
-                 :D ["<cmd>Telescope diagnostics<cr>" "Telescope diagnostics"]
+                 :D ["<cmd>Telescope diagnostics theme=dropdown<cr>" "Telescope diagnostics"]
                  :f ["<cmd>lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})<cr>"
                      "Find files"]
                  :g ["<cmd>Telescope live_grep theme=ivy<cr>" "Find text"]
@@ -48,7 +48,7 @@
                      "Harpoon Next"]
                  :h ["<cmd>lua require('harpoon.ui').nav_prev()<cr>"
                      "Harpoon Prev"]
-                 :t ["<cmd>Telescope harpoon marks<cr>" "Search Files"]
+                 :t ["<cmd>Telescope harpoon marks theme=dropdown<cr>" "Search Files"]
                  :v ["<cmd>lua vim.lsp.buf.rename()<cr>" :Rename]
                  :p [:<cmd>SaveSession<cr> "Save Session"]
                  :r ["<cmd>lua require('harpoon.ui').toggle_quick_menu()<cr>"
@@ -63,17 +63,17 @@
              :nowait true})
 
 (def- find {:name :Find
-            :b ["<cmd>Telescope git_branches<cr>" "Checkout branch"]
-            :c ["<cmd>Telescope colorscheme<cr>" :Colorscheme]
+            :b ["<cmd>Telescope git_branches theme=dropdown<cr>" "Checkout branch"]
+            :c ["<cmd>Telescope colorscheme theme=dropdown<cr>" :Colorscheme]
             :f ["<cmd>lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})<cr>"
                 "Find files"]
             :t ["<cmd>Telescope live_grep theme=ivy<cr>" "Find text"]
-            :s ["<cmd>Telescope grep_string<cr>" "Find String"]
+            :s ["<cmd>Telescope grep_string theme=dropdown<cr>" "Find String"]
             :h ["<cmd>Telescope help_tags<cr>" :Help]
             :H ["<cmd>Telescope highlights<cr>" :Highlights]
             :l ["<cmd>Telescope resume<cr>" "Last Search"]
             :M ["<cmd>Telescope man_pages<cr>" "Man Pages"]
-            :r ["<cmd>Telescope oldfiles<cr>" "Recent File"]
+            :r ["<cmd>Telescope oldfiles theme=dropdown<cr>" "Recent File"]
             :R ["<cmd>Telescope registers<cr>" :Registers]
             :k ["<cmd>Telescope keymaps<cr>" :Keymaps]
             :C ["<cmd>Telescope commands<cr>" :Commands]})
@@ -90,9 +90,9 @@
            :s ["<cmd>lua require 'gitsigns'.stage_hunk()<cr>" "Stage Hunk"]
            :u ["<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>"
                "Undo Stage Hunk"]
-           :o ["<cmd>Telescope git_status<cr>" "Open changed file"]
-           :b ["<cmd>Telescope git_branches<cr>" "Checkout branch"]
-           :c ["<cmd>Telescope git_commits<cr>" "Checkout commit"]
+           :o ["<cmd>Telescope git_status theme=dropdown<cr>" "Open changed file"]
+           :b ["<cmd>Telescope git_branches theme=dropdown<cr>" "Checkout branch"]
+           :c ["<cmd>Telescope git_commits theme=dropdown<cr>" "Checkout commit"]
            :d ["<cmd>Gitsigns diffthis HEAD<cr>" :Diff]})
 
 (def- lsp {:name :LSP
@@ -134,7 +134,7 @@
            (if (not= win nil)
                (nvim.set_current_win win)))))
 
-(def- nmappings {:a ["<cmd>Telescope lsp_document_symbols<cr>"
+(def- nmappings {:a ["<cmd>Telescope lsp_document_symbols theme=dropdown<cr>"
                      "Document Symbols"]
                  :c [:<cmd>Bdelete!<CR> "Close Buffer"]
                  :f find
-- 
cgit v1.2.3-70-g09d2