From 6cb31718df762c6ebf764986074f08b19d6f82f8 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 01:40:16 +0200 Subject: Refactor loading of plugins with packer --- fnl/plugins.fnl | 269 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 204 insertions(+), 65 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 09fc301..897d24e 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -1,67 +1,206 @@ ;; List of plugins. +(module plugins) -{ - :goolord/alpha-nvim {} - :Olical/aniseed {} - :rmagatti/auto-session {} - :max397574/better-escape.nvim {} - :hrsh7th/cmp-buffer {} - :hrsh7th/cmp-cmdline {} - :hrsh7th/cmp-nvim-lsp {} - :hrsh7th/cmp-path {} - :saadparwaiz1/cmp_luasnip {} - :f3fora/cmp-spell {} - :numToStr/Comment.nvim {} - :sindrets/diffview.nvim {} - :j-hui/fidget.nvim {} - :ggandor/flit.nvim {} - :rafamadriz/friendly-snippets {} - :lewis6991/gitsigns.nvim {} - :ThePrimeagen/harpoon {} - :lewis6991/impatient.nvim {} - :ggandor/leap.nvim {} - :tamago324/lir.nvim {} - :onsails/lspkind-nvim {} - :nvim-lualine/lualine.nvim {:requires {1 :kyazdani42/nvim-web-devicons :opt true}} - :L3MON4D3/LuaSnip {} - :williamboman/mason-lspconfig.nvim {} - :jayp0521/mason-null-ls.nvim {} - :williamboman/mason.nvim {} - :aktersnurra/minibar.nvim {} - :TimUntersberger/neogit {:requires :nvim-lua/plenary.nvim} - :tamago324/nlsp-settings.nvim {} - :aktersnurra/no-clown-fiesta.nvim {} - :jose-elias-alvarez/null-ls.nvim {} - :windwp/nvim-autopairs {} - :kevinhwang91/nvim-bqf {} - :hrsh7th/nvim-cmp {} - :norcalli/nvim-colorizer.lua {} - :neovim/nvim-lspconfig {} - :windwp/nvim-spectre {} - :kylechui/nvim-surround {} - :nvim-treesitter/nvim-treesitter {:run ":TSUpdate"} - :JoosepAlviste/nvim-ts-context-commentstring {} - :kyazdani42/nvim-web-devicons {} - :s1n7ax/nvim-window-picker {} - :nvim-orgmode/orgmode {} - :wbthomason/packer.nvim {} - :nvim-treesitter/playground {} - :nvim-lua/plenary.nvim {} - :nvim-lua/popup.nvim {} - :ahmedkhalf/project.nvim {} - :b0o/SchemaStore.nvim {} - :rmagatti/session-lens {} - :luukvbaal/stabilize.nvim {} - :gbprod/stay-in-place.nvim {} - :nvim-telescope/telescope-file-browser.nvim {} - :nvim-telescope/telescope-fzf-native.nvim {:run :make} - :nvim-telescope/telescope.nvim {:requires :nvim-lua/plenary.nvim} - :akinsho/toggleterm.nvim {} - :cappyzawa/trim.nvim {} - :folke/trouble.nvim {} - :moll/vim-bbye {} - :junegunn/vim-slash {} - :dstein64/vim-startuptime {} - :folke/which-key.nvim {} - :folke/zen-mode.nvim {} -} +(def core [{1 :Olical/aniseed} + {1 :lewis6991/impatient.nvim} + {1 :wbthomason/packer.nvim}]) + +(def completions {1 :hrsh7th/nvim-cmp + :requires [{1 :hrsh7th/cmp-buffer} + {1 :onsails/lspkind-nvim} + {1 :hrsh7th/cmp-nvim-lsp} + {1 :hrsh7th/cmp-cmdline} + {1 :L3MON4D3/LuaSnip} + {1 :hrsh7th/cmp-path} + {1 :saadparwaiz1/cmp_luasnip} + {1 :f3fora/cmp-spell}] + :event :InsertEnter + :want :Luasnip + :config (fn [] + (require :config.cmp))}) + +(def git [{1 :sindrets/diffview.nvim + :config (fn [] + (require :config.diffview)) + :event :BufRead} + {1 :TimUntersberger/neogit + :config (fn [] + (require :config.neogit)) + :event :BufRead + :requires [:nvim-lua/plenary.nvim]} + {1 :lewis6991/gitsigns.nvim + :config (fn [] + (require :config.gitsigns)) + :event :BufRead}]) + +(def search [{1 :nvim-telescope/telescope-file-browser.nvim} + {1 :nvim-telescope/telescope-fzf-native.nvim :run :make} + {1 :nvim-telescope/telescope.nvim + :config (fn [] + (require :config.telescope)) + :requires [:nvim-lua/popup.nvim + :nvim-lua/plenary + :telescope-fzf-native.nvim + :telescope-file-browser.nvim] + :wants [:popup.nvim + :plenary.nvim + :telescope-fzf-native.nvim + :telescope-file-browser.nvim]} + {1 :ggandor/leap.nvim + :config (fn [] + (require :config.leap)) + :event :BufRead} + {1 :ggandor/flit.nvim + :config (fn [] + (require :config.flit)) + :after :leap.nvim + :event :BufRead} + {1 :ahmedkhalf/project.nvim + :config (fn [] + (require :config.project))} + {1 :tamago324/lir.nvim + :config (fn [] + (require :config.lir)) + :requires [:kyazdani42/nvim-web-devicons]} + {1 :ThePrimeagen/harpoon + :config (fn [] + (require :config.harpoon))}]) + +(def snippets [:rafamadriz/friendly-snippets]) + +(def lsp [{1 :j-hui/fidget.nvim + :event :BufWinEnter + :config (fn [] + (require :config.fidget))} + {1 :jose-elias-alvarez/null-ls.nvim} + {1 :neovim/nvim-lspconfig} + {1 :williamboman/mason.nvim + :event :BufWinEnter + :config (fn [] + (require :config.lsp.mason))} + {1 :tamago324/nlsp-settings.nvim} + {1 :jayp0521/mason-null-ls.nvim + :event :BufWinEnter + :config (fn [] + (require :config.lsp.null-ls) + (require :config.lsp.mason-null-ls)) + :requires [:jose-elias-alvarez/null-ls.nvim + :williamboman/mason.nvim] + :after :mason.nvim} + {1 :b0o/SchemaStore.nvim} + {1 :williamboman/mason-lspconfig.nvim + :event :BufWinEnter + :config (fn [] + (require :config.lsp.mason-lspconfig) + (let [handlers (require :config.lsp.handlers)] + (handlers.setup))) + :requires [:neovim/nvim-lspconfig :williamboman/mason.nvim] + :after :mason.nvim} + {1 :folke/trouble.nvim + :config (fn [] + (require :config.trouble)) + :event :BufWinEnter}]) + +(def color [{1 :aktersnurra/no-clown-fiesta.nvim + :config (fn [] + (require :config.colorscheme))} + {1 :norcalli/nvim-colorizer.lua + :config (fn [] + (require :config.colorizer)) + :event :BufRead} + {1 :nvim-treesitter/nvim-treesitter + :config (fn [] + (require :config.treesitter)) + :run ":TSUpdate"}]) + +(def ui [{1 :nvim-lualine/lualine.nvim + :event :BufWinEnter + :config (fn [] + (require :config.lualine)) + :requires [:kyazdani42/nvim-web-devicons]} + {1 :aktersnurra/minibar.nvim + :config (fn [] + (require :config.minibar)) + :event :BufRead} + {1 :folke/zen-mode.nvim + :config (fn [] + (require :config.zen)) + :event :BufWinEnter} + {1 :kevinhwang91/nvim-bqf + :config (fn [] + (require :config.bqf)) + :event :BufRead} + {1 :s1n7ax/nvim-window-picker + :config (fn [] + (require :config.window-picker)) + :event :BufWinEnter} + {1 :luukvbaal/stabilize.nvim + :config (fn [] + (require :config.stabilize)) + :event :BufWinEnter} + {1 :moll/vim-bbye :event :BufWinEnter} + {1 :folke/which-key.nvim + :config (fn [] + (require :config.which-key)) + :event :BufWinEnter}]) + +(def session {1 :rmagatti/auto-session + :config (fn [] + (require :config.auto-session)) + :requires [:rmagatti/session-lens]}) + +(def text [{1 :numToStr/Comment.nvim + :config (fn [] + (require :config.comment)) + :event :BufWinEnter} + {1 :JoosepAlviste/nvim-ts-context-commentstring :event :BufReadPost} + {1 :kylechui/nvim-surround + :config (fn [] + (require :config.surround)) + :event :BufRead} + {1 :gbprod/stay-in-place.nvim + :event :BufWinEnter + :config (fn [] + (require :config.stay-in-place))} + {1 :junegunn/vim-slash + :config (fn [] + (require :config.vim-slash)) + :event :BufWinEnter} + {1 :cappyzawa/trim.nvim + :config (fn [] + (require :config.trim)) + :event :BufWinEnter} + {1 :max397574/better-escape.nvim + :event :BufWinEnter + :config (fn [] + (require :config.better-escape))} + {1 :windwp/nvim-autopairs + :config (fn [] + (require :config.autopairs)) + :event :BufWinEnter} + {1 :windwp/nvim-spectre + :config (fn [] + (require :config.spectre)) + :event :BufWinEnter}]) + +(def misc [{1 :nvim-orgmode/orgmode + :config (fn [] + (require :config.window-picker)) + :event :BufWinEnter} + {1 :akinsho/toggleterm.nvim + :config (fn [] + (require :config.toggleterm)) + :event :BufWinEnter} + {1 :dstein64/vim-startuptime}]) + +(def all {: core + : completions + : git + : search + : snippets + : lsp + : color + : ui + : session + : text + : misc}) -- cgit v1.2.3-70-g09d2 From bcfd80e6b7d89022497ebdde80321920978d5811 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 01:47:53 +0200 Subject: Sort --- fnl/plugins.fnl | 188 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 94 insertions(+), 94 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 897d24e..1c05b5a 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -1,9 +1,17 @@ ;; List of plugins. (module plugins) -(def core [{1 :Olical/aniseed} - {1 :lewis6991/impatient.nvim} - {1 :wbthomason/packer.nvim}]) +(def color [{1 :aktersnurra/no-clown-fiesta.nvim + :config (fn [] + (require :config.colorscheme))} + {1 :norcalli/nvim-colorizer.lua + :config (fn [] + (require :config.colorizer)) + :event :BufRead} + {1 :nvim-treesitter/nvim-treesitter + :config (fn [] + (require :config.treesitter)) + :run ":TSUpdate"}]) (def completions {1 :hrsh7th/nvim-cmp :requires [{1 :hrsh7th/cmp-buffer} @@ -19,6 +27,10 @@ :config (fn [] (require :config.cmp))}) +(def core [{1 :Olical/aniseed} + {1 :lewis6991/impatient.nvim} + {1 :wbthomason/packer.nvim}]) + (def git [{1 :sindrets/diffview.nvim :config (fn [] (require :config.diffview)) @@ -33,41 +45,6 @@ (require :config.gitsigns)) :event :BufRead}]) -(def search [{1 :nvim-telescope/telescope-file-browser.nvim} - {1 :nvim-telescope/telescope-fzf-native.nvim :run :make} - {1 :nvim-telescope/telescope.nvim - :config (fn [] - (require :config.telescope)) - :requires [:nvim-lua/popup.nvim - :nvim-lua/plenary - :telescope-fzf-native.nvim - :telescope-file-browser.nvim] - :wants [:popup.nvim - :plenary.nvim - :telescope-fzf-native.nvim - :telescope-file-browser.nvim]} - {1 :ggandor/leap.nvim - :config (fn [] - (require :config.leap)) - :event :BufRead} - {1 :ggandor/flit.nvim - :config (fn [] - (require :config.flit)) - :after :leap.nvim - :event :BufRead} - {1 :ahmedkhalf/project.nvim - :config (fn [] - (require :config.project))} - {1 :tamago324/lir.nvim - :config (fn [] - (require :config.lir)) - :requires [:kyazdani42/nvim-web-devicons]} - {1 :ThePrimeagen/harpoon - :config (fn [] - (require :config.harpoon))}]) - -(def snippets [:rafamadriz/friendly-snippets]) - (def lsp [{1 :j-hui/fidget.nvim :event :BufWinEnter :config (fn [] @@ -101,54 +78,56 @@ (require :config.trouble)) :event :BufWinEnter}]) -(def color [{1 :aktersnurra/no-clown-fiesta.nvim - :config (fn [] - (require :config.colorscheme))} - {1 :norcalli/nvim-colorizer.lua - :config (fn [] - (require :config.colorizer)) - :event :BufRead} - {1 :nvim-treesitter/nvim-treesitter - :config (fn [] - (require :config.treesitter)) - :run ":TSUpdate"}]) +(def misc [{1 :nvim-orgmode/orgmode + :config (fn [] + (require :config.window-picker)) + :event :BufWinEnter} + {1 :akinsho/toggleterm.nvim + :config (fn [] + (require :config.toggleterm)) + :event :BufWinEnter} + {1 :dstein64/vim-startuptime}]) -(def ui [{1 :nvim-lualine/lualine.nvim - :event :BufWinEnter - :config (fn [] - (require :config.lualine)) - :requires [:kyazdani42/nvim-web-devicons]} - {1 :aktersnurra/minibar.nvim - :config (fn [] - (require :config.minibar)) - :event :BufRead} - {1 :folke/zen-mode.nvim - :config (fn [] - (require :config.zen)) - :event :BufWinEnter} - {1 :kevinhwang91/nvim-bqf - :config (fn [] - (require :config.bqf)) - :event :BufRead} - {1 :s1n7ax/nvim-window-picker - :config (fn [] - (require :config.window-picker)) - :event :BufWinEnter} - {1 :luukvbaal/stabilize.nvim - :config (fn [] - (require :config.stabilize)) - :event :BufWinEnter} - {1 :moll/vim-bbye :event :BufWinEnter} - {1 :folke/which-key.nvim - :config (fn [] - (require :config.which-key)) - :event :BufWinEnter}]) +(def search [{1 :nvim-telescope/telescope-file-browser.nvim} + {1 :nvim-telescope/telescope-fzf-native.nvim :run :make} + {1 :nvim-telescope/telescope.nvim + :config (fn [] + (require :config.telescope)) + :requires [:nvim-lua/popup.nvim + :nvim-lua/plenary + :telescope-fzf-native.nvim + :telescope-file-browser.nvim] + :wants [:popup.nvim + :plenary.nvim + :telescope-fzf-native.nvim + :telescope-file-browser.nvim]} + {1 :ggandor/leap.nvim + :config (fn [] + (require :config.leap)) + :event :BufRead} + {1 :ggandor/flit.nvim + :config (fn [] + (require :config.flit)) + :after :leap.nvim + :event :BufRead} + {1 :ahmedkhalf/project.nvim + :config (fn [] + (require :config.project))} + {1 :tamago324/lir.nvim + :config (fn [] + (require :config.lir)) + :requires [:kyazdani42/nvim-web-devicons]} + {1 :ThePrimeagen/harpoon + :config (fn [] + (require :config.harpoon))}]) (def session {1 :rmagatti/auto-session :config (fn [] (require :config.auto-session)) :requires [:rmagatti/session-lens]}) +(def snippets [:rafamadriz/friendly-snippets]) + (def text [{1 :numToStr/Comment.nvim :config (fn [] (require :config.comment)) @@ -183,24 +162,45 @@ (require :config.spectre)) :event :BufWinEnter}]) -(def misc [{1 :nvim-orgmode/orgmode - :config (fn [] - (require :config.window-picker)) - :event :BufWinEnter} - {1 :akinsho/toggleterm.nvim - :config (fn [] - (require :config.toggleterm)) - :event :BufWinEnter} - {1 :dstein64/vim-startuptime}]) +(def ui [{1 :nvim-lualine/lualine.nvim + :event :BufWinEnter + :config (fn [] + (require :config.lualine)) + :requires [:kyazdani42/nvim-web-devicons]} + {1 :aktersnurra/minibar.nvim + :config (fn [] + (require :config.minibar)) + :event :BufRead} + {1 :folke/zen-mode.nvim + :config (fn [] + (require :config.zen)) + :event :BufWinEnter} + {1 :kevinhwang91/nvim-bqf + :config (fn [] + (require :config.bqf)) + :event :BufRead} + {1 :s1n7ax/nvim-window-picker + :config (fn [] + (require :config.window-picker)) + :event :BufWinEnter} + {1 :luukvbaal/stabilize.nvim + :config (fn [] + (require :config.stabilize)) + :event :BufWinEnter} + {1 :moll/vim-bbye :event :BufWinEnter} + {1 :folke/which-key.nvim + :config (fn [] + (require :config.which-key)) + :event :BufWinEnter}]) -(def all {: core +(def all {: color : completions + : core : git - : search - : snippets : lsp - : color - : ui + : misc + : search : session + : snippets : text - : misc}) + : ui}) -- cgit v1.2.3-70-g09d2 From b59f9a12f4799849802c17cf517cd6c76cf57122 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 02:32:33 +0200 Subject: Fix orgmode --- fnl/config/cmp.fnl | 1 + fnl/config/which-key.fnl | 4 ++-- fnl/plugins.fnl | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/config/cmp.fnl b/fnl/config/cmp.fnl index 73ebba4..24115d7 100644 --- a/fnl/config/cmp.fnl +++ b/fnl/config/cmp.fnl @@ -26,6 +26,7 @@ {:name :nvim_lua} {:name :luasnip} {:name :spell} + {:name :orgmode} {:name :buffer :keyword_length 4} {:name :path :keyword_length 6}] :formatting {:format (lspkind.cmp_format {:with_text true diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl index 2fa2d5b..fdd76b5 100644 --- a/fnl/config/which-key.fnl +++ b/fnl/config/which-key.fnl @@ -117,9 +117,9 @@ "Workspace Symbols"]}) (def- org {:name :Orgmode - :a ["lua require('orgmode').action('agenda.prompt')" + :a ["lua require('orgmode').action('agenda.prompt')" "Open agenda prompt"] - :c ["lua require('orgmode').action('capture.prompt')" + :c ["lua require('orgmode').action('capture.prompt')" "Open capture prompt"]}) (def- packer {:name :Packer diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 1c05b5a..6527ed9 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -80,7 +80,8 @@ (def misc [{1 :nvim-orgmode/orgmode :config (fn [] - (require :config.window-picker)) + (require :config.orgmode)) + :requires :nvim-treesitter/nvim-treesitter :event :BufWinEnter} {1 :akinsho/toggleterm.nvim :config (fn [] -- cgit v1.2.3-70-g09d2 From 336c4378f801bddd54440f3b8165a0f636702ef8 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 02:58:07 +0200 Subject: Add frecency, fix plenary --- fnl/config/telescope.fnl | 1 + fnl/plugins.fnl | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/config/telescope.fnl b/fnl/config/telescope.fnl index 8f0459f..c46b0fb 100644 --- a/fnl/config/telescope.fnl +++ b/fnl/config/telescope.fnl @@ -79,4 +79,5 @@ (telescope.load_extension :file_browser) (telescope.load_extension :session-lens) (telescope.load_extension :harpoon) + (telescope.load_extension :frecency) (telescope.load_extension :projects))) diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 6527ed9..e7ab83a 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -91,17 +91,21 @@ (def search [{1 :nvim-telescope/telescope-file-browser.nvim} {1 :nvim-telescope/telescope-fzf-native.nvim :run :make} + {1 :nvim-telescope/telescope-frecency.nvim + :requires :tami5/sqlite.lua} {1 :nvim-telescope/telescope.nvim :config (fn [] (require :config.telescope)) :requires [:nvim-lua/popup.nvim - :nvim-lua/plenary + :nvim-lua/plenary.nvim :telescope-fzf-native.nvim - :telescope-file-browser.nvim] + :telescope-file-browser.nvim + :telescope-frecency.nvim] :wants [:popup.nvim :plenary.nvim :telescope-fzf-native.nvim - :telescope-file-browser.nvim]} + :telescope-file-browser.nvim + :telescope-frecency.nvim]} {1 :ggandor/leap.nvim :config (fn [] (require :config.leap)) -- cgit v1.2.3-70-g09d2 From 97335fff57e4cca08bf642d65791c5c18ce8b485 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 11:49:15 +0200 Subject: Remove telescope file browser --- fnl/config/telescope.fnl | 1 - fnl/plugins.fnl | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/config/telescope.fnl b/fnl/config/telescope.fnl index c46b0fb..5c79501 100644 --- a/fnl/config/telescope.fnl +++ b/fnl/config/telescope.fnl @@ -76,7 +76,6 @@ :override_file_sorter true :case_mode :smart_case}}}) (telescope.load_extension :fzf) - (telescope.load_extension :file_browser) (telescope.load_extension :session-lens) (telescope.load_extension :harpoon) (telescope.load_extension :frecency) diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index e7ab83a..2b7fe15 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -89,8 +89,7 @@ :event :BufWinEnter} {1 :dstein64/vim-startuptime}]) -(def search [{1 :nvim-telescope/telescope-file-browser.nvim} - {1 :nvim-telescope/telescope-fzf-native.nvim :run :make} +(def search [{1 :nvim-telescope/telescope-fzf-native.nvim :run :make} {1 :nvim-telescope/telescope-frecency.nvim :requires :tami5/sqlite.lua} {1 :nvim-telescope/telescope.nvim @@ -98,14 +97,8 @@ (require :config.telescope)) :requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim - :telescope-fzf-native.nvim - :telescope-file-browser.nvim - :telescope-frecency.nvim] - :wants [:popup.nvim - :plenary.nvim - :telescope-fzf-native.nvim - :telescope-file-browser.nvim - :telescope-frecency.nvim]} + :nvim-telescope/telescope-fzf-native.nvim + :nvim-telescope/telescope-frecency.nvim]} {1 :ggandor/leap.nvim :config (fn [] (require :config.leap)) -- cgit v1.2.3-70-g09d2 From 3f1367c3a460f89cafc80f134fbf420543ffb5e6 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 11:49:45 +0200 Subject: Remove colon for util autoload --- fnl/config/auto-session.fnl | 2 +- fnl/config/autocmd.fnl | 9 ++++++++- fnl/config/autopairs.fnl | 2 +- fnl/config/better-escape.fnl | 2 +- fnl/config/bqf.fnl | 2 +- fnl/config/cmp.fnl | 2 +- fnl/config/colorizer.fnl | 2 +- fnl/config/colorscheme.fnl | 2 +- fnl/config/comment.fnl | 2 +- fnl/config/diffview.fnl | 2 +- fnl/config/fidget.fnl | 2 +- fnl/config/flit.fnl | 2 +- fnl/config/gitsigns.fnl | 2 +- fnl/config/harpoon.fnl | 2 +- fnl/config/leap.fnl | 2 +- fnl/config/lir.fnl | 2 +- fnl/config/lsp/handlers.fnl | 2 +- fnl/config/lsp/mason-lspconfig.fnl | 2 +- fnl/config/lsp/mason-null-ls.fnl | 2 +- fnl/config/lsp/mason.fnl | 2 +- fnl/config/lsp/null-ls.fnl | 2 +- fnl/config/lsp/settings/jsonls.fnl | 2 +- fnl/config/lualine.fnl | 2 +- fnl/config/minibar.fnl | 2 +- fnl/config/neogit.fnl | 2 +- fnl/config/orgmode.fnl | 2 +- fnl/config/packer.fnl | 2 +- fnl/config/project.fnl | 2 +- fnl/config/spectre.fnl | 2 +- fnl/config/stabilize.fnl | 2 +- fnl/config/stay-in-place.fnl | 2 +- fnl/config/surround.fnl | 2 +- fnl/config/telescope.fnl | 2 +- fnl/config/toggleterm.fnl | 2 +- fnl/config/treesitter.fnl | 2 +- fnl/config/trim.fnl | 2 +- fnl/config/trouble.fnl | 2 +- fnl/config/which-key.fnl | 2 +- fnl/config/window-picker.fnl | 2 +- fnl/config/zen.fnl | 2 +- fnl/plugins.fnl | 2 -- 41 files changed, 47 insertions(+), 42 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/config/auto-session.fnl b/fnl/config/auto-session.fnl index 35a43a9..0ac88ce 100644 --- a/fnl/config/auto-session.fnl +++ b/fnl/config/auto-session.fnl @@ -1,5 +1,5 @@ ;; Session manager. -(module config.auto-session {autoload {:util :config.util}}) +(module config.auto-session {autoload {util config.util}}) (def- auto-opts {:log_level :info :auto_session_enable_last_session false diff --git a/fnl/config/autocmd.fnl b/fnl/config/autocmd.fnl index 24adcad..4194e66 100644 --- a/fnl/config/autocmd.fnl +++ b/fnl/config/autocmd.fnl @@ -2,7 +2,8 @@ (module config.autocmd {autoload {nvim aniseed.nvim env aniseed.env a aniseed.core - :util :config.util}}) + : packer + util config.util}}) (defn create-autocmd [event opts] (nvim.create_autocmd event opts)) @@ -36,3 +37,9 @@ {:pattern :*.fnl :callback (lambda [] (env.init nvim.g.aniseed#env))}) + +(create-autocmd :BufWritePost + {:pattern :plugins.fnl + :callback (lambda [] + (env.init nvim.g.aniseed#env) + (packer.sync))}) diff --git a/fnl/config/autopairs.fnl b/fnl/config/autopairs.fnl index 6918c40..d7865b5 100644 --- a/fnl/config/autopairs.fnl +++ b/fnl/config/autopairs.fnl @@ -1,5 +1,5 @@ ;; Autopairs for brackets and quote symbols. -(module config.autopairs {autoload {:util :config.util}}) +(module config.autopairs {autoload {util config.util}}) (def- opts {:check_ts true :ts_config {:lua [:string :source] diff --git a/fnl/config/better-escape.fnl b/fnl/config/better-escape.fnl index 3e68ddd..659d22f 100644 --- a/fnl/config/better-escape.fnl +++ b/fnl/config/better-escape.fnl @@ -1,5 +1,5 @@ ;; Better escape without nasty delay. -(module config.better-escape {autoload {:util :config.util}}) +(module config.better-escape {autoload {util config.util}}) (def- opts {:mapping [:kk :jj] :timeout vim.o.timeoutlen diff --git a/fnl/config/bqf.fnl b/fnl/config/bqf.fnl index 4c877a1..59a1aad 100644 --- a/fnl/config/bqf.fnl +++ b/fnl/config/bqf.fnl @@ -1,4 +1,4 @@ ;; Make Neovim's quickfix window better. -(module config.bqf {autoload {:util :config.util}}) +(module config.bqf {autoload {util config.util}}) (util.setup :bqf {}) diff --git a/fnl/config/cmp.fnl b/fnl/config/cmp.fnl index 24115d7..78e6304 100644 --- a/fnl/config/cmp.fnl +++ b/fnl/config/cmp.fnl @@ -1,5 +1,5 @@ ;; Configuration for completion plugin. -(module config.cmp {autoload {nvim aniseed.nvim :util :config.util}}) +(module config.cmp {autoload {nvim aniseed.nvim util config.util}}) (let [cmp (util.prequire :cmp) lspkind (util.prequire :lspkind) diff --git a/fnl/config/colorizer.fnl b/fnl/config/colorizer.fnl index 8358f0b..ff7fbab 100644 --- a/fnl/config/colorizer.fnl +++ b/fnl/config/colorizer.fnl @@ -1,4 +1,4 @@ ;; Enables colorization of color codes in source files. -(module config.colorizer {autoload {:util :config.util}}) +(module config.colorizer {autoload {util config.util}}) (util.setup :colorizer {}) diff --git a/fnl/config/colorscheme.fnl b/fnl/config/colorscheme.fnl index 50317c7..b4fbf1f 100644 --- a/fnl/config/colorscheme.fnl +++ b/fnl/config/colorscheme.fnl @@ -1,5 +1,5 @@ ;; Load neovim colorscheme. -(module config.colorscheme {autoload {:util :config.util}}) +(module config.colorscheme {autoload {util config.util}}) (local colorscheme :no-clown-fiesta) diff --git a/fnl/config/comment.fnl b/fnl/config/comment.fnl index 1b896f4..3a3f1fb 100644 --- a/fnl/config/comment.fnl +++ b/fnl/config/comment.fnl @@ -1,5 +1,5 @@ ;; Language aware commenting. -(module config.comment {autoload {:util :config.util}}) +(module config.comment {autoload {util config.util}}) (def- opts {}) diff --git a/fnl/config/diffview.fnl b/fnl/config/diffview.fnl index a4fed9d..3772d32 100644 --- a/fnl/config/diffview.fnl +++ b/fnl/config/diffview.fnl @@ -1,5 +1,5 @@ ;; Trim whitespaces on save. -(module config.diffview {autoload {:util :config.util}}) +(module config.diffview {autoload {util config.util}}) (def- opts {}) diff --git a/fnl/config/fidget.fnl b/fnl/config/fidget.fnl index 3c66990..1b9ca81 100644 --- a/fnl/config/fidget.fnl +++ b/fnl/config/fidget.fnl @@ -1,5 +1,5 @@ ;; Show lsp progress. -(module config.fidget {autoload {:util :config.util}}) +(module config.fidget {autoload {util config.util}}) (def- opts {:text {:spinner :dots_snake}}) diff --git a/fnl/config/flit.fnl b/fnl/config/flit.fnl index 6a769f0..d80a0d9 100644 --- a/fnl/config/flit.fnl +++ b/fnl/config/flit.fnl @@ -1,5 +1,5 @@ ;; fFtT motions on roids. -(module config.flit {autoload {:util :config.util nvim aniseed.nvim}}) +(module config.flit {autoload {util config.util nvim aniseed.nvim}}) (def- opts {:keys {:f :f :F :F :t :t :T :T} :labeled_modes :v diff --git a/fnl/config/gitsigns.fnl b/fnl/config/gitsigns.fnl index 43f831e..663e3e0 100644 --- a/fnl/config/gitsigns.fnl +++ b/fnl/config/gitsigns.fnl @@ -1,5 +1,5 @@ ;; Add git signs to source files. -(module config.gitsigns {autoload {:util :config.util}}) +(module config.gitsigns {autoload {util config.util}}) (def- signs {:add {:hl :GitSignsAdd :text "|" diff --git a/fnl/config/harpoon.fnl b/fnl/config/harpoon.fnl index 71c3798..122f045 100644 --- a/fnl/config/harpoon.fnl +++ b/fnl/config/harpoon.fnl @@ -1,5 +1,5 @@ ;; Harpoon files for navigation. -(module config.harpoon {autoload {:util :config.util nvim aniseed.nvim}}) +(module config.harpoon {autoload {util config.util nvim aniseed.nvim}}) (def- opts {}) diff --git a/fnl/config/leap.fnl b/fnl/config/leap.fnl index 541b0e0..868f9eb 100644 --- a/fnl/config/leap.fnl +++ b/fnl/config/leap.fnl @@ -1,5 +1,5 @@ ;; Leap through text. -(module config.leap {autoload {:util :config.util nvim aniseed.nvim}}) +(module config.leap {autoload {util config.util nvim aniseed.nvim}}) (def- opts {}) diff --git a/fnl/config/lir.fnl b/fnl/config/lir.fnl index 8f9058c..45fb052 100644 --- a/fnl/config/lir.fnl +++ b/fnl/config/lir.fnl @@ -1,5 +1,5 @@ ;; Simple file manager. -(module config.lir {autoload {:util :config.util nvim aniseed.nvim}}) +(module config.lir {autoload {util config.util nvim aniseed.nvim}}) (defn- opts [actions mark-actions clipboard-actions] {:show_hidden_files false diff --git a/fnl/config/lsp/handlers.fnl b/fnl/config/lsp/handlers.fnl index 913a5a2..c9b7825 100644 --- a/fnl/config/lsp/handlers.fnl +++ b/fnl/config/lsp/handlers.fnl @@ -1,5 +1,5 @@ ;; Handlers for the requests and responses from and to the lsp server. -(module config.lsp.handlers {autoload {:util :config.util nvim aniseed.nvim}}) +(module config.lsp.handlers {autoload {util config.util nvim aniseed.nvim}}) (def- signs [{:name :DiagnosticSignError :text ""} {:name :DiagnosticSignWarn :text ""} diff --git a/fnl/config/lsp/mason-lspconfig.fnl b/fnl/config/lsp/mason-lspconfig.fnl index 7a03ced..130fc17 100644 --- a/fnl/config/lsp/mason-lspconfig.fnl +++ b/fnl/config/lsp/mason-lspconfig.fnl @@ -1,5 +1,5 @@ ;; TBD -(module config.lsp.mason-lspconfig {autoload {:util :config.util}}) +(module config.lsp.mason-lspconfig {autoload {util config.util}}) (def- servers [:bashls :clangd diff --git a/fnl/config/lsp/mason-null-ls.fnl b/fnl/config/lsp/mason-null-ls.fnl index e739b9b..33cf93f 100644 --- a/fnl/config/lsp/mason-null-ls.fnl +++ b/fnl/config/lsp/mason-null-ls.fnl @@ -1,5 +1,5 @@ ;; Ensure that tools needed for null-ls are installed. -(module config.mason-null-ls {autoload {:util :config.util}}) +(module config.mason-null-ls {autoload {util config.util}}) (def- opts {:ensure_installed [:flake8 :golangci-lint diff --git a/fnl/config/lsp/mason.fnl b/fnl/config/lsp/mason.fnl index 7c58d94..adc60a4 100644 --- a/fnl/config/lsp/mason.fnl +++ b/fnl/config/lsp/mason.fnl @@ -1,5 +1,5 @@ ;; Mason manages external tooling, e.g. lsp, formatters, and linters. -(module config.lsp.mason {autoload {:util :config.util}}) +(module config.lsp.mason {autoload {util config.util}}) (def- opts {:ui {:icons {:package_installed "✓" :package_pending "➜" diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl index 7efb079..7ebd25e 100644 --- a/fnl/config/lsp/null-ls.fnl +++ b/fnl/config/lsp/null-ls.fnl @@ -1,5 +1,5 @@ ;; Adds LSP diagnostics and formatting. -(module config.lsp.null-ls {autoload {:util :config.util}}) +(module config.lsp.null-ls {autoload {util config.util}}) (let [null-ls (util.prequire :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 3fe9299..55c6115 100644 --- a/fnl/config/lsp/settings/jsonls.fnl +++ b/fnl/config/lsp/settings/jsonls.fnl @@ -1,5 +1,5 @@ ;; Json schema store catalog language server. -(module config.lsp.settings.jsonls {autoload {:util :config.util}}) +(module config.lsp.settings.jsonls {autoload {util config.util}}) (let [schemastore (util.prequire :schemastore)] {:init_options {:providerFormatter false} diff --git a/fnl/config/lualine.fnl b/fnl/config/lualine.fnl index ee68523..833e68e 100644 --- a/fnl/config/lualine.fnl +++ b/fnl/config/lualine.fnl @@ -1,5 +1,5 @@ ;; Statusbar. -(module config.lualine {autoload {:util :config.util}}) +(module config.lualine {autoload {util config.util}}) (def- disable [:neogitstatus :lir diff --git a/fnl/config/minibar.fnl b/fnl/config/minibar.fnl index 21d687a..8f0e792 100644 --- a/fnl/config/minibar.fnl +++ b/fnl/config/minibar.fnl @@ -1,4 +1,4 @@ -(module config.minibar {autoload {:util :config.util}}) +(module config.minibar {autoload {util config.util}}) (def- opts {:ignore-filetypes [:help :startify diff --git a/fnl/config/neogit.fnl b/fnl/config/neogit.fnl index aab1291..2d9f515 100644 --- a/fnl/config/neogit.fnl +++ b/fnl/config/neogit.fnl @@ -1,4 +1,4 @@ ;; UI for git. -(module config.neogit {autoload {:util :config.util}}) +(module config.neogit {autoload {util config.util}}) (util.setup :neogit {}) diff --git a/fnl/config/orgmode.fnl b/fnl/config/orgmode.fnl index af3d705..a21eaa0 100644 --- a/fnl/config/orgmode.fnl +++ b/fnl/config/orgmode.fnl @@ -1,5 +1,5 @@ ;; Orgmode for nvim. -(module config.orgmode {autoload {nvim aniseed.nvim :util :config.util}}) +(module config.orgmode {autoload {nvim aniseed.nvim util config.util}}) (nvim.ex.set :conceallevel=2) (nvim.ex.set :concealcursor=nc) diff --git a/fnl/config/packer.fnl b/fnl/config/packer.fnl index b8ab91a..f4f44cc 100644 --- a/fnl/config/packer.fnl +++ b/fnl/config/packer.fnl @@ -1,5 +1,5 @@ ;; Load packer config -(module config.packer {autoload {:util :config.util}}) +(module config.packer {autoload {util config.util}}) (let [packer (util.prequire :packer) packer-util (require :packer.util)] diff --git a/fnl/config/project.fnl b/fnl/config/project.fnl index 1c97527..1617ca5 100644 --- a/fnl/config/project.fnl +++ b/fnl/config/project.fnl @@ -1,5 +1,5 @@ ;; Provides project management. -(module config.project {autoload {:util :config.util}}) +(module config.project {autoload {util config.util}}) (def- opts {:active true :on_config_done nil diff --git a/fnl/config/spectre.fnl b/fnl/config/spectre.fnl index 337beb1..f0afa52 100644 --- a/fnl/config/spectre.fnl +++ b/fnl/config/spectre.fnl @@ -1,5 +1,5 @@ ;; Find and replace. -(module config.spectre {autoload {:util :config.util}}) +(module config.spectre {autoload {util config.util}}) (def- opts {:color_devicons true :highlight {:ui :String :search :DiffChange :replace :DiffDelete} diff --git a/fnl/config/stabilize.fnl b/fnl/config/stabilize.fnl index 59b7c5d..5ac2a7f 100644 --- a/fnl/config/stabilize.fnl +++ b/fnl/config/stabilize.fnl @@ -1,5 +1,5 @@ ;; Stabilize window open/close events. -(module config.stabilize {autoload {:util :config.util}}) +(module config.stabilize {autoload {util config.util}}) (def- opts {:force true ;; stabilize window even when current cursor position will be hidden behind new window diff --git a/fnl/config/stay-in-place.fnl b/fnl/config/stay-in-place.fnl index 1c19399..be3ccd3 100644 --- a/fnl/config/stay-in-place.fnl +++ b/fnl/config/stay-in-place.fnl @@ -1,4 +1,4 @@ ;; Prevent the cursor from moving when using shift and filter actions. -(module config.stay-in-place {autoload {:util :config.util}}) +(module config.stay-in-place {autoload {util config.util}}) (util.setup :stay-in-place {}) diff --git a/fnl/config/surround.fnl b/fnl/config/surround.fnl index 8a3aad9..2406ecd 100644 --- a/fnl/config/surround.fnl +++ b/fnl/config/surround.fnl @@ -1,5 +1,5 @@ ;; Surround selections. -(module config.surround {autoload {:util :config.util}}) +(module config.surround {autoload {util config.util}}) (def- opts {}) diff --git a/fnl/config/telescope.fnl b/fnl/config/telescope.fnl index 5c79501..dc58b01 100644 --- a/fnl/config/telescope.fnl +++ b/fnl/config/telescope.fnl @@ -1,5 +1,5 @@ ;; Telescope a highly extendable fuzzy finder over lists. -(module config.telescope {autoload {:util :config.util nvim aniseed.nvim}}) +(module config.telescope {autoload {util config.util nvim aniseed.nvim}}) (def- opts {:noremap true :silent true}) diff --git a/fnl/config/toggleterm.fnl b/fnl/config/toggleterm.fnl index 2a1a462..dd561f3 100644 --- a/fnl/config/toggleterm.fnl +++ b/fnl/config/toggleterm.fnl @@ -1,6 +1,6 @@ ;; Terminal inside nvim. (module config.toggleterm - {autoload {:util :config.util nvim aniseed.nvim autocmd config.autocmd}}) + {autoload {util config.util nvim aniseed.nvim autocmd config.autocmd}}) (def- opts {:size 16 :shade_terminals false}) diff --git a/fnl/config/treesitter.fnl b/fnl/config/treesitter.fnl index 058182d..e61e2c0 100644 --- a/fnl/config/treesitter.fnl +++ b/fnl/config/treesitter.fnl @@ -1,6 +1,6 @@ ;; 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 :config.util}}) +(module config.treesitter {autoload {util config.util}}) (def- opts {:ensure_installed [:c :rust diff --git a/fnl/config/trim.fnl b/fnl/config/trim.fnl index ee699fb..8a2ec43 100644 --- a/fnl/config/trim.fnl +++ b/fnl/config/trim.fnl @@ -1,5 +1,5 @@ ;; Trim whitespaces on save. -(module config.trim {autoload {:util :config.util}}) +(module config.trim {autoload {util config.util}}) (def- opts {:disable [:python]}) diff --git a/fnl/config/trouble.fnl b/fnl/config/trouble.fnl index 0266ec0..b45fecd 100644 --- a/fnl/config/trouble.fnl +++ b/fnl/config/trouble.fnl @@ -1,5 +1,5 @@ ;; Pretty diagnostics. -(module config.trouble {autoload {:util :config.util}}) +(module config.trouble {autoload {util config.util}}) (def- opts {:position :bottom ;; position of the list can be: bottom, top, left, right diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl index fdd76b5..2b5ea9d 100644 --- a/fnl/config/which-key.fnl +++ b/fnl/config/which-key.fnl @@ -1,5 +1,5 @@ ;; Which-key provides a pop-up meny for some key mappings. -(module config.which-key {autoload {:util :config.util nvim aniseed.nvim}}) +(module config.which-key {autoload {util config.util nvim aniseed.nvim}}) (def- setup {:plugins {:marks true :registers true diff --git a/fnl/config/window-picker.fnl b/fnl/config/window-picker.fnl index 268e952..76a11f5 100644 --- a/fnl/config/window-picker.fnl +++ b/fnl/config/window-picker.fnl @@ -1,5 +1,5 @@ ;; Trim whitespaces on save. -(module config.window-picker {autoload {:util :config.util}}) +(module config.window-picker {autoload {util config.util}}) (def- opts {:other_win_hl_color "#171717" :fg_color "#E1E1E1" diff --git a/fnl/config/zen.fnl b/fnl/config/zen.fnl index df90661..a7dbe6a 100644 --- a/fnl/config/zen.fnl +++ b/fnl/config/zen.fnl @@ -1,5 +1,5 @@ ;; Zen mode. -(module config.zen {autoload {:util :config.util}}) +(module config.zen {autoload {util config.util}}) (def- opts {:window {:backdrop 1 :height 0.8 diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 2b7fe15..3696598 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -49,8 +49,6 @@ :event :BufWinEnter :config (fn [] (require :config.fidget))} - {1 :jose-elias-alvarez/null-ls.nvim} - {1 :neovim/nvim-lspconfig} {1 :williamboman/mason.nvim :event :BufWinEnter :config (fn [] -- cgit v1.2.3-70-g09d2 From ec825863530260d008350e051873a03ceb031de3 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 14:06:08 +0200 Subject: Add undotree and remove lir --- fnl/config/autocmd.fnl | 9 --------- fnl/config/lir.fnl | 44 -------------------------------------------- fnl/config/which-key.fnl | 1 + fnl/plugins.fnl | 7 ++----- fnl/settings/keymaps.fnl | 1 + fnl/settings/options.fnl | 3 +++ 6 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 fnl/config/lir.fnl (limited to 'fnl/plugins.fnl') diff --git a/fnl/config/autocmd.fnl b/fnl/config/autocmd.fnl index 84d9e66..9bd59cc 100644 --- a/fnl/config/autocmd.fnl +++ b/fnl/config/autocmd.fnl @@ -18,18 +18,9 @@ (create-autocmd :FileType {:pattern :qf :command "set nobuflisted"}) -(create-autocmd :FileType {:pattern :lir - :callback (fn [] - (tset vim.opt_local :number false) - (tset vim.opt_local :relativenumber - false))}) - (create-autocmd :FileType {:pattern [:gitcommit :markdown] :command "setlocal wrap"}) -(create-autocmd :FileType {:pattern [:gitcommit :markdown :org :plaintex] - :command "setlocal spell"}) - (create-autocmd :VimResized {:command "tabdo wincmd ="}) (create-autocmd :BufWritePost diff --git a/fnl/config/lir.fnl b/fnl/config/lir.fnl deleted file mode 100644 index 45fb052..0000000 --- a/fnl/config/lir.fnl +++ /dev/null @@ -1,44 +0,0 @@ -;; Simple file manager. -(module config.lir {autoload {util config.util nvim aniseed.nvim}}) - -(defn- opts [actions mark-actions clipboard-actions] - {:show_hidden_files false - :devicons_enable true - :mappings {:l actions.edit - : actions.split - :v actions.vsplit - : actions.tabedit - :h actions.up - :q actions.quit - :A actions.mkdir - :a actions.newfile - :r actions.rename - "@" actions.cd - :Y actions.yank_path - :i actions.toggle_show_hidden - :d actions.delete - :J (fn [] - (mark-actions.toggle_mark) - (vim.cmd "normal! j")) - :c clipboard-actions.copy - :x clipboard-actions.cut - :p clipboard-actions.paste} - :float {:winblend 0 - :curdir_window {:enable false :highlight_dirname true} - :win_opts (fn [] - (let [width (math.floor (* vim.o.columns 0.7)) - height (math.floor (* vim.o.lines 0.7))] - {:border :rounded : width : height}))} - :hide_cursor false - :on_init (fn [] - (nvim.buf_set_keymap 0 :x :J - ":lua require(\"lir.mark.actions\").toggle_mark(\"v\")" - {:noremap true :silent true}))}) - -(let [lir (util.prequire :lir)] - (let [actions (require :lir.actions) - mark-actions (require :lir.mark.actions) - clipboard-actions (require :lir.clipboard.actions)] - (lir.setup (opts actions mark-actions clipboard-actions)) - (nvim.set_keymap :n "-" ":lua require'lir.float'.toggle()" - {:noremap true :silent true}))) diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl index 2b5ea9d..477c23b 100644 --- a/fnl/config/which-key.fnl +++ b/fnl/config/which-key.fnl @@ -158,6 +158,7 @@ :o org :p packer :r replace + :u [:UndotreeToggle "Undotree"] :s [switch-window "Switch window"] :t [:ToggleTerm :Terminal] :T treesitter diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 3696598..4c972a2 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -109,10 +109,6 @@ {1 :ahmedkhalf/project.nvim :config (fn [] (require :config.project))} - {1 :tamago324/lir.nvim - :config (fn [] - (require :config.lir)) - :requires [:kyazdani42/nvim-web-devicons]} {1 :ThePrimeagen/harpoon :config (fn [] (require :config.harpoon))}]) @@ -156,7 +152,8 @@ {1 :windwp/nvim-spectre :config (fn [] (require :config.spectre)) - :event :BufWinEnter}]) + :event :BufWinEnter} + {1 :mbbill/undotree :event :BufWinEnter}]) (def ui [{1 :nvim-lualine/lualine.nvim :event :BufWinEnter diff --git a/fnl/settings/keymaps.fnl b/fnl/settings/keymaps.fnl index 85e5a76..83b9917 100644 --- a/fnl/settings/keymaps.fnl +++ b/fnl/settings/keymaps.fnl @@ -47,3 +47,4 @@ (map :n : :nohlsearch opts) (map :n :Q ":q" opts) +(map :n "-" ":Explore" opts) diff --git a/fnl/settings/options.fnl b/fnl/settings/options.fnl index 0a1a254..bc82be7 100644 --- a/fnl/settings/options.fnl +++ b/fnl/settings/options.fnl @@ -88,3 +88,6 @@ (nvim.ex.set :formatoptions-=cro) (nvim.ex.set :colorcolumn=80) (nvim.ex.set :shortmess+=c) +(set vim.g.netrw_browse_split 0) +(set vim.g.netrw_banner 0) +(set vim.g.netrw_winsize 25) -- cgit v1.2.3-70-g09d2 From 9150a0db633e00aef2b74e9aafb016a6022bf98e Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Mon, 17 Oct 2022 00:54:01 +0200 Subject: Update plugin lazy loading --- fnl/plugins.fnl | 121 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 60 insertions(+), 61 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 4c972a2..807da59 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -5,9 +5,9 @@ :config (fn [] (require :config.colorscheme))} {1 :norcalli/nvim-colorizer.lua + :cmd :ColorizerToggle :config (fn [] - (require :config.colorizer)) - :event :BufRead} + (require :config.colorizer))} {1 :nvim-treesitter/nvim-treesitter :config (fn [] (require :config.treesitter)) @@ -23,7 +23,6 @@ {1 :saadparwaiz1/cmp_luasnip} {1 :f3fora/cmp-spell}] :event :InsertEnter - :want :Luasnip :config (fn [] (require :config.cmp))}) @@ -32,39 +31,39 @@ {1 :wbthomason/packer.nvim}]) (def git [{1 :sindrets/diffview.nvim + :cmd [:DiffviewFileHistory :DiffviewOpen] :config (fn [] - (require :config.diffview)) - :event :BufRead} + (require :config.diffview))} {1 :TimUntersberger/neogit + :cmd :Neogit + :requires [:nvim-lua/plenary.nvim] :config (fn [] - (require :config.neogit)) - :event :BufRead - :requires [:nvim-lua/plenary.nvim]} + (require :config.neogit))} {1 :lewis6991/gitsigns.nvim + :event :BufRead :config (fn [] - (require :config.gitsigns)) - :event :BufRead}]) + (require :config.gitsigns))}]) (def lsp [{1 :j-hui/fidget.nvim - :event :BufWinEnter + :event :BufReadPre :config (fn [] (require :config.fidget))} {1 :williamboman/mason.nvim - :event :BufWinEnter + :event :BufReadPre :config (fn [] (require :config.lsp.mason))} {1 :tamago324/nlsp-settings.nvim} {1 :jayp0521/mason-null-ls.nvim - :event :BufWinEnter - :config (fn [] - (require :config.lsp.null-ls) - (require :config.lsp.mason-null-ls)) + :after :mason.nvim + :event :BufReadPre :requires [:jose-elias-alvarez/null-ls.nvim :williamboman/mason.nvim] - :after :mason.nvim} + :config (fn [] + (require :config.lsp.null-ls) + (require :config.lsp.mason-null-ls))} {1 :b0o/SchemaStore.nvim} {1 :williamboman/mason-lspconfig.nvim - :event :BufWinEnter + :event :BufReadPre :config (fn [] (require :config.lsp.mason-lspconfig) (let [handlers (require :config.lsp.handlers)] @@ -72,20 +71,20 @@ :requires [:neovim/nvim-lspconfig :williamboman/mason.nvim] :after :mason.nvim} {1 :folke/trouble.nvim + :cmd :TroubleToggle :config (fn [] - (require :config.trouble)) - :event :BufWinEnter}]) + (require :config.trouble))}]) (def misc [{1 :nvim-orgmode/orgmode + :event :BufReadPre :config (fn [] - (require :config.orgmode)) - :requires :nvim-treesitter/nvim-treesitter - :event :BufWinEnter} + (require :config.orgmode))} + {1 :moll/vim-bbye :event :BufRead} {1 :akinsho/toggleterm.nvim + :cmd :ToggleTerm :config (fn [] - (require :config.toggleterm)) - :event :BufWinEnter} - {1 :dstein64/vim-startuptime}]) + (require :config.toggleterm))} + {1 :dstein64/vim-startuptime :cmd :StartupTime}]) (def search [{1 :nvim-telescope/telescope-fzf-native.nvim :run :make} {1 :nvim-telescope/telescope-frecency.nvim @@ -98,65 +97,66 @@ :nvim-telescope/telescope-fzf-native.nvim :nvim-telescope/telescope-frecency.nvim]} {1 :ggandor/leap.nvim + :event :BufRead :config (fn [] - (require :config.leap)) - :event :BufRead} + (require :config.leap))} {1 :ggandor/flit.nvim + :event :BufRead :config (fn [] - (require :config.flit)) - :after :leap.nvim - :event :BufRead} + (require :config.flit))} {1 :ahmedkhalf/project.nvim + :requires :nvim-telescope/telescope.nvim :config (fn [] (require :config.project))} + {1 :windwp/nvim-spectre + :event :BufRead + :config (fn [] + (require :config.spectre))} + {1 :junegunn/vim-slash + :event :BufRead + :config (fn [] + (require :config.vim-slash))} {1 :ThePrimeagen/harpoon + :requires :nvim-telescope/telescope.nvim :config (fn [] (require :config.harpoon))}]) (def session {1 :rmagatti/auto-session + :requires [:rmagatti/session-lens :nvim-telescope/telescope.nvim] :config (fn [] - (require :config.auto-session)) - :requires [:rmagatti/session-lens]}) + (require :config.auto-session))}) (def snippets [:rafamadriz/friendly-snippets]) (def text [{1 :numToStr/Comment.nvim :config (fn [] (require :config.comment)) - :event :BufWinEnter} + :event :BufRead} {1 :JoosepAlviste/nvim-ts-context-commentstring :event :BufReadPost} {1 :kylechui/nvim-surround :config (fn [] (require :config.surround)) :event :BufRead} {1 :gbprod/stay-in-place.nvim - :event :BufWinEnter + :event :BufReadPre :config (fn [] (require :config.stay-in-place))} - {1 :junegunn/vim-slash - :config (fn [] - (require :config.vim-slash)) - :event :BufWinEnter} {1 :cappyzawa/trim.nvim + :event :BufFilePre :config (fn [] - (require :config.trim)) - :event :BufWinEnter} + (require :config.trim))} {1 :max397574/better-escape.nvim - :event :BufWinEnter + :event :BufRead :config (fn [] (require :config.better-escape))} {1 :windwp/nvim-autopairs + :event :BufRead :config (fn [] - (require :config.autopairs)) - :event :BufWinEnter} - {1 :windwp/nvim-spectre - :config (fn [] - (require :config.spectre)) - :event :BufWinEnter} - {1 :mbbill/undotree :event :BufWinEnter}]) + (require :config.autopairs))} + {1 :mbbill/undotree :cmd :UndotreeToggle}]) (def ui [{1 :nvim-lualine/lualine.nvim - :event :BufWinEnter + :event :BufReadPre :config (fn [] (require :config.lualine)) :requires [:kyazdani42/nvim-web-devicons]} @@ -165,26 +165,25 @@ (require :config.minibar)) :event :BufRead} {1 :folke/zen-mode.nvim + :cmd :ZenMode :config (fn [] - (require :config.zen)) - :event :BufWinEnter} + (require :config.zen))} {1 :kevinhwang91/nvim-bqf + :event :BufRead :config (fn [] - (require :config.bqf)) - :event :BufRead} + (require :config.bqf))} {1 :s1n7ax/nvim-window-picker + :event :BufRead :config (fn [] - (require :config.window-picker)) - :event :BufWinEnter} + (require :config.window-picker))} {1 :luukvbaal/stabilize.nvim + :event :BufReadPre :config (fn [] - (require :config.stabilize)) - :event :BufWinEnter} - {1 :moll/vim-bbye :event :BufWinEnter} + (require :config.stabilize))} {1 :folke/which-key.nvim + :event :VimEnter :config (fn [] - (require :config.which-key)) - :event :BufWinEnter}]) + (require :config.which-key))}]) (def all {: color : completions -- cgit v1.2.3-70-g09d2 From f3432fc8f42246ac26f90146f13045377bc3899e Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Mon, 17 Oct 2022 01:10:09 +0200 Subject: Update lazy loading --- fnl/plugins.fnl | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'fnl/plugins.fnl') diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 807da59..13da672 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -90,6 +90,7 @@ {1 :nvim-telescope/telescope-frecency.nvim :requires :tami5/sqlite.lua} {1 :nvim-telescope/telescope.nvim + :event :VimEnter :config (fn [] (require :config.telescope)) :requires [:nvim-lua/popup.nvim @@ -97,11 +98,11 @@ :nvim-telescope/telescope-fzf-native.nvim :nvim-telescope/telescope-frecency.nvim]} {1 :ggandor/leap.nvim - :event :BufRead + :event :InsertEnter :config (fn [] (require :config.leap))} {1 :ggandor/flit.nvim - :event :BufRead + :event :InsertEnter :config (fn [] (require :config.flit))} {1 :ahmedkhalf/project.nvim @@ -109,19 +110,22 @@ :config (fn [] (require :config.project))} {1 :windwp/nvim-spectre - :event :BufRead + :event :InsertEnter :config (fn [] (require :config.spectre))} {1 :junegunn/vim-slash - :event :BufRead + :event :InsertEnter :config (fn [] (require :config.vim-slash))} {1 :ThePrimeagen/harpoon + :event :InsertEnter :requires :nvim-telescope/telescope.nvim :config (fn [] (require :config.harpoon))}]) (def session {1 :rmagatti/auto-session + :event :VimEnter + :after :telescope.nvim :requires [:rmagatti/session-lens :nvim-telescope/telescope.nvim] :config (fn [] (require :config.auto-session))}) @@ -129,16 +133,16 @@ (def snippets [:rafamadriz/friendly-snippets]) (def text [{1 :numToStr/Comment.nvim + :event :InsertEnter :config (fn [] - (require :config.comment)) - :event :BufRead} + (require :config.comment))} {1 :JoosepAlviste/nvim-ts-context-commentstring :event :BufReadPost} {1 :kylechui/nvim-surround + :event :InsertEnter :config (fn [] - (require :config.surround)) - :event :BufRead} + (require :config.surround))} {1 :gbprod/stay-in-place.nvim - :event :BufReadPre + :event :InsertEnter :config (fn [] (require :config.stay-in-place))} {1 :cappyzawa/trim.nvim @@ -146,11 +150,11 @@ :config (fn [] (require :config.trim))} {1 :max397574/better-escape.nvim - :event :BufRead + :event :InsertEnter :config (fn [] (require :config.better-escape))} {1 :windwp/nvim-autopairs - :event :BufRead + :event :InsertEnter :config (fn [] (require :config.autopairs))} {1 :mbbill/undotree :cmd :UndotreeToggle}]) @@ -161,9 +165,9 @@ (require :config.lualine)) :requires [:kyazdani42/nvim-web-devicons]} {1 :aktersnurra/minibar.nvim + :event :BufRead :config (fn [] - (require :config.minibar)) - :event :BufRead} + (require :config.minibar))} {1 :folke/zen-mode.nvim :cmd :ZenMode :config (fn [] @@ -173,7 +177,7 @@ :config (fn [] (require :config.bqf))} {1 :s1n7ax/nvim-window-picker - :event :BufRead + :event :InsertEnter :config (fn [] (require :config.window-picker))} {1 :luukvbaal/stabilize.nvim -- cgit v1.2.3-70-g09d2