diff options
Diffstat (limited to 'fnl')
-rw-r--r-- | fnl/config/alpha.fnl | 3 | ||||
-rw-r--r-- | fnl/config/autopairs.fnl | 3 | ||||
-rw-r--r-- | fnl/config/better-escape.fnl | 3 | ||||
-rw-r--r-- | fnl/config/bufferline.fnl | 3 | ||||
-rw-r--r-- | fnl/config/cmp.fnl | 9 | ||||
-rw-r--r-- | fnl/config/colorizer.fnl | 3 | ||||
-rw-r--r-- | fnl/config/colorscheme.fnl | 3 | ||||
-rw-r--r-- | fnl/config/gitsigns.fnl | 3 | ||||
-rw-r--r-- | fnl/config/hop.fnl | 4 | ||||
-rw-r--r-- | fnl/config/impatient.fnl | 3 | ||||
-rw-r--r-- | fnl/config/lsp/handlers.fnl | 4 | ||||
-rw-r--r-- | fnl/config/lsp/init.fnl | 3 | ||||
-rw-r--r-- | fnl/config/lsp/lsp-installer.fnl | 3 | ||||
-rw-r--r-- | fnl/config/lsp/null-ls.fnl | 3 | ||||
-rw-r--r-- | fnl/config/lsp/settings/jsonls.fnl | 3 | ||||
-rw-r--r-- | fnl/config/lualine.fnl | 3 | ||||
-rw-r--r-- | fnl/config/ncomment.fnl | 3 | ||||
-rw-r--r-- | fnl/config/nvim-tree.fnl | 4 | ||||
-rw-r--r-- | fnl/config/orgmode.fnl | 3 | ||||
-rw-r--r-- | fnl/config/packer.fnl | 3 | ||||
-rw-r--r-- | fnl/config/project.fnl | 3 | ||||
-rw-r--r-- | fnl/config/spectre.fnl | 3 | ||||
-rw-r--r-- | fnl/config/telescope.fnl | 3 | ||||
-rw-r--r-- | fnl/config/treesitter.fnl | 3 | ||||
-rw-r--r-- | fnl/config/trim.fnl | 3 | ||||
-rw-r--r-- | fnl/config/which-key.fnl | 11 |
26 files changed, 63 insertions, 32 deletions
diff --git a/fnl/config/alpha.fnl b/fnl/config/alpha.fnl index 7d9ba81..82124ff 100644 --- a/fnl/config/alpha.fnl +++ b/fnl/config/alpha.fnl @@ -1,5 +1,6 @@ ;; A customizable greeter. -(module config.alpha {autoload {util util}}) +(module config.alpha + {autoload {util util}}) (def- ascii-art [" ##############..... ############## " " ##############......############## " diff --git a/fnl/config/autopairs.fnl b/fnl/config/autopairs.fnl index a809fd7..6e6e164 100644 --- a/fnl/config/autopairs.fnl +++ b/fnl/config/autopairs.fnl @@ -1,5 +1,6 @@ ;; Autopairs for brackets and quote symbols. -(module config.autopairs {autoload {util util}}) +(module config.autopairs + {autoload {util util}}) (let [npairs (util.load-plugin :nvim-autopairs)] (npairs.setup diff --git a/fnl/config/better-escape.fnl b/fnl/config/better-escape.fnl index 5525ae7..360bfe2 100644 --- a/fnl/config/better-escape.fnl +++ b/fnl/config/better-escape.fnl @@ -1,5 +1,6 @@ ;; Better escape without nasty delay -(module config.better-escape {autoload {util util}}) +(module config.better-escape + {autoload {util util}}) (let [better-escape (util.load-plugin :better_escape)] (better-escape.setup diff --git a/fnl/config/bufferline.fnl b/fnl/config/bufferline.fnl index 74a0df0..3e2c86b 100644 --- a/fnl/config/bufferline.fnl +++ b/fnl/config/bufferline.fnl @@ -1,5 +1,6 @@ ;; Topbar that displays open buffers. -(module config.bufferline {autoload {util util}}) +(module config.bufferline + {autoload {util util}}) (def- options {:numbers :none diff --git a/fnl/config/cmp.fnl b/fnl/config/cmp.fnl index 26e7f66..93e08f0 100644 --- a/fnl/config/cmp.fnl +++ b/fnl/config/cmp.fnl @@ -1,5 +1,7 @@ ;; Configuration for completion plugin. -(module config.cmp {autoload {nvim aniseed.nvim util util}}) +(module config.cmp + {autoload {nvim aniseed.nvim + util util}}) (let [cmp (util.load-plugin :cmp) lspkind (util.load-plugin :lspkind) @@ -10,7 +12,8 @@ (cmp.setup { :snippet {:expand (fn [args] (luasnip.lsp_expand args.body))} - :mapping {:<C-k> (cmp.mapping.select_prev_item) + :mapping (cmp.mapping.preset.insert { + :<C-k> (cmp.mapping.select_prev_item) :<C-j> (cmp.mapping.select_next_item) :<C-b> (cmp.mapping (cmp.mapping.scroll_docs -1) [:i :c]) @@ -19,7 +22,7 @@ :<C-e> (cmp.mapping {:i (cmp.mapping.abort) :c (cmp.mapping.close)}) :<CR> (cmp.mapping.confirm {:select true}) - :<CR> (cmp.mapping.confirm {:select true})} + :<CR> (cmp.mapping.confirm {:select true})}) :sources [{:name :nvim_lsp} {:name :nvim_lua} {:name :luasnip} diff --git a/fnl/config/colorizer.fnl b/fnl/config/colorizer.fnl index 4d0b381..7118388 100644 --- a/fnl/config/colorizer.fnl +++ b/fnl/config/colorizer.fnl @@ -1,5 +1,6 @@ ;; Enables colorization of color codes in source files. -(module config.colorizer {autoload {util util}}) +(module config.colorizer + {autoload {util util}}) (let [colorizer (util.load-plugin :colorizer)] (colorizer.setup)) diff --git a/fnl/config/colorscheme.fnl b/fnl/config/colorscheme.fnl index 2cadc02..5bd19eb 100644 --- a/fnl/config/colorscheme.fnl +++ b/fnl/config/colorscheme.fnl @@ -1,5 +1,6 @@ ;; Load neovim colorscheme. -(module config.colorscheme {autoload {util util}}) +(module config.colorscheme + {autoload {util util}}) (local colorscheme :no-clown-fiesta) diff --git a/fnl/config/gitsigns.fnl b/fnl/config/gitsigns.fnl index b29c13a..adf8305 100644 --- a/fnl/config/gitsigns.fnl +++ b/fnl/config/gitsigns.fnl @@ -1,5 +1,6 @@ ;; Add git signs to source files. -(module config.gitsigns {autoload {util util}}) +(module config.gitsigns + {autoload {util util}}) (def- signs {:add diff --git a/fnl/config/hop.fnl b/fnl/config/hop.fnl index f623c0f..b4b60a2 100644 --- a/fnl/config/hop.fnl +++ b/fnl/config/hop.fnl @@ -1,5 +1,7 @@ ;; Hopping in text. -(module config.hop {autoload {util util nvim aniseed.nvim}}) +(module config.hop + {autoload {util util + nvim aniseed.nvim}}) (let [hop (util.load-plugin :hop)] (hop.setup {})) diff --git a/fnl/config/impatient.fnl b/fnl/config/impatient.fnl index ab37eb3..fda96a4 100644 --- a/fnl/config/impatient.fnl +++ b/fnl/config/impatient.fnl @@ -1,5 +1,6 @@ ;; Speeds up loading of plugins. -(module config.impatient {autoload {util util}}) +(module config.impatient + {autoload {util util}}) (let [impatient (util.load-plugin :impatient)] (impatient.enable_profile)) diff --git a/fnl/config/lsp/handlers.fnl b/fnl/config/lsp/handlers.fnl index a90db76..ab2f1e0 100644 --- a/fnl/config/lsp/handlers.fnl +++ b/fnl/config/lsp/handlers.fnl @@ -1,4 +1,6 @@ -(module config.lsp.handlers {autoload {util util nvim aniseed.nvim}}) +(module config.lsp.handlers + {autoload {util util + nvim aniseed.nvim}}) (def- signs [{:name :DiagnosticSignError :text ""} diff --git a/fnl/config/lsp/init.fnl b/fnl/config/lsp/init.fnl index 38c1873..dc95140 100644 --- a/fnl/config/lsp/init.fnl +++ b/fnl/config/lsp/init.fnl @@ -1,5 +1,6 @@ ;; Loads the LSP module. -(module config.lsp.init {autoload {util util}}) +(module config.lsp.init + {autoload {util util}}) (let [_ (util.load-plugin :lspconfig)] (require :config.lsp.lsp-installer) diff --git a/fnl/config/lsp/lsp-installer.fnl b/fnl/config/lsp/lsp-installer.fnl index 4e46cfd..5775187 100644 --- a/fnl/config/lsp/lsp-installer.fnl +++ b/fnl/config/lsp/lsp-installer.fnl @@ -1,5 +1,6 @@ ;; LSP installer. -(module config.lsp.lsp-installer {autoload {util util}}) +(module config.lsp.lsp-installer + {autoload {util util}}) (def handler-opts (let [handlers (require :config.lsp.handlers)] diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl index 8a95ba9..a7e49ec 100644 --- a/fnl/config/lsp/null-ls.fnl +++ b/fnl/config/lsp/null-ls.fnl @@ -1,5 +1,6 @@ ;; Adds LSP diagnostics and formatting. -(module config.lsp.null-ls {autoload {util util}}) +(module config.lsp.null-ls + {autoload {util util}}) (let [null-ls (util.load-plugin :null-ls)] (let [formatting null-ls.builtins.formatting diff --git a/fnl/config/lsp/settings/jsonls.fnl b/fnl/config/lsp/settings/jsonls.fnl index 18d9256..aa9f781 100644 --- a/fnl/config/lsp/settings/jsonls.fnl +++ b/fnl/config/lsp/settings/jsonls.fnl @@ -1,5 +1,6 @@ ;; Json schema store catalog language server. -(module config.lsp.settings.jsonls {autoload {util util}}) +(module config.lsp.settings.jsonls + {autoload {util util}}) (let [schemastore (util.load-plugin :schemastore)] {:init_options {:providerFormatter false} diff --git a/fnl/config/lualine.fnl b/fnl/config/lualine.fnl index 7ed3a61..1595594 100644 --- a/fnl/config/lualine.fnl +++ b/fnl/config/lualine.fnl @@ -1,5 +1,6 @@ ;; Statusbar. -(module config.lualine {autoload {util util}}) +(module config.lualine + {autoload {util util}}) (defn- hide-in-width [] (> (vim.fn.winwidth 0) 80)) diff --git a/fnl/config/ncomment.fnl b/fnl/config/ncomment.fnl index 06e9de1..e6a77d1 100644 --- a/fnl/config/ncomment.fnl +++ b/fnl/config/ncomment.fnl @@ -1,5 +1,6 @@ ;; Language aware commenting. -(module config.ncomment {autoload {util util}}) +(module config.ncomment + {autoload {util util}}) (defn- get-type [ctx U] (if (= ctx.ctype U.ctype.line) diff --git a/fnl/config/nvim-tree.fnl b/fnl/config/nvim-tree.fnl index a40d4d6..69095e0 100644 --- a/fnl/config/nvim-tree.fnl +++ b/fnl/config/nvim-tree.fnl @@ -1,5 +1,7 @@ ;; A file explorer. -(module config.nvim-tree {autoload {util util nvim aniseed.nvim}}) +(module config.nvim-tree + {autoload {util util + nvim aniseed.nvim}}) (set nvim.g.nvim_tree_show_icons { :git 1 :folders 1 :files 1 :folder_arrows 1 }) diff --git a/fnl/config/orgmode.fnl b/fnl/config/orgmode.fnl index 56a36f7..f428ad1 100644 --- a/fnl/config/orgmode.fnl +++ b/fnl/config/orgmode.fnl @@ -1,5 +1,6 @@ ;; Orgmode for nvim. -(module config.orgmode {autoload {util util}}) +(module config.orgmode + {autoload {util util}}) (let [orgmode (util.load-plugin :orgmode)] (orgmode.setup_ts_grammar) diff --git a/fnl/config/packer.fnl b/fnl/config/packer.fnl index 6441ab0..6796cb2 100644 --- a/fnl/config/packer.fnl +++ b/fnl/config/packer.fnl @@ -1,5 +1,6 @@ ;; Load packer config -(module config.packer {autoload {util util}}) +(module config.packer + {autoload {util util}}) (let [packer (util.load-plugin :packer) packer-util (require :packer.util)] (packer.init {:display {:open_fn (fn [] diff --git a/fnl/config/project.fnl b/fnl/config/project.fnl index 5f71e89..749604a 100644 --- a/fnl/config/project.fnl +++ b/fnl/config/project.fnl @@ -1,5 +1,6 @@ ;; Provides project management. -(module config.project {autoload {util util}}) +(module config.project + {autoload {util util}}) (let [project (util.load-plugin :project_nvim)] (project.setup diff --git a/fnl/config/spectre.fnl b/fnl/config/spectre.fnl index 4823e2c..804a36f 100644 --- a/fnl/config/spectre.fnl +++ b/fnl/config/spectre.fnl @@ -1,5 +1,6 @@ ;; Find and replace. -(module config.spectre {autoload {util util}}) +(module config.spectre + {autoload {util util}}) (let [spectre (util.load-plugin :spectre)] (spectre.setup diff --git a/fnl/config/telescope.fnl b/fnl/config/telescope.fnl index 725f0b6..0babcf8 100644 --- a/fnl/config/telescope.fnl +++ b/fnl/config/telescope.fnl @@ -1,5 +1,6 @@ ;; Telescope a highly extendable fuzzy finder over lists. -(module config.telescope {autoload {util util}}) +(module config.telescope + {autoload {util util}}) (let [telescope (util.load-plugin :telescope)] (let [actions (require :telescope.actions)] diff --git a/fnl/config/treesitter.fnl b/fnl/config/treesitter.fnl index e3ae299..ecd88f9 100644 --- a/fnl/config/treesitter.fnl +++ b/fnl/config/treesitter.fnl @@ -1,6 +1,7 @@ ;; Treesitter is a tool for building syntax trees for source files. ;; In the neovim context it helps with better coloring. -(module config.treesitter {autoload {util util}}) +(module config.treesitter + {autoload {util util}}) (let [treesitter (util.load-plugin :nvim-treesitter.configs)] (treesitter.setup diff --git a/fnl/config/trim.fnl b/fnl/config/trim.fnl index 05b62b6..b87d3ef 100644 --- a/fnl/config/trim.fnl +++ b/fnl/config/trim.fnl @@ -1,5 +1,6 @@ ;; Trim whitespaces on save. -(module config.trim {autoload {util util}}) +(module config.trim + {autoload {util util}}) (let [trim (util.load-plugin :trim)] (trim.setup {})) diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl index 4d6add4..7230308 100644 --- a/fnl/config/which-key.fnl +++ b/fnl/config/which-key.fnl @@ -1,7 +1,8 @@ ;; Which-key provides a pop-up meny for some key mappings. -(module config.which-key {autoload {util util}}) +(module config.which-key + {autoload {util util}}) -(def- setup +(def- setup {:plugins {:marks true :registers true :spelling {:enabled true :suggestions 20} @@ -29,7 +30,7 @@ :triggers :auto :triggers_blacklist {:i [:j :k] :v [:j :k]}}) -(def- opts +(def- opts {:mode :n :prefix :<leader> :buffer nil @@ -114,7 +115,7 @@ "Replace Buffer"]} :T {:name :Treesitter :p [:<cmd>TSPlaygroundToggle<cr> :Playground]}}) -(def- vopts +(def- vopts {:mode :v :prefix :<leader> :buffer nil @@ -122,7 +123,7 @@ :noremap true :nowait true}) -(def- vmappings +(def- vmappings {:k ["<ESC><CMD>lua require('Comment.api').toggle_linewise_op(vim.fn.visualmode())<CR>" :Comment]}) |