From ca66362ce6a2f7a01ccae6167389fec12d6082c6 Mon Sep 17 00:00:00 2001 From: noe Date: Wed, 11 Sep 2024 18:03:40 -0700 Subject: [PATCH] lix 1.91 + build optimization + ps2live --- flake.lock | 20 ++++++++++---------- flake.nix | 4 ++-- nixos/client.nix | 2 +- secrets/ps2live/saerro.yaml | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 1071055..207ec2f 100644 --- a/flake.lock +++ b/flake.lock @@ -473,15 +473,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1720626042, - "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=", - "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed", + "lastModified": 1723503926, + "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", + "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz" } }, "lix-module": { @@ -494,15 +494,15 @@ ] }, "locked": { - "lastModified": 1720641669, - "narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=", - "rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257", + "lastModified": 1723510904, + "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", + "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz?rev=5c48c833c15bb80d127a398a8c2484d42fdd8257" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" } }, "nix-darwin": { diff --git a/flake.nix b/flake.nix index 27a9932..f9b7536 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -114,7 +114,7 @@ ]; mkNixos = modules: nixpkgs.lib.nixosSystem { - modules = [ lix-module.nixosModules.default ] ++ modules; + modules = [ lix-module.nixosModules.lixFromNixpkgs ] ++ modules; specialArgs = { inherit inputs outputs; }; }; diff --git a/nixos/client.nix b/nixos/client.nix index bf386a9..6a878b8 100644 --- a/nixos/client.nix +++ b/nixos/client.nix @@ -20,6 +20,6 @@ networking.nameservers = lib.mkForce [ "100.80.255.88" - "10.100.1.44" + "10.100.69.69" ]; } diff --git a/secrets/ps2live/saerro.yaml b/secrets/ps2live/saerro.yaml index 2646a01..74b30ff 100644 --- a/secrets/ps2live/saerro.yaml +++ b/secrets/ps2live/saerro.yaml @@ -1,7 +1,7 @@ saerro: ENC[AES256_GCM,data:Cl/d1d7O+sChFqQiBWroaZtGk5PzCp2esfdyT0DmQZBVfpZmnIXsaUBgM2Yjq3Bm6x0+njQr72v0JlWT73FnYSh/6fo8a92KLseysGca505vpdW7ynCFLR7e2Wrumil7iE2rL/SHr/2vbjgttDnjv6EkPqOPqYzD1BAc30frsH0WmZrB3llPhTBdgwdLLZYfJZPYg50oH7q0neeP9JxZaFYpEEkhtIDkObKZiix5gCxgQK0WzOpYyrRR7uCL/zpVNnM05aBpxz6o4GJwepJTy+KAlnmDBQnELrWAepx9EYiQRH7yk0OoKFYLnnP0jVA/PDw8HSA+29w=,iv:0dowkRKlS0IYxgMSCgMFw4EID/zb8GuZ/zsVKohFaRA=,tag:Nu3bDmxVUmGgwB20i7MdCQ==,type:str] metagame: ENC[AES256_GCM,data:4B2br0xdvlVDUmnvrD6g0g==,iv:mv05woLklpk9B4bj7/AEFBGYgRyTS9flv667Ud9FpEc=,tag:mRvB2sGWKzE2RwgyF1kIpQ==,type:str] roombot: ENC[AES256_GCM,data:D4ee3xyiuRYZZUXNR8LFiVjto3r8nZHcgHU/6H/LNH3Yuld0E0fVmV3vABdyqd1HernM4PUXMaEzMhGcajdNvKmof6ItpJPqACL9z7kono4etAotuhk=,iv:W9Ek5Eid+TFJO/7xTl3TYd2PzXiQ7tldIWN0zDEuOSY=,tag:Cg/iGWyy/rQDuYaH4w6Cmg==,type:str] -plapkit: ENC[AES256_GCM,data:LBc8H40xMLIaYt+cEuMqTRDaGO2vLsoz90hrsRFUohqLnHEkXcfbr4qj+kZmnQ7zQJ1GHPTz5jvY6BLjsXjrRpK1JqaIdxkVGSmk/Hbp84bF0vHTvtEDSa91ga2nddcUxinOS4lFNdWfWJW9qJ++Cbc7RBi7IAh12Q==,iv:ycLyMrWsz0aNT7cOqGD1AYFrdGOiBRtvDhhFp6DSS78=,tag:5sV1+mgib/+/DtDGnWBM0A==,type:str] +plapkit: ENC[AES256_GCM,data:l3Cbee96LTf+3X5hqYpMPDEeYrgOGbhvLj6NZ6tpxFr56Cxnj6Nj3s5lcT0dudG3u17HXWSUkHf41v70DkpSANcjCZ7MZbfNnUQIhrHyA2mU/ejcP9qpzdCRcj2+wk83HDwWUDRBoOS99GfvVTbis162ih1K629Omg==,iv:LPR0A2Rw9cGC7mYTNfb/3S5IHW9zwyeAp12B8DasSgE=,tag:oeAOEugAWFKJiQDdnvX1qA==,type:str] sops: kms: [] gcp_kms: [] @@ -44,8 +44,8 @@ sops: RHpySU8wMUI0VlRBek1TZ1R4eTZuYmsKYK1nW3njBGyAsihttauYMNzq16StUjW/ ui/Cn136JiYAUTkSG8yEHaSGoI32vabNuLNJDnG6fdvgqhDeJTGBBw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-06-26T21:48:46Z" - mac: ENC[AES256_GCM,data:mHoG3UwuMi/8EQy2KvmHFHPXA2T6N6393Kr4bGlisbcBGMmF+3At0ofuWGVhq8tIeIYDIdd8EYdOSJbwaUFW0TqVUdtVma1Rb1x6dqn2pU6Tj+j0B/3SmmGeZPSQ5vY7msOSdpHiTbLfY2PohFRtk4NGLj91GEGksilmoSn/AzA=,iv:y1ExjtlFDVoby1G6/5wdgiBujlt/kIHQOW/18nZYoNI=,tag:6PgdtVTEdDqyJAXW0hCMZg==,type:str] + lastmodified: "2024-09-12T01:01:41Z" + mac: ENC[AES256_GCM,data:G+Tv1RSIKTTvtroRH1FLV0tLgHiDYQJZRRTyDhVom8qnOctjAwEuFcJ2bAvO5rPNhcqN+K/uVhXWJxJEeTNMYo6h1S926sbEZer1LyiWudFr0t39hotwBr7HU0t4mKLvqkwzpktgVFkvrGaminC3+Iv73e4Nepgrl1GSrLjxCs4=,iv:3dUsd03s7ZxWiNlwGjjA5Ls8qXPCIwFLG8DROie8mQU=,tag:MJ7biy5MNyqkGt/kdhd1eA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.9.0