From 6265bc8374150bf163f3929c5cf461a3ee39f881 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 23 Mar 2024 14:17:09 +0800 Subject: [PATCH] flake: update lock file --- flake.lock | 114 ++++++++++++++++-------------- flake.nix | 2 + home/applications/gpg/default.nix | 2 +- hosts/blacksteel/default.nix | 18 ++--- 4 files changed, 73 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 9bf739c..c1c36fe 100755 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1709561402, - "narHash": "sha256-rPGuqkPmaeLz+pHxoPkUw/nANLB9uX3OgYoP60aRJxM=", + "lastModified": 1710051124, + "narHash": "sha256-46a7BPSAZpoFpXQ/M9rfbs8shfrlqzezct52ln9PYPk=", "owner": "berberman", "repo": "flakes", - "rev": "a56b8e19a8a1b8487aa0a52f42ab4dfbb2b78ca6", + "rev": "f1a1c9a141e3e5a41ffb578ca6ec5365e2dd8458", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1711150329, + "narHash": "sha256-Mcejz4bU3a3ZVgGaCk6B2ktk+DIdMN/LzIbKJNzZXPA=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "270c7d60d37b769a31bb04d61bc73cc2da1b3f6f", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1709682352, - "narHash": "sha256-71S/64RbyADT6FUVJq4WLiNbmcxFvgMsSihf/C2Hgno=", + "lastModified": 1711006105, + "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", "owner": "nix-community", "repo": "disko", - "rev": "ad5e8bd14df2e6bdb836582577dc163318617738", + "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1709710941, - "narHash": "sha256-4FjuX5kGQhvrxkwuB3tAcA7cqNgNW10eZ7qzePfl+kM=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c7bacf1d42e533299c5e3baf74556a0e0ac3d0e", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1709641033, - "narHash": "sha256-Eegyvq56NiXgrDrZ6FgE1lNCD2Mi6aLY/HFOeVG8ZtI=", + "lastModified": 1710837180, + "narHash": "sha256-WVkLclGrUliLJUl+XaJplo09VdxyqHxZtkEmmDW2QYY=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3881267e84cc966ded48601390e88fc13d960319", + "rev": "ded8d23709f94aedb1407bee9e26581f258e9e3a", "type": "github" }, "original": { @@ -218,14 +218,20 @@ ], "nixpkgs": [ "nixpkgs" + ], + "systems": [ + "systems" + ], + "treefmt-nix": [ + "treefmt-nix" ] }, "locked": { - "lastModified": 1709718332, - "narHash": "sha256-xBfSV65VVEHMjthvEij1Bjka5OFR1/YhYE8kcnDyJUo=", + "lastModified": 1710236318, + "narHash": "sha256-RFD2JRxB2knnxTn0wnze9kJWSDghq6GLdAPZsnJJs7I=", "owner": "Guanran928", "repo": "nvim", - "rev": "79fa35d0009a10a871914131a9cc7c8ee8300c34", + "rev": "1c1cb9456f9ed55a38c6cd3b05bb9c3797898016", "type": "github" }, "original": { @@ -241,11 +247,11 @@ ] }, "locked": { - "lastModified": 1709554374, - "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=", + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "type": "github" }, "original": { @@ -290,11 +296,11 @@ ] }, "locked": { - "lastModified": 1709428394, - "narHash": "sha256-WIDKofwDWFLHtk14MdBiRiM8Lxn+OByHYtybjSU/18Q=", + "lastModified": 1711003080, + "narHash": "sha256-YAycKYKMytiQe9L6yZuVcq/1rCFcDHIA6/G78oSofV8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "1f3fa3b398051c815e8500d4c4fe794ecfdee328", + "rev": "1e435616e688c2b9125cd5282febcad3ab981d5e", "type": "github" }, "original": { @@ -344,11 +350,11 @@ ] }, "locked": { - "lastModified": 1709674747, - "narHash": "sha256-itIAFkMPQ6o7SBc5WGp71DABLkgSSHcaObG8Zg1SppA=", + "lastModified": 1711143548, + "narHash": "sha256-osffmh8l5tEaphCQHdbi+U39l6qGcqBPLAwTDBctYf0=", "owner": "jacekszymanski", "repo": "nixcasks", - "rev": "954a0d92b13435a186693671b569ac1fff3ba0e6", + "rev": "347d5d6ecc8ee29e116eab67d1a2e39ffb81c78d", "type": "github" }, "original": { @@ -359,11 +365,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1709410583, - "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", + "lastModified": 1710783728, + "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", + "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "type": "github" }, "original": { @@ -374,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709641832, - "narHash": "sha256-bzzRc3DiV8Cm/67HDa39pyBymqF45ISgUbXqjrMk2UE=", + "lastModified": 1711106783, + "narHash": "sha256-PDwAcHahc6hEimyrgGmFdft75gmLrJOZ0txX7lFqq+I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfa8b30043892dc2b660d403faa159bab7b65898", + "rev": "a3ed7406349a9335cb4c2a71369b697cecd9d351", "type": "github" }, "original": { @@ -406,11 +412,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1709569716, - "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", + "lastModified": 1711124224, + "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "617579a787259b9a6419492eaac670a5f7663917", + "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "type": "github" }, "original": { @@ -461,11 +467,11 @@ }, "nur": { "locked": { - "lastModified": 1709714153, - "narHash": "sha256-2QrzVuItf+IXwVwYNfOA/XB37c6IgPg5cZLLnUJE28I=", + "lastModified": 1711169206, + "narHash": "sha256-d4rrIWJ08aA/Ds6pQ98fWox1uqRmNrPEKqIcvcjUVhU=", "owner": "nix-community", "repo": "NUR", - "rev": "466d739cfde240577a1e201889e489f55bbda6c7", + "rev": "136efcec84c0acf5c2311b663c8e8e78ed463403", "type": "github" }, "original": { @@ -519,11 +525,11 @@ ] }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { @@ -576,11 +582,11 @@ ] }, "locked": { - "lastModified": 1709691047, - "narHash": "sha256-2Vwx1FLufoMEcOS8KAwP8H83IP3Hw6ZPrIDHkSXrFCY=", + "lastModified": 1711159876, + "narHash": "sha256-FqulGFAxIdc1Sku4Hm0c47wxri5OE/z5FTsUI9epeJA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d55139f3061cdf2c8f5f7bc8d49e884826e6a4ea", + "rev": "6529a7975b893c17318cbdd351c771cb8d2c1dcb", "type": "github" }, "original": { @@ -615,11 +621,11 @@ ] }, "locked": { - "lastModified": 1709711091, - "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "type": "github" }, "original": { @@ -673,11 +679,11 @@ ] }, "locked": { - "lastModified": 1709911575, - "narHash": "sha256-yC2iOKe0BSZAeXLNPXPrsGn5BwUTYYZESKb+OblLnXY=", + "lastModified": 1710781103, + "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9c57261c71871d2208a6dd4394774cca226c6dbc", + "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b6eee23..930fa2d 100755 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,8 @@ url = "github:Guanran928/nvim"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; + inputs.treefmt-nix.follows = "treefmt-nix"; + inputs.systems.follows = "systems"; }; nix-darwin = { url = "github:LnL7/nix-darwin"; diff --git a/home/applications/gpg/default.nix b/home/applications/gpg/default.nix index 3de1153..8759f2c 100644 --- a/home/applications/gpg/default.nix +++ b/home/applications/gpg/default.nix @@ -11,6 +11,6 @@ services.gpg-agent = { enable = lib.mkIf pkgs.stdenv.hostPlatform.isLinux true; - pinentryFlavor = "gnome3"; + pinentryPackage = pkgs.pinentry-gnome3; }; } diff --git a/hosts/blacksteel/default.nix b/hosts/blacksteel/default.nix index 19eeb9b..b0d9172 100644 --- a/hosts/blacksteel/default.nix +++ b/hosts/blacksteel/default.nix @@ -29,14 +29,16 @@ eula = true; openFirewall = true; - package = - (pkgs.papermc.overrideAttrs (old: { - version = "1.20.4.454"; - src = old.src.overrideAttrs { - outputHash = "sha256-vH098T6gt/QpM0QOGTzu5VPNWPDYnmF8LQiRK6mDPS8="; - }; - })) - .override {jre = pkgs.temurin-bin;}; + package = pkgs.papermc.override {jre = pkgs.temurin-bin;}; + + # TODO: error: list index 1 is out of bounds + # (pkgs.papermc.overrideAttrs (old: { + # version = "1.20.4.454"; + # src = old.src.overrideAttrs { + # outputHash = "sha256-vH098T6gt/QpM0QOGTzu5VPNWPDYnmF8LQiRK6mDPS8="; + # }; + # })) + # .override {jre = pkgs.temurin-bin;}; # Aikar's flag # https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/