diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 53fae9b..1dc7e1f 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -7,15 +7,18 @@ (use :Olical/aniseed) ; fennel to lua ; themes - (use :projekt0n/github-nvim-theme) - (use :FrenzyExists/aquarium-vim) + ; (use :projekt0n/github-nvim-theme) + (use { + 1 :FrenzyExists/aquarium-vim + :run ":silent! colorscheme aquarium" + }) ; ui (use :kyazdani42/nvim-web-devicons) (use :nvim-lualine/lualine.nvim) (use :lukas-reineke/indent-blankline.nvim) (use :ntpeters/vim-better-whitespace) - (use :valloric/matchtagalways) + ; (use :valloric/matchtagalways) ; util (use :cocopon/vaffle.vim) @@ -26,8 +29,15 @@ (use :nelstrom/vim-visual-star-search) (use :timakro/vim-yadi) - (use {1 :nvim-treesitter/nvim-treesitter :run ":TSUpdate"}) - (use :nvim-treesitter/nvim-treesitter-textobjects) + (use { + 1 :nvim-treesitter/nvim-treesitter + :run (fn [] (let [ts (require :nvim-treesitter.install)] + (ts.update {:with_sync true}))) + }) + (use { + 1 :nvim-treesitter/nvim-treesitter-textobjects + :after "nvim-treesitter" + }) (use :neovim/nvim-lspconfig) ; completion diff --git a/fnl/settings.fnl b/fnl/settings.fnl index 714bdf6..e16faa1 100644 --- a/fnl/settings.fnl +++ b/fnl/settings.fnl @@ -5,9 +5,7 @@ (nvim.ex.autocmd "BufRead * DetectIndent") ;; theme -; (global github-theme (require :github-theme)) -; (github-theme.setup {:theme_style :dark}) -(nvim.command "colorscheme aquarium") +(nvim.command "silent! colorscheme aquarium") ;; buffergator (set nvim.g.buffergator_display_regime "parentdir") diff --git a/init.lua b/init.lua index f266411..5fa0d5c 100644 --- a/init.lua +++ b/init.lua @@ -3,7 +3,8 @@ local fn = vim.fn local execute = vim.api.nvim_command -if fn.empty(fn.glob(fn.stdpath('data')..'/site/pack/packer/start/')) > 0 then +bootstrap = fn.empty(fn.glob(fn.stdpath('data')..'/site/pack/packer/start/')) > 0 +if bootstrap then local github = 'https://github.com/' local packer_git = github..'wbthomason/packer.nvim' local aniseed_git = github..'Olical/aniseed' @@ -12,6 +13,13 @@ if fn.empty(fn.glob(fn.stdpath('data')..'/site/pack/packer/start/')) > 0 then local packer_path = install_path..'packer.nvim' local aniseed_path = install_path..'aniseed' + vim.api.nvim_create_autocmd("User", { + pattern = "PackerComplete", + callback = function() + vim.cmd(":qa!") + end, + }) + fn.system({'git', 'clone', packer_git, packer_path}) fn.system({'git', 'clone', aniseed_git, aniseed_path}) @@ -21,12 +29,6 @@ if fn.empty(fn.glob(fn.stdpath('data')..'/site/pack/packer/start/')) > 0 then -- load only plugins to install plugins require('aniseed.env').init({compile = true, module = 'plugins'}) execute 'PackerUpdate' - - print('Plugins are installed, but config is not fully loaded, please open Neovim again') - else - --- call through aniseed vim.g['aniseed#env'] = true - end