update bootstrap code to work smoothly

fnl/init.fnl

@@ -65,7 +65,7 @@
 
 ; neovide
 ; (set nvim.g.neovide_fullscreen true)
-(set nvim.g.neovide_cursor_vfx_mode "pixiedust")
+(set nvim.g.neovide_cursor_vfx_mode "railgun")
 (set nvim.o.guifont "FiraCode Nerd Font Mono:h16")
 
 (require "plugins")

fnl/lsp.fnl

@@ -15,6 +15,9 @@
 
 (lspconfig.rust_analyzer.setup {})
 (lspconfig.gopls.setup {})
+(lspconfig.hls.setup {
+                      :cmd ["haskell-language-server-wrapper" "--lsp" "--logfile" "/home/r00t/.cache/nvim/hls.log" "--debug"]
+                      })
 
 ; treesitter
 (set treesitter_install.compilers ["clang"])

fnl/plugins.fnl

@@ -7,15 +7,18 @@
   (use :Olical/aniseed) ; fennel to lua
 
   ; themes
-  (use :projekt0n/github-nvim-theme)
+  ; (use :projekt0n/github-nvim-theme)
-  (use :FrenzyExists/aquarium-vim)
+  (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)
@@ -24,9 +27,17 @@
   (use :ur4ltz/surround.nvim)
   (use :b3nj5m1n/kommentary)
   (use :nelstrom/vim-visual-star-search)
+  (use :timakro/vim-yadi)
 
-  (use {1 :nvim-treesitter/nvim-treesitter :run ":TSUpdate"})
+  (use {
-  (use :nvim-treesitter/nvim-treesitter-textobjects)
+    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

fnl/settings.fnl

@@ -2,10 +2,10 @@
   {require {nvim aniseed.nvim
             nu aniseed.nvim.util}})
 
+(nvim.ex.autocmd "BufRead * DetectIndent")
+
 ;; theme
-; (global github-theme (require :github-theme))
+(nvim.command "silent! colorscheme aquarium")
-; (github-theme.setup {:theme_style :dark})
-(nvim.command "colorscheme aquarium")
 
 ;; buffergator
 (set nvim.g.buffergator_display_regime "parentdir")
@@ -49,7 +49,7 @@
                             :icon ""}}
              :lualine_c {1 {1 :filename
                             :file_status true}}
-             :lualine_x ["encoding" "fileformat" "filetype"]
+             :lualine_x ["%{&expandtab?shiftwidth().\"sp\":\"tabs\"}" "encoding" "fileformat" "filetype"]
              :lualine_y ["progress"]
              :lualine_z ["location"]}
   :inactive_sections {:lualine_a {}

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