From e1bea340aa9162cd0d8b0afbf1b52e4b6087fb93 Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Sat, 10 Jun 2023 03:47:59 +0200 Subject: [PATCH] [nvim] Fix some fennel formatting --- nvim/.config/nvim/fnl/config/which-key.fnl | 84 +++++++++++----------- nvim/.config/nvim/fnl/plugins.fnl | 26 +++---- nvim/.config/nvim/fnl/plugins/fennel.fnl | 25 ++++--- nvim/.config/nvim/fnl/plugins/ui.fnl | 8 +-- 4 files changed, 71 insertions(+), 72 deletions(-) diff --git a/nvim/.config/nvim/fnl/config/which-key.fnl b/nvim/.config/nvim/fnl/config/which-key.fnl index bdfa389..d4b51da 100644 --- a/nvim/.config/nvim/fnl/config/which-key.fnl +++ b/nvim/.config/nvim/fnl/config/which-key.fnl @@ -6,79 +6,79 @@ :c { :name :+code - :d [ vim.lsp.buf.definition "Jump to definition" ] - :D [ vim.lsp.buf.references "Jump to references" ] - :f [ (fn [] (vim.lsp.buf.format { :async true })) "Format buffer" ] - :i [ vim.lsp.buf.implementation "Find implementations" ] - :k [ vim.lsp.buf.hover "Show help" ] + :d [ vim.lsp.buf.definition "Jump to definition"] + :D [ vim.lsp.buf.references "Jump to references"] + :f [ (fn [] (vim.lsp.buf.format { :async true })) "Format buffer"] + :i [ vim.lsp.buf.implementation "Find implementations"] + :k [ vim.lsp.buf.hover "Show help"] :l { :name :+lsp := { :name :+formatting - := [ (fn [] (vim.lsp.buf.format { :async true })) "Format buffer" ] - } + := [ (fn [] (vim.lsp.buf.format { :async true })) "Format buffer"]} + :a { :name "+code actions" - :a [ vim.lsp.buf.code_action "Code actions" ] - } + :a [ vim.lsp.buf.code_action "Code actions"]} + :d { :name :+diagnostics - :l [ vim.diagnostic.open_float "Show diagnostics window" ] - :n [ vim.diagnostic.goto_next "Go to next diagnostic" ] - :p [ vim.diagnostic.goto_prev "Go to previous diagnostic" ] - } + :l [ vim.diagnostic.open_float "Show diagnostics window"] + :n [ vim.diagnostic.goto_next "Go to next diagnostic"] + :p [ vim.diagnostic.goto_prev "Go to previous diagnostic"]} + :f { :name :+folders - :a [ vim.lsp.buf.add_workspace_folder "Add workspace folder" ] - :l [ vim.lsp.buf.list_workspace_folders "List workspace folders" ] - :r [ vim.lsp.buf.remove_workspace_folder "Remove workspace folder" ] - } + :a [ vim.lsp.buf.add_workspace_folder "Add workspace folder"] + :l [ vim.lsp.buf.list_workspace_folders "List workspace folders"] + :r [ vim.lsp.buf.remove_workspace_folder "Remove workspace folder"]} + :g { :name :+goto - :a [ vim.lsp.buf.workspace_symbol "Find symbol in workspace" ] - :c [ vim.lsp.buf.incoming_calls "Find incoming calls" ] - :C [ vim.lsp.buf.outgoing_calls "Find outgoing calls" ] - :d [ vim.lsp.buf.declaration "Find declarations" ] - :g [ vim.lsp.buf.definition "Find definitions" ] - :i [ vim.lsp.buf.implementation "Find implementations" ] - :r [ vim.lsp.buf.references "Find references" ] - :t [ vim.lsp.buf.type_definition "Find type definition" ] - } - :G { :name :+peek } + :a [ vim.lsp.buf.workspace_symbol "Find symbol in workspace"] + :c [ vim.lsp.buf.incoming_calls "Find incoming calls"] + :C [ vim.lsp.buf.outgoing_calls "Find outgoing calls"] + :d [ vim.lsp.buf.declaration "Find declarations"] + :g [ vim.lsp.buf.definition "Find definitions"] + :i [ vim.lsp.buf.implementation "Find implementations"] + :r [ vim.lsp.buf.references "Find references"] + :t [ vim.lsp.buf.type_definition "Find type definition"]} + + :G { :name :+peek} :h { :name :+help - :s [ vim.lsp.buf.signature_help "Show signature help" ] - } + :s [ vim.lsp.buf.signature_help "Show signature help"]} + :r { :name :+refactor - :r [ vim.lsp.buf.rename "Rename" ] - } + :r [ vim.lsp.buf.rename "Rename"]} + :t { :name :+toggle - :s [ vim.lsp.buf.signature_help "Show signature help" ] - } + :s [ vim.lsp.buf.signature_help "Show signature help"]}} + ;; :w { :name :+workspaces } - } - :r [ vim.lsp.buf.rename "Rename" ] - :t [ vim.lsp.buf.type_definition "Find type definition" ] - :x { :name :+Trouble } - } - :f { :name :+file } + + :r [ vim.lsp.buf.rename "Rename"] + :t [ vim.lsp.buf.type_definition "Find type definition"] + :x { :name :+Trouble}} + + :f { :name :+file} :g { :name :+git - :f { :name :+find } - :T { :name :+toggle } - } + :f { :name :+find} + :T { :name :+toggle}} + :h { :name :+help diff --git a/nvim/.config/nvim/fnl/plugins.fnl b/nvim/.config/nvim/fnl/plugins.fnl index 2534322..15a6402 100644 --- a/nvim/.config/nvim/fnl/plugins.fnl +++ b/nvim/.config/nvim/fnl/plugins.fnl @@ -1,33 +1,33 @@ [ ;; [ 'tpope/vim-commentary' ] ;; [ 'tpope/vim-endwise' ] - [ "tpope/vim-repeat" ] + [ "tpope/vim-repeat"] ;; [ "tpope/vim-surround" ] { 1 "numToStr/Comment.nvim" :dependencies "JoosepAlviste/nvim-ts-context-commentstring" :opts (fn [] - (let [integration (require :ts_context_commentstring.integrations.comment_nvim)] - { :pre_hook (integration.create_pre_hook) }))} + (let [integration (require :ts_context_commentstring.integrations.comment_nvim)] + { :pre_hook (integration.create_pre_hook)}))} { 1 "ggandor/leap.nvim" :dependencies "tpope/vim-repeat" :config (fn [] - (let [leap (require :leap)] - (leap.add_default_mappings) - (set leap.opts.highlight_unlabeled_phase_one_targets true)))} + (let [leap (require :leap)] + (leap.add_default_mappings) + (set leap.opts.highlight_unlabeled_phase_one_targets true)))} { 1 "ggandor/flit.nvim" :dependencies "ggandor/leap.nvim" - :opts { :multiline true }} + :opts { :multiline true}} { 1 "folke/which-key.nvim" :event :VeryLazy :init (fn [] - (set vim.o.timeout true) - (set vim.o.timeoutlen 500)) + (set vim.o.timeout true) + (set vim.o.timeoutlen 500)) :opts {} :config (fn [_ opts] - (let [wk (require :which-key)] - (wk.setup opts)) - (require :config.which-key))} -] + (let [wk (require :which-key)] + (wk.setup opts)) + (require :config.which-key))}] + diff --git a/nvim/.config/nvim/fnl/plugins/fennel.fnl b/nvim/.config/nvim/fnl/plugins/fennel.fnl index 65449fe..e4a1369 100644 --- a/nvim/.config/nvim/fnl/plugins/fennel.fnl +++ b/nvim/.config/nvim/fnl/plugins/fennel.fnl @@ -1,18 +1,17 @@ [ ;; [ :Olical/aniseed ] - { 1 :udayvir-singh/tangerine.nvim :version :v2.4 } - { 1 :udayvir-singh/hibiscus.nvim :version :v1.5 } + { 1 :udayvir-singh/tangerine.nvim :version :v2.4} + { 1 :udayvir-singh/hibiscus.nvim :version :v1.5} ;; [ :Olical/nvim-local-fennel ] { 1 :Olical/conjure :ft [ - :fennel - :clojure :clojurescript :clojurec - :racket - :janet - :hy - :scheme - :guile - ] - } - [ :PaterJason/cmp-conjure ] -] + :fennel + :clojure :clojurescript :clojurec + :racket + :janet + :hy + :scheme + :guile]} + + [ :PaterJason/cmp-conjure]] + diff --git a/nvim/.config/nvim/fnl/plugins/ui.fnl b/nvim/.config/nvim/fnl/plugins/ui.fnl index 2d3f91c..803405a 100644 --- a/nvim/.config/nvim/fnl/plugins/ui.fnl +++ b/nvim/.config/nvim/fnl/plugins/ui.fnl @@ -5,11 +5,11 @@ :dependencies :nvim-tree/nvim-web-devicons :event :VeryLazy :keys - { + [ { 1 "bP" 2 "BufferLineTogglePin" :desc "Toggle pin"} { 1 "bU" 2 "BufferLineGroupClose ungrouped" :desc "Delete unpinned buffers"} { 1 "bb" 2 "BufferLinePick" :desc "Pick buffer"} - { 1 "bD" 2 "BufferLinePickClose" :desc "Pick buffer to close"}} + { 1 "bD" 2 "BufferLinePickClose" :desc "Pick buffer to close"}] :opts (fn [] (let @@ -163,8 +163,8 @@ { 1 (fn [] ((. (require :nvim-navic) :get_location))) - :cond (fn [] (and package.loaded.nvim-navic ((. (require :nvim-navic) :is_available))))} - ] + :cond (fn [] (and package.loaded.nvim-navic ((. (require :nvim-navic) :is_available))))}] + :lualine_x -- 2.54.0