summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fnl/plugins/cmp.fnl10
-rw-r--r--fnl/plugins/inc-rename.fnl7
-rw-r--r--fnl/plugins/lsp/diagnostics.fnl7
-rw-r--r--fnl/plugins/lsp/keymaps.fnl1
-rw-r--r--fnl/plugins/noice.fnl50
-rw-r--r--fnl/settings/icons.fnl2
-rw-r--r--lazy-lock.json18
7 files changed, 80 insertions, 15 deletions
diff --git a/fnl/plugins/cmp.fnl b/fnl/plugins/cmp.fnl
index ca09329..1662afb 100644
--- a/fnl/plugins/cmp.fnl
+++ b/fnl/plugins/cmp.fnl
@@ -61,6 +61,14 @@
"│"]}}
:confirm_opts {:behavior cmp.ConfirmBehavior.Replace
:select false}
- :experimental {:ghost_text false :native_menu false}})))
+ :experimental {:ghost_text false :native_menu false}})
+ (cmp.setup.cmdline "/"
+ {:mapping (cmp.mapping.preset.cmdline)
+ :sources [{:name :buffer}]})
+ (cmp.setup.cmdline ":"
+ {:mapping (cmp.mapping.preset.cmdline)
+ :sources [{:name :path}
+ {:name :cmdline
+ :option {:ignore_cmds [:Man "!"]}}]})))
{1 :hrsh7th/nvim-cmp : dependencies :event :InsertEnter : config}
diff --git a/fnl/plugins/inc-rename.fnl b/fnl/plugins/inc-rename.fnl
new file mode 100644
index 0000000..bc50481
--- /dev/null
+++ b/fnl/plugins/inc-rename.fnl
@@ -0,0 +1,7 @@
+(local keys [{1 :ge 2 ":IncRename " :mode :n :desc :Rename}])
+
+{1 :smjonas/inc-rename.nvim
+ : keys
+ :config (fn []
+ (let [inc-rename (require :inc_rename)]
+ (inc-rename.setup)))}
diff --git a/fnl/plugins/lsp/diagnostics.fnl b/fnl/plugins/lsp/diagnostics.fnl
index aa1bf4d..9fbb627 100644
--- a/fnl/plugins/lsp/diagnostics.fnl
+++ b/fnl/plugins/lsp/diagnostics.fnl
@@ -26,10 +26,7 @@
(fn setup []
(configure-signs)
(vim.diagnostic.config config)
- (set vim.lsp.handlers.textDocument/hover
- (vim.lsp.with {:border :rounded :width 60}))
- (set vim.lsp.handlers.textDocument/signatureHelp
- (vim.lsp.with vim.lsp.handlers.signature_help
- {:border :rounded :width 60})))
+ (set vim.lsp.handlers.textDocument/hover false)
+ (set vim.lsp.handlers.textDocument/signatureHelp false))
{: setup}
diff --git a/fnl/plugins/lsp/keymaps.fnl b/fnl/plugins/lsp/keymaps.fnl
index 1518c78..ceb4907 100644
--- a/fnl/plugins/lsp/keymaps.fnl
+++ b/fnl/plugins/lsp/keymaps.fnl
@@ -15,7 +15,6 @@
"<cmd>lua vim.diagnostic.open_float()<CR>"
{:desc :Diagnostics}]
[:n :gs "<cmd>lua vim.lsp.buf.signature_help()<CR>" {:desc :Signature}]
- [:n :ge "<cmd>lua vim.lsp.buf.rename()<cr>" {:desc :Rename}]
[:n
:<leader>la
"<cmd>lua vim.lsp.buf.code_action()<cr>"
diff --git a/fnl/plugins/noice.fnl b/fnl/plugins/noice.fnl
new file mode 100644
index 0000000..9171833
--- /dev/null
+++ b/fnl/plugins/noice.fnl
@@ -0,0 +1,50 @@
+;; UI for messages, cmdline and the popup menu.
+
+(local icons (require :settings.icons))
+
+(local opts
+ {:cmdline {:enabled true
+ :view :cmdline_popup
+ :format {:cmdline {:pattern "^:"
+ :icon (.. (. icons :caret) " ")
+ :lang :vim}
+ :search_down {:view :cmdline
+ :icon (.. (. icons :search-text) " "
+ (. icons :down))}
+ :search_up {:view :cmdline
+ :icon (.. (. icons :search-text) " "
+ (. icons :up))}}}
+ :messages {:enabled true}
+ :popupmenu {:enabled true :backend :nui}
+ :notify {:enabled false}
+ :lsp {:override {:vim.lsp.util.convert_input_to_markdown_lines true
+ :vim.lsp.util.stylize_markdown true
+ :cmp.entry.get_documentation true}}
+ :presets {:bottom_search true
+ ;; use a classic bottom cmdline for search
+ :command_palette false
+ ;; position the cmdline and popupmenu together
+ :long_message_to_split false
+ ;; long messages will be sent to a split
+ :inc_rename true
+ ;; enables an input dialog for inc-rename.nvim
+ :lsp_doc_border true}
+ :views {:cmdline_popup {:border {:style :single}
+ :position {:row "42%" :col "50%"}
+ :size {:width 60 :height :auto}
+ :filter_options {}
+ :scrollbar false
+ :win_options {:winhighlight {:Normal :NormalFloat
+ :FloatBorder :FloatBorder}}}
+ :popupmenu {:relative :editor
+ :position {:row "51%" :col "50%"}
+ :size {:width 60 :height 10}
+ :border {:style :single :padding [0 0]}
+ :scrollbar false
+ :win_options {:winhighlight {:Normal :Normal
+ :FloatBorder :FloatBorder}}}}})
+
+{1 :folke/noice.nvim
+ :event :VeryLazy
+ :dependencies [:MunifTanjim/nui.nvim]
+ : opts}
diff --git a/fnl/settings/icons.fnl b/fnl/settings/icons.fnl
index b1115cb..080b1cb 100644
--- a/fnl/settings/icons.fnl
+++ b/fnl/settings/icons.fnl
@@ -16,6 +16,8 @@
:right-arrow ""
:small-right-arrow ""
:guillemet "»"
+ :up :
+ :down :
:close ""
:git-add "|"
:git-delete "_"
diff --git a/lazy-lock.json b/lazy-lock.json
index f54256f..3625ece 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -12,7 +12,6 @@
"conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" },
"dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
- "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
"easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" },
"flit.nvim": { "branch": "main", "commit": "39e3399ed2cbc328778258ac0d497ece9ed8fe32" },
"friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
@@ -21,25 +20,28 @@
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
"harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
"hotpot.nvim": { "branch": "master", "commit": "4deb08235bfccfbba8b0c031b1cfc8189883cdb4" },
+ "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
"leap-spooky.nvim": { "branch": "main", "commit": "45736ee4cd7584204ff5367ef47b4337bdb03aa9" },
- "leap.nvim": { "branch": "main", "commit": "e285f3c9a3fb11367f859faf553d28f332da0a2c" },
+ "leap.nvim": { "branch": "main", "commit": "46e9b1a1d7438ac72794b0857b20cad4390b827c" },
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"neogit": { "branch": "master", "commit": "536b4cfc009fc6d8bd771f010f04d48204533fae" },
+ "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
+ "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
"nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" },
"nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
- "nvim-lint": { "branch": "master", "commit": "76af3422e3c82ea40adf9ade1ccf1dc1eb361789" },
- "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" },
- "nvim-spectre": { "branch": "master", "commit": "81cb3999e5db37e97f6336b39c077aea5bb32062" },
+ "nvim-lint": { "branch": "master", "commit": "966ab3dc37eee3e413692264b44a3011b05a6060" },
+ "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" },
+ "nvim-spectre": { "branch": "master", "commit": "6a0785ef64c839d935a2f92e20988e962fb6537e" },
"nvim-surround": { "branch": "main", "commit": "f81bbef3da28bd2a7d5a736575c71f3f953d49f9" },
- "nvim-treesitter": { "branch": "master", "commit": "0d14299a9de818b6ef1f37313eddb100edb1f974" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" },
+ "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" },
"nvim-various-textobjs": { "branch": "main", "commit": "035243ea3c4bf005b24d8068666c7d571c708503" },
"nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
"nvim-window-picker": { "branch": "main", "commit": "2c8200c5cbcdaac01dfe2c049997a1ca178506d8" },
@@ -50,7 +52,7 @@
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
- "schemastore.nvim": { "branch": "main", "commit": "898a19cb54f310dda7cdeedf3d75aeeffcf19136" },
+ "schemastore.nvim": { "branch": "main", "commit": "d30f650b1b1b3b059328230a7ed8edccf6aaa522" },
"sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" },
"stay-in-place.nvim": { "branch": "main", "commit": "0628b6db8970fc731abf9608d6f80659b58932c9" },
"telescope-frecency.nvim": { "branch": "master", "commit": "a61ede8740643f09e1a7706fbb49b152e8f25d42" },