update astroui and astrocore

plugins/astrocore/package/default.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  version = "1.5.0";
+  version = "1.11.0";
 in
 pkgs.vimUtils.buildVimPlugin {
   inherit version;
@@ -12,7 +12,7 @@ pkgs.vimUtils.buildVimPlugin {
     owner = "astronvim";
     repo = "astrocore";
     rev = "v${version}";
-    hash = "sha256-KKNglNd3S8E11CMAS6E3vhN4oZoRh0u3rjkgHiIGozI=";
+    hash = "sha256-MXVr0tJEgkghjchC3yhJAItJYpvw0z9xaZzIk1Czepk=";
   };
 
   patches = [

plugins/astroui/package.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 
 let
-  version = "2.1.4";
-in
+  version = "2.6.0";
+in 
 pkgs.vimUtils.buildVimPlugin {
   inherit version;
 
@@ -12,6 +12,10 @@ pkgs.vimUtils.buildVimPlugin {
     owner = "astronvim";
     repo = "astroui";
     rev = "v${version}";
-    hash = "sha256-nmcqJq4L6XFrgrORan5x+WCwSfU3FC4D6Zux45YnIUQ=";
+    hash = "sha256-kygFyXSIXQENWxGKgJAf5Aid5kfKWMsqTxckXbI6gyE=";# "sha256-nmcqJq4L6XFrgrORan5x+WCwSfU3FC4D6Zux45YnIUQ=";
   };
+
+  buildInputs = [
+      pkgs.vimPlugins.astrocore
+    ];
 }

plugins/lsp.nix

@@ -101,13 +101,13 @@
     servers = {
       bashls.enable = true;
       cssls.enable = true;
-      docker-compose-language-service.enable = true;
+      docker_compose_language_service.enable = true;
       dockerls.enable = true;
-      helm-ls.enable = true;
+      helm_ls.enable = true;
       html.enable = true;
       jsonls.enable = true;
-      lua-ls.enable = true;
-      nginx-language-server.enable = true;
+      lua_ls.enable = true;
+      nginx_language_server.enable = true;
       nixd.enable = true;
       pyright.enable = true;
       yamlls.enable = true;
@@ -116,11 +116,11 @@
       texlab.enable = true;
       lemminx.enable = true; # XML
 
-      java-language-server.enable = false;
+      java_language_server.enable = false;
       zls.enable = false;
-      rust-analyzer.enable = false;
+      rust_analyzer.enable = false;
 
-      typos-lsp = {
+      typos_lsp = {
         enable = true;
         extraOptions.init_options.diagnosticSeverity = "Hint";
       };

plugins/markdown-preview.nix

@@ -5,7 +5,7 @@ _:
 {
   opts = {
     enable = true;
-    settings.auto_close = false;
+    settings.auto_close = 0;
   };
 
   rootOpts.keymaps = [

plugins/notify.nix

@@ -5,32 +5,36 @@
 {
   opts = {
     enable = true;
-    fps = 60;
-    stages = "fade";
+    settings = {
+      fps = 60;
+      stages = "fade";
 
-    # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/notify.lua#L27-L28
-    maxHeight.__raw = "function() return math.floor(vim.o.lines * 0.75) end";
-    maxWidth.__raw = "function() return math.floor(vim.o.columns * 0.75) end";
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/notify.lua#L27-L28
+      maxHeight.__raw = /*lua*/
+        ''function() return math.floor(vim.o.lines * 0.75) end'';
+      maxWidth.__raw = /*lua*/ 
+        ''function() return math.floor(vim.o.columns * 0.75) end'';
 
-    # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/notify.lua#L20-L26
-    icons = {
-      debug = icons.Debugger;
-      error = icons.DiagnosticError;
-      info = icons.DiagnosticInfo;
-      trace = icons.DiagnosticHint;
-      warn = icons.DiagnosticWarn;
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/notify.lua#L20-L26
+      icons = {
+        debug = icons.Debugger;
+        error = icons.DiagnosticError;
+        info = icons.DiagnosticInfo;
+        trace = icons.DiagnosticHint;
+        warn = icons.DiagnosticWarn;
+      };
+
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/notify.lua#L29-L42
+      onOpen = ''
+        function(win)
+          local buf = vim.api.nvim_win_get_buf(win)
+          vim.api.nvim_buf_set_option(buf, "filetype", "markdown")
+          vim.api.nvim_win_set_config(win, { zindex = 175 })
+          vim.wo[win].conceallevel = 3
+          vim.wo[win].spell = false
+        end
+      '';
     };
-
-    # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/notify.lua#L29-L42
-    onOpen = ''
-      function(win)
-        local buf = vim.api.nvim_win_get_buf(win)
-        vim.api.nvim_buf_set_option(buf, "filetype", "markdown")
-        vim.api.nvim_win_set_config(win, { zindex = 175 })
-        vim.wo[win].conceallevel = 3
-        vim.wo[win].spell = false
-      end
-    '';
   };
 
   rootOpts.keymaps = [

plugins/nvim-ufo.nix

@@ -6,7 +6,7 @@ _:
   opts = {
     enable = true;
 
-    preview.mappings = {
+    settings.preview.mappings = {
       scrollB = "<c-b>";
       scrollD = "<c-d>";
       scrollF = "<c-f>";
@@ -14,7 +14,7 @@ _:
     };
 
     # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/nvim-ufo.lua#L28-L44
-    providerSelector = ''
+    settings.providerSelector = ''
       function(_, filetype, buftype)
         local function handleFallbackException(bufnr, err, providerName)
           if type(err) == "string" and err:match "UfoFallbackException" then

plugins/web-devicons.nix

@@ -0,0 +1,3 @@
+_:{
+  opts.enable = true;
+}