diff options
-rw-r--r-- | fnl/nvrc/events.fnl | 4 | ||||
-rw-r--r-- | fnl/nvrc/macro/pack.fnl | 2 | ||||
-rw-r--r-- | fnl/nvrc/packs/cmp.fnl | 2 | ||||
-rw-r--r-- | fnl/nvrc/packs/lspconfig.fnl | 2 | ||||
-rw-r--r-- | fnl/nvrc/packs/telescope.fnl | 49 |
5 files changed, 5 insertions, 54 deletions
diff --git a/fnl/nvrc/events.fnl b/fnl/nvrc/events.fnl index a798fcf..278e721 100644 --- a/fnl/nvrc/events.fnl +++ b/fnl/nvrc/events.fnl @@ -16,8 +16,8 @@ ; Restore the last cursor line (au! restore-last-cursor-line (ac! BufReadPost * #(if (and (> (line "'\"") 1) - (<= (line "'\"") (line "$"))) - (cmd! "normal! g'\"")))) + (<= (line "'\"") (line "$"))) + (cmd! "normal! g'\"")))) ; Resize splits on window resize (au! resize-splits-on-resize diff --git a/fnl/nvrc/macro/pack.fnl b/fnl/nvrc/macro/pack.fnl index 0adb18a..3364cd2 100644 --- a/fnl/nvrc/macro/pack.fnl +++ b/fnl/nvrc/macro/pack.fnl @@ -71,7 +71,7 @@ rocks (icollect [_ v (ipairs nvrc/rock)] `(use_rocks ,v))] `((. (require :packer) :startup) #(do - ,(unpack (icollect [_ v (ipairs packs) :into rocks] v)))))) + ,(unpack (icollect [_ v (ipairs packs) :into rocks] v)))))) {: pack : pack! diff --git a/fnl/nvrc/packs/cmp.fnl b/fnl/nvrc/packs/cmp.fnl index 0a6e3c1..0720148 100644 --- a/fnl/nvrc/packs/cmp.fnl +++ b/fnl/nvrc/packs/cmp.fnl @@ -49,7 +49,7 @@ :select true}) :Tab (fn [fallback] (if (cmp.visible) (cmp.select_next_item)"") - (fallback)) + (fallback)) :<S-Tab> (fn [fallback] (if (cmp.visible) (cmp.select_next_item)"") (fallback))} diff --git a/fnl/nvrc/packs/lspconfig.fnl b/fnl/nvrc/packs/lspconfig.fnl index 83a4146..08ef66a 100644 --- a/fnl/nvrc/packs/lspconfig.fnl +++ b/fnl/nvrc/packs/lspconfig.fnl @@ -30,7 +30,7 @@ "initialize a language server with defaults" (let [merged-opts (merge {: on_attach :capabilities default_capabilities} - (or ?opts {}))] + (or ?opts {}))] ((. lsp lsp-name :setup) merged-opts))) (tset vim.lsp.handlers :textDocument/publishDiagnostics diff --git a/fnl/nvrc/packs/telescope.fnl b/fnl/nvrc/packs/telescope.fnl deleted file mode 100644 index 9f9eb0f..0000000 --- a/fnl/nvrc/packs/telescope.fnl +++ /dev/null @@ -1,49 +0,0 @@ -(local telescope (require :telescope)) - -(telescope.setup {:defaults {:vimgrep_arguments {1 :rg - 2 :--color=never - 3 :--no-heading - 4 :--with-filename - 5 :--line-number - 6 :--column - 7 :--smart-case} - :prompt_prefix "Search: " - :selection_caret " " - :entry_prefix " " - :initial_mode :insert - :selection_strategy :reset - :sorting_strategy :ascending - :layout_strategy :horizontal - :layout_config {:horizontal {:prompt_position :top - :preview_width 0.55 - :results_width 0.8} - :vertical {:mirror false} - :width 0.87 - :height 0.8 - :preview_cutoff 120} - :file_sorter (. (require :telescope.sorters) - :get_fuzzy_file) - :file_ignore_patterns {1 :node_modules} - :generic_sorter (. (require :telescope.sorters) - :get_generic_fuzzy_sorter) - :path_display {1 :truncate} - :winblend 0 - :border {} - :borderchars {1 "─" - 2 "│" - 3 "─" - 4 "│" - 5 "╭" - 6 "╮" - 7 "╯" - 8 "╰"} - :use_less false - :set_env {:COLORTERM :truecolor} - :file_previewer (. (require :telescope.previewers) - :vim_buffer_cat.new) - :grep_previewer (. (require :telescope.previewers) - :vim_buffer_vimgrep.new) - :qflist_previewer (. (require :telescope.previewers) - :vim_buffer_qflist.new)}}) - -(telescope.load_extension :terms) |