diff --git a/mzte-nv/conf/lua/eval.fnl b/mzte-nv/conf/lua/eval.fnl index 22cc0b7..ccd03eb 100644 --- a/mzte-nv/conf/lua/eval.fnl +++ b/mzte-nv/conf/lua/eval.fnl @@ -1,5 +1,6 @@ (local fnl-eval (. (require :mzte_nv) :fennel :eval)) -(vim.api.nvim_create_user_command :Fnl (fn [args] (fnl-eval args.args)) +(vim.api.nvim_create_user_command :Fnl + (fn [args] (vim.print (fnl-eval args.args))) {:nargs "+"}) (fn insert-at-cursor [txt] diff --git a/mzte-nv/conf/lua/plugins.fnl b/mzte-nv/conf/lua/plugins.fnl index a1955fd..c89dabf 100644 --- a/mzte-nv/conf/lua/plugins.fnl +++ b/mzte-nv/conf/lua/plugins.fnl @@ -5,81 +5,85 @@ (macro pconf [plugin] `#(require ,(.. :pluginconf.p- plugin))) -(macro use/pconf [use plugin conf] - `(,use {1 ,plugin :config (pconf ,conf)})) +(fn use/mztegit [plugin opts] + (let [url (.. "https://mzte.de/git/nvim-plugins/" plugin) + opt (or opts {})] + (tset opt 1 url) + (packer.use opt))) -(macro use/pconf [use plugin conf extra] - (var c {1 plugin :config `(pconf ,conf)}) - (when (table? extra) - (each [k v (pairs extra)] - (tset c k v))) - `(,use ,c)) +(macro use/pconf [plugin conf] + `(use/mztegit ,plugin {:config (pconf ,conf)})) -(fn cmp-plugins [use] - (use/pconf use :neovim/nvim-lspconfig :lspconf) - (use/pconf use :hrsh7th/nvim-cmp :cmp) - (use :hrsh7th/cmp-nvim-lsp) - (use :hrsh7th/cmp-buffer) - (use :hrsh7th/cmp-path) - (use :hrsh7th/cmp-cmdline) - (use :saadparwaiz1/cmp_luasnip) - (use/pconf use :L3MON4D3/LuaSnip :luasnip - {:requires :rafamadriz/friendly-snippets}) - (use {1 :Saecki/crates.nvim :config #((. (require :crates) :setup) {})}) - (use :ray-x/cmp-treesitter) - (use/pconf use :jose-elias-alvarez/null-ls.nvim :nullls) - (use {1 :LhKipp/nvim-nu - :config #((. (require :nu) :setup) {:complete_cmd_names true})}) - (use :PaterJason/cmp-conjure)) +(macro use/pconf [plugin conf extra] + (var c {:config `(pconf ,conf)}) + (each [k v (pairs (or extra {}))] + (tset c k v)) + `(use/mztegit ,plugin ,c)) -(fn init [use] - (use :wbthomason/packer.nvim) - (use/pconf use :catppuccin/nvim :catppuccin {:as :catppuccin}) - (use {1 :lewis6991/gitsigns.nvim - :config #((. (require :gitsigns) :setup) {})}) - (use :dag/vim-fish) - (use/pconf use :nvim-lualine/lualine.nvim :line - {:after :catppuccin}) - (use/pconf use :nvim-treesitter/nvim-treesitter :treesitter) - (use/pconf use :nvim-tree/nvim-web-devicons :devicons) - (use/pconf use :nvim-tree/nvim-tree.lua :nvimtree - {:requires :nvim-tree/nvim-web-devicons}) - (use/pconf use :TimUntersberger/neogit :neogit - {:requires :nvim-lua/plenary.nvim}) - (use/pconf use :nvim-telescope/telescope.nvim :telescope - {:requires :nvim-lua/plenary.nvim}) - (use/pconf use :windwp/nvim-autopairs :autopairs) - (use :windwp/nvim-ts-autotag) - (use :HiPhish/nvim-ts-rainbow2) - (use/pconf use :akinsho/toggleterm.nvim :tterm) - (use :DingDean/wgsl.vim) - (use :rcarriga/nvim-notify) +(fn cmp-plugins [] + (use/pconf :nvim-lspconfig :lspconf) + (use/pconf :nvim-cmp :cmp) + (use/mztegit :cmp-nvim-lsp) + (use/mztegit :cmp-buffer) + (use/mztegit :cmp-path) + (use/mztegit :cmp-cmdline) + (use/mztegit :cmp_luasnip) + (use/mztegit :friendly-snippets) + (use/pconf :LuaSnip :luasnip) + (use/mztegit :crates.nvim {:config #((. (require :crates) :setup) {})}) + (use/mztegit :cmp-treesitter) + (use/pconf :null-ls.nvim :nullls) + (use/mztegit :nvim-nu + {:config #((. (require :nu) :setup) {:complete_cmd_names true})}) + (use/mztegit :cmp-conjure)) + +(fn init [] + (use/mztegit :packer.nvim) + (use/mztegit :plenary.nvim) + (use/pconf :catppuccin :catppuccin) + (use/mztegit :gitsigns.nvim + {:config #((. (require :gitsigns) :setup) {})}) + (use/mztegit :vim-fish) + (use/pconf :lualine.nvim :line {:after :catppuccin}) + (use/pconf :nvim-treesitter :treesitter) + (use/pconf :nvim-web-devicons :devicons) + (use/pconf :nvim-tree.lua :nvimtree) + (use/pconf :neogit :neogit) + (use/pconf :telescope.nvim :telescope) + (use/pconf :nvim-autopairs :autopairs) + (use/mztegit :nvim-ts-autotag) + (use/mztegit :nvim-ts-rainbow2) + (use/pconf :toggleterm.nvim :tterm) + (use/mztegit :wgsl.vim) + (use/mztegit :nvim-notify) ;; TODO: remove once noice gets support for ui.select - (use {1 :stevearc/dressing.nvim - :config #((. (require :dressing) :setup) {:input ;; Provided by noice - {:enabled false}})}) - (use/pconf use :nvim-treesitter/nvim-treesitter-context :ts-context) - (use :DaeZak/crafttweaker-vim-highlighting) - (use :mfussenegger/nvim-jdtls) - (use/pconf use :kevinhwang91/nvim-ufo :ufo - {:requires :kevinhwang91/promise-async :after :nvim-lspconfig}) - (use/pconf use :stevearc/aerial.nvim :aerial) - (use/pconf use :mfussenegger/nvim-dap :dap {:requires :rcarriga/nvim-dap-ui}) - (use/pconf use :ThePrimeagen/harpoon :harpoon) - (use/pconf use :chrisgrieser/nvim-recorder :recorder) - (use/pconf use :folke/noice.nvim :noice {:requires :MunifTanjim/nui.nvim}) - (use :jdonaldson/vaxe) - (use/pconf use :CKolkey/ts-node-action :tsn-actions - {:requires :jose-elias-alvarez/null-ls.nvim}) - (use :nvim-treesitter/playground) - (use {1 :Olical/conjure :setup (pconf :conjure)}) - (use/pconf use :kosayoda/nvim-lightbulb :lightbulb) - (cmp-plugins use)) + (use/mztegit :dressing.nvim + {:config #((. (require :dressing) :setup) {:input ;; Provided by noice + {:enabled false}})}) + (use/pconf :nvim-treesitter-context :ts-context) + (use/mztegit :crafttweaker-vim-highlighting) + (use/mztegit :nvim-jdtls) + (use/mztegit :promise-async) + (use/pconf :nvim-ufo :ufo + {:after :nvim-lspconfig}) + (use/pconf :aerial.nvim :aerial) + (use/mztegit :nvim-dap-ui) + (use/pconf :nvim-dap :dap) + (use/pconf :harpoon :harpoon) + (use/pconf :nvim-recorder :recorder) + (use/mztegit :nui.nvim) + (use/pconf :noice.nvim :noice) + (use/mztegit :vaxe) + (use/pconf :ts-node-action :tsn-actions) + (use/mztegit :playground) + (use/mztegit :conjure {:setup (pconf :conjure)}) + (use/pconf :nvim-lightbulb :lightbulb) + (cmp-plugins)) (packer.startup init) ;; PackerCompile automagically -(when (= 0 (length (vim.api.nvim_get_runtime_file :plugin/packer_compiled.lua +(when (= 0 (length (vim.api.nvim_get_runtime_file :packer_compiled.lua false))) (packer.compile))