From 6dcd88cde5825573a3732e8b18f7d663ca47495b Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sat, 23 Sep 2023 22:04:59 +0200 Subject: Rename setup to config --- fnl/plugins/editor/alpha.fnl | 14 +++++++------- fnl/plugins/editor/cmp.fnl | 5 ++--- fnl/plugins/editor/leap.fnl | 5 ++--- fnl/plugins/editor/treesitter.fnl | 5 ++--- fnl/plugins/editor/which-key.fnl | 10 +++------- fnl/plugins/lsp/lspconfig.fnl | 8 +++----- fnl/plugins/lsp/null-ls.fnl | 5 ++--- 7 files changed, 21 insertions(+), 31 deletions(-) (limited to 'fnl') diff --git a/fnl/plugins/editor/alpha.fnl b/fnl/plugins/editor/alpha.fnl index c9dce50..c933a99 100644 --- a/fnl/plugins/editor/alpha.fnl +++ b/fnl/plugins/editor/alpha.fnl @@ -21,7 +21,7 @@ " ..... " " . "]) -(fn setup [] +(fn config [] (let [alpha (require :alpha)] (let [dashboard (require :alpha.themes.dashboard)] (set dashboard.section.header.val ascii-art) @@ -30,9 +30,12 @@ ":Telescope find_files theme=dropdown") (dashboard.button :g (.. (. icons :search-text) " Find text") ":Telescope live_grep theme=dropdown") - (dashboard.button :p (.. (. icons :search-project) " Find project") + (dashboard.button :p + (.. (. icons :search-project) " Find project") ":Telescope projects theme=dropdown") - (dashboard.button :r (.. (. icons :recent-files) " Recently used files") + (dashboard.button :r + (.. (. icons :recent-files) + " Recently used files") ":Telescope oldfiles theme=dropdown") (dashboard.button :t (.. (. icons :cog) " Configuration") ":e ~/.config/nvim/init.lua ") @@ -43,7 +46,4 @@ (set dashboard.opts.opts.noautocmd true) (alpha.setup dashboard.opts)))) -{1 :goolord/alpha-nvim - :event :VimEnter - :config (fn [] - (setup))} +{1 :goolord/alpha-nvim :event :VimEnter : config} diff --git a/fnl/plugins/editor/cmp.fnl b/fnl/plugins/editor/cmp.fnl index 8eba613..c0ad52a 100644 --- a/fnl/plugins/editor/cmp.fnl +++ b/fnl/plugins/editor/cmp.fnl @@ -1,6 +1,6 @@ ;; Configuration for completion plugin. -(fn setup [] +(fn config [] (let [cmp (require :cmp) lspkind (require :lspkind) luasnip (require :luasnip) @@ -64,5 +64,4 @@ :saadparwaiz1/cmp_luasnip :f3fora/cmp-spell] :event :InsertEnter - :config (fn [] - (setup))} + : config} diff --git a/fnl/plugins/editor/leap.fnl b/fnl/plugins/editor/leap.fnl index 6c2eb53..f6d820e 100644 --- a/fnl/plugins/editor/leap.fnl +++ b/fnl/plugins/editor/leap.fnl @@ -1,6 +1,6 @@ ;; Leap through text. -(fn setup [] +(fn config [] (let [leap (require :leap)] (leap.setup {}) (leap.set_default_keymaps))) @@ -13,5 +13,4 @@ :multiline true :opts {}}} :event :BufReadPost - :config (fn [] - (setup))} + : config} diff --git a/fnl/plugins/editor/treesitter.fnl b/fnl/plugins/editor/treesitter.fnl index b88b4bf..b0d9c60 100644 --- a/fnl/plugins/editor/treesitter.fnl +++ b/fnl/plugins/editor/treesitter.fnl @@ -75,7 +75,7 @@ :goto_next {"]i" "@conditional.outer"} :goto_previous {"[i" "@conditional.outer"}}}}) -(fn setup [] +(fn config [] (let [treesitter (require :nvim-treesitter.configs)] (treesitter.setup opts))) @@ -83,5 +83,4 @@ :dependencies [{1 :nvim-treesitter/nvim-treesitter-textobjects}] :build ":TSUpdate" :event :VeryLazy - :config (fn [] - (setup))} + : config} diff --git a/fnl/plugins/editor/which-key.fnl b/fnl/plugins/editor/which-key.fnl index 84197d7..962183e 100644 --- a/fnl/plugins/editor/which-key.fnl +++ b/fnl/plugins/editor/which-key.fnl @@ -37,15 +37,11 @@ :o {:name :+orgmode} :r {:name :+replace} :s {:name :+session} - :w {:name :+worktree} - }) + :w {:name :+worktree}}) -(fn setup [] +(fn config [] (let [which-key (require :which-key)] (which-key.setup opts) (which-key.register groups))) -{1 :folke/which-key.nvim - :event :VeryLazy - :config (fn [] - (setup))} +{1 :folke/which-key.nvim :event :VeryLazy : config} diff --git a/fnl/plugins/lsp/lspconfig.fnl b/fnl/plugins/lsp/lspconfig.fnl index 0b6ad79..cca52a4 100644 --- a/fnl/plugins/lsp/lspconfig.fnl +++ b/fnl/plugins/lsp/lspconfig.fnl @@ -4,8 +4,7 @@ (vim.api.nvim_create_autocmd :LspAttach {:callback (fn [args] (let [keymaps (require :plugins.lsp.keymaps) - buffer (. args :buf) - ] + buffer (. args :buf)] (keymaps.on-attach buffer)))})) (fn capabilities [] @@ -15,7 +14,7 @@ (fn mason-opts [servers] {:ensure_installed (vim.tbl_keys servers) :automatic_installation true}) -(fn setup [] +(fn config [] (let [diagnostics (require :plugins.lsp.diagnostics) lspconfig (require :lspconfig) lspconfig-win (require :lspconfig.ui.windows) @@ -40,5 +39,4 @@ :williamboman/mason-lspconfig.nvim :b0o/SchemaStore.nvim :hrsh7th/cmp-nvim-lsp] - :config (fn [] - (setup))} + : config} diff --git a/fnl/plugins/lsp/null-ls.fnl b/fnl/plugins/lsp/null-ls.fnl index c8e9039..5ef69d1 100644 --- a/fnl/plugins/lsp/null-ls.fnl +++ b/fnl/plugins/lsp/null-ls.fnl @@ -4,7 +4,7 @@ :automatic_installation true :automatic_setup false}) -(fn setup [] +(fn config [] (let [null-ls (require :null-ls) mason-null-ls (require :mason-null-ls)] (let [formatting null-ls.builtins.formatting @@ -40,5 +40,4 @@ :jayp0521/mason-null-ls.nvim :nvim-lua/plenary.nvim] :event :BufReadPost - :config (fn [] - (setup))} + : config} -- cgit v1.2.3-70-g09d2