From 72eb8394672dda6f4dab00b8b1a2cf9fdc5650b8 Mon Sep 17 00:00:00 2001 From: prunebutt Date: Sat, 8 Feb 2025 13:42:52 +0100 Subject: [PATCH] update astroui and astrocore --- flake.lock | 74 ++++++++++------------ plugins/astrocore/package/default.nix | 4 +- plugins/astroui/package.nix | 10 ++- plugins/lsp.nix | 14 ++-- plugins/markdown-preview.nix | 2 +- plugins/notify.nix | 50 ++++++++------- plugins/nvim-ufo.nix | 4 +- plugins/{surround.nix => vim-surround.nix} | 0 plugins/web-devicons.nix | 3 + 9 files changed, 84 insertions(+), 77 deletions(-) rename plugins/{surround.nix => vim-surround.nix} (100%) create mode 100644 plugins/web-devicons.nix diff --git a/flake.lock b/flake.lock index d05c5d0..5eb7225 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -23,12 +23,12 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -84,18 +84,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -134,11 +130,11 @@ ] }, "locked": { - "lastModified": 1732303962, - "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", + "lastModified": 1738841109, + "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", + "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", "type": "github" }, "original": { @@ -183,11 +179,11 @@ ] }, "locked": { - "lastModified": 1732324260, - "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -205,11 +201,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1729445390, - "narHash": "sha256-TxJ7RZLlBkKWZos1ai3eWIH0fBq1G6SVE+q3dW+0qRU=", + "lastModified": 1734904675, + "narHash": "sha256-MoYUUxiLcNwC9woNLoCfXfzcCAHE310DqDcJd/GjM98=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "9f4bcf647cad2edafda7e1143071e0daf37cbc41", + "rev": "19e8cb01a078fea1e6cf824097978c41af74e24b", "type": "github" }, "original": { @@ -220,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { @@ -249,11 +245,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732629460, - "narHash": "sha256-Cr8EyxEFPbVmX6p8LsslFBjDEuVlFNPILrWlwbBNnNA=", + "lastModified": 1738917768, + "narHash": "sha256-mQ3ysHsEVHVjX5EzRzYG5hrDY0cqP6O7kNlCg6wFA90=", "owner": "nix-community", "repo": "nixvim", - "rev": "8b19d154823619af7ced464185e8d13ec80a758b", + "rev": "f2f70b4376874b74d9bae0df2d4bfd5292c1499e", "type": "github" }, "original": { @@ -304,11 +300,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -347,11 +343,11 @@ ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { diff --git a/plugins/astrocore/package/default.nix b/plugins/astrocore/package/default.nix index b541072..0c1c2ae 100644 --- a/plugins/astrocore/package/default.nix +++ b/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 = [ diff --git a/plugins/astroui/package.nix b/plugins/astroui/package.nix index 6c49693..df9ca14 100644 --- a/plugins/astroui/package.nix +++ b/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 + ]; } diff --git a/plugins/lsp.nix b/plugins/lsp.nix index 40ec6e9..a30b62d 100644 --- a/plugins/lsp.nix +++ b/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"; }; diff --git a/plugins/markdown-preview.nix b/plugins/markdown-preview.nix index 1f3d548..fb83b6d 100644 --- a/plugins/markdown-preview.nix +++ b/plugins/markdown-preview.nix @@ -5,7 +5,7 @@ _: { opts = { enable = true; - settings.auto_close = false; + settings.auto_close = 0; }; rootOpts.keymaps = [ diff --git a/plugins/notify.nix b/plugins/notify.nix index fd5d7c1..da23b6d 100644 --- a/plugins/notify.nix +++ b/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 = [ diff --git a/plugins/nvim-ufo.nix b/plugins/nvim-ufo.nix index 90b2672..5305229 100644 --- a/plugins/nvim-ufo.nix +++ b/plugins/nvim-ufo.nix @@ -6,7 +6,7 @@ _: opts = { enable = true; - preview.mappings = { + settings.preview.mappings = { scrollB = ""; scrollD = ""; scrollF = ""; @@ -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 diff --git a/plugins/surround.nix b/plugins/vim-surround.nix similarity index 100% rename from plugins/surround.nix rename to plugins/vim-surround.nix diff --git a/plugins/web-devicons.nix b/plugins/web-devicons.nix new file mode 100644 index 0000000..4701491 --- /dev/null +++ b/plugins/web-devicons.nix @@ -0,0 +1,3 @@ +_:{ + opts.enable = true; +}