From bd970253f2e0435498b8ca99265bc3ab7ccb5063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 19 Mar 2025 18:52:30 +0100 Subject: [PATCH 1/2] chore: update flake inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixvim': 'github:nix-community/nixvim/78f6166c23f80bdfbcc8c44b20f7f4132299a33f' (2025-03-17) → 'github:nix-community/nixvim/d79c291d5d80d587d518e0f530cc55adb0638c80' (2025-03-19) • Updated input 'nixvim/nixpkgs': 'github:NixOS/nixpkgs/1da52dd49a127ad74486b135898da2cef8c62665' (2025-02-05) → 'github:NixOS/nixpkgs/3549532663732bfd89993204d40543e9edaec4f2' (2025-03-18) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753' (2025-03-18) → 'github:numtide/treefmt-nix/adc195eef5da3606891cedf80c0d9ce2d3190808' (2025-03-19) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index cfb2758..c572d7f 100644 --- a/flake.lock +++ b/flake.lock @@ -293,11 +293,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1742272065, + "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "3549532663732bfd89993204d40543e9edaec4f2", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1742255305, - "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", + "lastModified": 1742396414, + "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", "owner": "nix-community", "repo": "nixvim", - "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", + "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1742303424, - "narHash": "sha256-2R7cGdcA2npQQcIWu2cTlU63veTzwVZe78BliIuJT00=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { -- 2.48.1 From 3838039ceecd6509218e0078bc97418ca750964d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 19 Mar 2025 19:11:16 +0100 Subject: [PATCH 2/2] chore: update nvim-silicon plugin Also fix `just update-vim-plugins` as it was broken by the recent refactor. --- justfile | 23 ++++++++++------------- modules/nixvim/extraPlugins/generated.nix | 6 +++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/justfile b/justfile index a88bd00..4021089 100644 --- a/justfile +++ b/justfile @@ -13,22 +13,19 @@ run-vm: build-vm update-vim-plugins: #!/bin/sh - # Use local nixpkgs if available - nixpkgs="$HOME/Dev/nixpkgs" + plugindir=./modules/nixvim/extraPlugins # copy nixpkgs from local checkout - if [ ! -d "$nixpkgs" ]; then - nixpkgs="$(mktemp -d)" - cp -r /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/. "$nixpkgs" - cd "$nixpkgs" - git init . - git add . - git commit -m 'dummy commit' - cd - - fi + nixpkgs="$(mktemp -d)" + cp -r /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/. "$nixpkgs" + cd "$nixpkgs" + git init . + git add . + git commit -m 'dummy commit' + cd - # update vim plugins - nix run nixpkgs#vimPluginsUpdater -- --proc=1 --nixpkgs "$nixpkgs" --no-commit -i ./nvim/extraPlugins/plugins -o ./nvim/extraPlugins/generated.nix update + nix run nixpkgs#vimPluginsUpdater -- --proc=1 --nixpkgs "$nixpkgs" --no-commit -i "$plugindir/plugins" -o "$plugindir/generated.nix" update # format the generated output - nix fmt ./nvim/extraPlugins/generated.nix + nix fmt "$plugindir/generated.nix" # Amend Update flake.lock PR flake-pr: diff --git a/modules/nixvim/extraPlugins/generated.nix b/modules/nixvim/extraPlugins/generated.nix index e4d204b..f0a2fcf 100644 --- a/modules/nixvim/extraPlugins/generated.nix +++ b/modules/nixvim/extraPlugins/generated.nix @@ -10,12 +10,12 @@ final: prev: { nvim-silicon = buildVimPlugin { pname = "nvim-silicon"; - version = "2024-08-31"; + version = "2025-01-09"; src = fetchFromGitHub { owner = "michaelrommel"; repo = "nvim-silicon"; - rev = "9fe6001dc8cad4d9c53bcfc8649e3dc76ffa169c"; - sha256 = "1qczi06yndkr2pmwidlkgmk0395x189sznvscn4fnr96jx58j5yl"; + rev = "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32"; + sha256 = "1zk6lgghvdcys20cqvh2g1kjf661q1w97niq5nx1zz4yppy2f9jy"; }; meta.homepage = "https://github.com/michaelrommel/nvim-silicon/"; }; -- 2.48.1