From 2de0ec60326a9b46ba665228dc789c5ffbc39da8 Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Sun, 8 Oct 2023 03:36:39 +0200 Subject: figured out some sops stuff --- mut/neovim/fnl/conf/pkgs/cmp.fnl | 39 ++++++++++++++++++++++++++------------- mut/neovim/fnl/conf/settings.fnl | 2 ++ 2 files changed, 28 insertions(+), 13 deletions(-) (limited to 'mut') diff --git a/mut/neovim/fnl/conf/pkgs/cmp.fnl b/mut/neovim/fnl/conf/pkgs/cmp.fnl index 732a164..97c0655 100644 --- a/mut/neovim/fnl/conf/pkgs/cmp.fnl +++ b/mut/neovim/fnl/conf/pkgs/cmp.fnl @@ -64,15 +64,28 @@ :sources (cmp.config.sources [{:name :nvim_lsp} {:name :path} {:name :luasnip}])}) + ; todo sorting based on least recently used (cmp.setup.cmdline ":" {:completion {:completeopt "menu,menuone,noinsert"} + :matching {:disallow_fuzzy_matching false + :disallow_fullfuzzy_matching false + :disallow_partial_fuzzy_matching false + :disallow_partial_matching false + :disallow_prefix_unmatching false} + :mapping (cmp.mapping.preset.cmdline { + : (cmp.mapping + (fn [] + (cmp.confirm {:select true :behavior cmp.ConfirmBehavior.Replace}) + (vim.api.nvim_feedkeys " " :c false) + (vim.defer_fn cmp.complete 10)) + [:i :c]) : (cmp.mapping (fn [fallback] (local entry (cmp.get_selected_entry)) (if (or (= nil entry) (not (edit?))) - (fallback) + (vim.schedule fallback) (do (cmp.confirm {:select true :behavior cmp.ConfirmBehavior.Replace}) (if (entry.completion_item.label:match "%.*/$") @@ -81,17 +94,17 @@ (do (vim.schedule fallback)))))) [:i :c]) - : {:c (fn [fallback] - (if (not (edit?)) - (fallback) - (do - (local line (vim.fn.getcmdline)) - (local key (vim.api.nvim_replace_termcodes "" true false true)) - (if (= nil (line:match "%.*/$")) - (vim.api.nvim_feedkeys key :c false) - (do - (vim.api.nvim_feedkeys (.. key key) :c false))) - (vim.defer_fn #(cmp.complete) 10))))} + : {:c (fn [fallback] + (if (not (edit?)) + (fallback) + (do + (local line (vim.fn.getcmdline)) + (local key (vim.api.nvim_replace_termcodes "" true false true)) + (if (= nil (line:match "%.*/$")) + (vim.api.nvim_feedkeys key :c false) + (do + (vim.api.nvim_feedkeys (.. key key) :c false))) + (vim.defer_fn #(cmp.complete) 10))))} : {:c (fn [fallback] (fallback) (vim.defer_fn #(cmp.complete) 10))} @@ -99,7 +112,7 @@ (cmp.confirm {:select false}) (vim.defer_fn #(cmp.complete) 10))}}) :sources (cmp.config.sources - [{:name :path} {:name :cmdline}])} + [{:name :cmdline} {:name :path}])} diff --git a/mut/neovim/fnl/conf/settings.fnl b/mut/neovim/fnl/conf/settings.fnl index 99bbcc9..fc0ed3e 100644 --- a/mut/neovim/fnl/conf/settings.fnl +++ b/mut/neovim/fnl/conf/settings.fnl @@ -23,6 +23,8 @@ dirvish_mode ":sort | sort ,^.*[^/]$, r") (settings + grepprg "rg --vimgrep" + grepformat "%f:%l:%c:%m" +shortmess "c" +diffopt vertical +isfname "@-@" -- cgit v1.2.3