diff --git a/flake.lock b/flake.lock index 94f5538..5484312 100644 --- a/flake.lock +++ b/flake.lock @@ -144,27 +144,6 @@ "type": "indirect" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "vpn-confinement", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -291,11 +270,11 @@ }, "hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -354,11 +333,11 @@ ] }, "locked": { - "lastModified": 1728791962, - "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "64c6325b28ebd708653dd41d88f306023f296184", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -376,11 +355,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1728779945, - "narHash": "sha256-RFKyZygnUbJlWq1uBn4JvEEcQKZW3AFBL3bQoywECPI=", + "lastModified": 1729979773, + "narHash": "sha256-FWW4FuCaXl5mCNv3DJmOuabXkQTsQZcww8C875HQ7s0=", "owner": "astro", "repo": "microvm.nix", - "rev": "4d81c4115ef832880561f243efec21f06d2a8b7c", + "rev": "7f30633d2739705dd0d6dabd95a92cdab6e19017", "type": "github" }, "original": { @@ -438,11 +417,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -460,11 +439,11 @@ ] }, "locked": { - "lastModified": 1728179514, - "narHash": "sha256-mOGZFPYm9SuEXnYiXhgs/JmLu7RofRaMpAYyJiWudkc=", + "lastModified": 1729994042, + "narHash": "sha256-raAG3cW29BRYmu3Pxej65QgnNi88bGUqlqMkuaJRF8s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "018196c371073d669510fd69dd2f6dc0ec608c41", + "rev": "88bf73817636e232513bff1f3a071b3ae2bcfd14", "type": "github" }, "original": { @@ -482,11 +461,11 @@ ] }, "locked": { - "lastModified": 1728860000, - "narHash": "sha256-Ql5wSa6mnCT+1NfJYPk0gP6MQrTaP5u2raR8J6YQXxI=", + "lastModified": 1729717678, + "narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "b8ebac4acc72aa17e0fb8d893d0050d68843154a", + "rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", "type": "github" }, "original": { @@ -498,11 +477,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -530,11 +509,11 @@ }, "nur": { "locked": { - "lastModified": 1728871971, - "narHash": "sha256-9DA3YgtiAC7ADY0Qsjnz95R8jebLJQcdg37dZIgEtdI=", + "lastModified": 1730021733, + "narHash": "sha256-VcnseUulfsZM4sXq+oC3cKTSrkVNLp7fJTchJIGCyi4=", "owner": "nix-community", "repo": "NUR", - "rev": "97bf2fe3008121ebd4a71ffc01ddd6bb8a6345c2", + "rev": "c99f74da05c901e064eb98218844ad652f7f9216", "type": "github" }, "original": { @@ -635,11 +614,11 @@ ] }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -747,11 +726,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1729102213, - "narHash": "sha256-KLi7sZmf+D8d6JYVmJs2WVNLhJgtjvJPPdm2ekbrpDI=", + "lastModified": 1729978972, + "narHash": "sha256-22JoG/jIZGdQvBtIn4AYkjcjKeUoaLCfquN5Di+EhGw=", "owner": "Open-Wine-Components", "repo": "umu-launcher", - "rev": "a6b84b1aed6582ab2a500e5d109548b5ce64b97c", + "rev": "72499f349ca81cb2838eced9d7c465b2cf71c4a2", "type": "github" }, "original": { @@ -780,18 +759,12 @@ } }, "vpn-confinement": { - "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1728856097, - "narHash": "sha256-GcheritdNs1AHFWksLWZOe48J0NXUibiZVSewqWfo44=", + "lastModified": 1729977304, + "narHash": "sha256-T/ABQpSbPJxO7TGl1P2fBd87xsQmnVflIFgHQTxwvBs=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "eb39d4c45db70818d58239454fd7747aab5e1871", + "rev": "3b11ba59f1c852493203b86c8acd715259a6c3cd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3253fda..50316c6 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,16 @@ just home-manager sops - colmena + ## TODO remove after https://github.com/zhaofengli/colmena/pull/228 is merged + (colmena.overrideAttrs (final: prev: { + nativeBuildInputs = prev.nativeBuildInputs ++ [pkgs.makeBinaryWrapper]; + postInstall = + prev.postInstall + + '' + wrapProgram $out/bin/colmena \ + --prefix PATH ":" "${pkgs.lib.makeBinPath [pkgs.nixVersions.nix_2_18]}" + ''; + })) git-agecrypt inputs.nvfetcher.packages.${pkgs.system}.default ]; @@ -78,6 +87,5 @@ nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; nvfetcher.inputs.nixpkgs.follows = "nixpkgs"; microvm.inputs.nixpkgs.follows = "nixpkgs"; - vpn-confinement.inputs.nixpkgs.follows = "nixpkgs"; }; }