From 6056c1364fbca7a966b2694b40f8e32e6a069190 Mon Sep 17 00:00:00 2001 From: niten Date: Thu, 18 May 2023 10:42:06 -0700 Subject: [PATCH] Update deps --- config/hardware/lambda.nix | 2 +- flake.lock | 119 +++++++++++++++++++------------------ flake.nix | 12 +--- 3 files changed, 65 insertions(+), 68 deletions(-) diff --git a/config/hardware/lambda.nix b/config/hardware/lambda.nix index e8cbb58..7255cbc 100644 --- a/config/hardware/lambda.nix +++ b/config/hardware/lambda.nix @@ -64,7 +64,7 @@ in { "/home" = { device = "/dev/mapper/lambda-unlocked"; fsType = "btrfs"; - options = [ "noatime" "compress=zstd" "noexec" "subvol=@home" ]; + options = [ "noatime" "compress=zstd" "subvol=@home" ]; }; "/var/log" = { device = "/dev/mapper/lambda-unlocked"; diff --git a/flake.lock b/flake.lock index 08329fd..b2db513 100644 --- a/flake.lock +++ b/flake.lock @@ -3,26 +3,26 @@ "blobs": { "flake": false, "locked": { - "lastModified": 0, + "lastModified": 1684298638, "narHash": "sha256-Ri2mFXWPNLpuOJDer0FSVmDyswjZ6xUHoFq7eqlt1Ao=", - "path": "/state/secrets/blobs", + "path": "/secrets/blobs", "type": "path" }, "original": { - "path": "/state/secrets/blobs", + "path": "/secrets/blobs", "type": "path" } }, "build-seed": { "flake": false, "locked": { - "lastModified": 1635809629, + "lastModified": 1684298635, "narHash": "sha256-6rzGK/itD/RBRoNGw1L2wLV1IcVbn2b0V49ay1J9z7k=", - "path": "/state/secrets/build.seed", + "path": "/secrets/build.seed", "type": "path" }, "original": { - "path": "/state/secrets/build.seed", + "path": "/secrets/build.seed", "type": "path" } }, @@ -1189,26 +1189,26 @@ "dnssec-keys": { "flake": false, "locked": { - "lastModified": 1636405858, + "lastModified": 1684298635, "narHash": "sha256-KGZFtyc7Sd5mGjLxnM+R/XnCtOwyZ4IuOMcblIjlCnM=", - "path": "/state/secrets/dnssec-keys", + "path": "/secrets/dnssec-keys", "type": "path" }, "original": { - "path": "/state/secrets/dnssec-keys", + "path": "/secrets/dnssec-keys", "type": "path" } }, "dnssec-ksks": { "flake": false, "locked": { - "lastModified": 1683356935, + "lastModified": 1684298638, "narHash": "sha256-jB53hHlzV/QvjedU38zpiZQl+43klmFsswMGhWonR7c=", - "path": "/state/secrets/dnssec", + "path": "/secrets/dnssec", "type": "path" }, "original": { - "path": "/state/secrets/dnssec", + "path": "/secrets/dnssec", "type": "path" } }, @@ -1425,13 +1425,13 @@ "filesystem-keys": { "flake": false, "locked": { - "lastModified": 1634322891, + "lastModified": 1684298634, "narHash": "sha256-K2wdsA4vcNTaLR9A9qxB+aMaeANL0LXOwBWvUm63lX0=", - "path": "/state/secrets/filesystem-keys", + "path": "/secrets/filesystem-keys", "type": "path" }, "original": { - "path": "/state/secrets/filesystem-keys", + "path": "/secrets/filesystem-keys", "type": "path" } }, @@ -2034,11 +2034,11 @@ ] }, "locked": { - "lastModified": 1683837890, - "narHash": "sha256-y//EIz15wflQknpKzg8KqTYYcDJClFhZ85NN42Wm7cU=", + "lastModified": 1684342863, + "narHash": "sha256-bx6TtJUv1x9PL7Ptecs0pA7LXAWzu7rxyiMlqZSKOrU=", "ref": "refs/heads/master", - "rev": "0d65fc63b8e38501d3565ac5a40350bdeb2f8eff", - "revCount": 136, + "rev": "45f0457328e0bdf5dbc6c103af0d703d46d9a2b2", + "revCount": 138, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -2089,14 +2089,17 @@ }, "fudo-lib_2": { "locked": { - "lastModified": 1684281054, - "narHash": "sha256-qt+B8ZIofxYG3BH2ZdjT7nC8cKkZK7h7DpAtwMpRT50=", - "path": "/state/fudo-lib", - "type": "path" + "lastModified": 1684365012, + "narHash": "sha256-nxqOGxDnQLIqUM1taoaGcCc6SfEWmniegsNwCqp8Dbs=", + "ref": "refs/heads/master", + "rev": "179dda3ec621d1d7d02136f61c586d9d6a45acc8", + "revCount": 101, + "type": "git", + "url": "https://git.fudo.org/fudo-nix/lib.git" }, "original": { - "path": "/state/fudo-lib", - "type": "path" + "type": "git", + "url": "https://git.fudo.org/fudo-nix/lib.git" } }, "fudo-lib_3": { @@ -2188,13 +2191,13 @@ "utils": "utils_22" }, "locked": { - "lastModified": 1684175031, - "narHash": "sha256-DPkpvv0AMxVm3asT14LFDADRm9029hRLQXWV0EaL4k8=", - "path": "/state/secrets", + "lastModified": 1684364838, + "narHash": "sha256-Ul81nyHZHxubxoo4cj9v7GG+Psu/5/DUwyXfXqaxbPo=", + "path": "/secrets", "type": "path" }, "original": { - "path": "/state/secrets", + "path": "/secrets", "type": "path" } }, @@ -2342,11 +2345,11 @@ "utils": "utils_42" }, "locked": { - "lastModified": 1684277086, - "narHash": "sha256-ZVolilPIqfhev+2txay6R+v57m8n5LW7IW7etSj38jI=", + "lastModified": 1684301091, + "narHash": "sha256-l7z38fBOw15opTXR55Z5KgAOtvuXO60WGrVi0LByBPM=", "ref": "with-deps", - "rev": "dfec8f49de6a4cf4e3597d617cf8295cd987b60c", - "revCount": 57, + "rev": "eedb4481a622dce09bda79f426d430412fc55f57", + "revCount": 67, "type": "git", "url": "https://git.fudo.org/fudo-public/nix-helpers.git" }, @@ -2828,11 +2831,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1684215771, - "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { @@ -3113,11 +3116,11 @@ }, "nixpkgs_27": { "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "lastModified": 1684280442, + "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d", "type": "github" }, "original": { @@ -3248,11 +3251,11 @@ }, "nixpkgs_35": { "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "lastModified": 1684280442, + "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d", "type": "github" }, "original": { @@ -3594,26 +3597,26 @@ "service-passwords": { "flake": false, "locked": { - "lastModified": 1683356935, + "lastModified": 1684298635, "narHash": "sha256-91ZjXr3/6KAwglWY9yy14LD5tat0gWkQmDscBILrocs=", - "path": "/state/secrets/service-passwords", + "path": "/secrets/service-passwords", "type": "path" }, "original": { - "path": "/state/secrets/service-passwords", + "path": "/secrets/service-passwords", "type": "path" } }, "service-secrets": { "flake": false, "locked": { - "lastModified": 1661209454, + "lastModified": 1684298638, "narHash": "sha256-+vSD+aI2BUEGFAD5yBcSBZ/Vv9KSQ/KF5WFdId3Qc80=", - "path": "/state/secrets/service-secrets", + "path": "/secrets/service-secrets", "type": "path" }, "original": { - "path": "/state/secrets/service-secrets", + "path": "/secrets/service-secrets", "type": "path" } }, @@ -3656,13 +3659,13 @@ "ssh-keypairs": { "flake": false, "locked": { - "lastModified": 1683437114, + "lastModified": 1684298635, "narHash": "sha256-WhI0zHJxpMvG/tWF4nQKKHh9kQzujmcacqX6RmemdBI=", - "path": "/state/secrets/ssh-keypairs", + "path": "/secrets/ssh-keypairs", "type": "path" }, "original": { - "path": "/state/secrets/ssh-keypairs", + "path": "/secrets/ssh-keypairs", "type": "path" } }, @@ -3769,11 +3772,11 @@ "utils": "utils_46" }, "locked": { - "lastModified": 1684277210, - "narHash": "sha256-4Wg42zU6ASKN925ESnI1+UUb0iJ0SSd1eTzcVcnx3OE=", + "lastModified": 1684431677, + "narHash": "sha256-Zs/Dj7n19fcGl5ZT80KJDF4iDaWKzfuyv7OICwKoJEo=", "ref": "refs/heads/master", - "rev": "20a1c1ccb532986cec5952fd505d1fd4738d32ce", - "revCount": 10, + "rev": "92267934554fdfd5ed0ed00fb5b3f84bc109f5ba", + "revCount": 14, "type": "git", "url": "https://git.fudo.org/fudo-public/tattler.git" }, @@ -3815,11 +3818,11 @@ }, "unstableNixpkgs_2": { "locked": { - "lastModified": 1684215771, - "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a99d4e4..ec88c6a 100644 --- a/flake.nix +++ b/flake.nix @@ -16,17 +16,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - fudo-lib = { - #url = "git+https://git.fudo.org/fudo-nix/lib.git"; - url = "path:/state/fudo-lib"; - }; + fudo-lib = { url = "git+https://git.fudo.org/fudo-nix/lib.git"; }; - fudo-pkgs = { - url = "git+https://git.fudo.org/fudo-nix/pkgs.git"; - #url = "path:/state/fudo-pkgs"; - }; + fudo-pkgs = { url = "git+https://git.fudo.org/fudo-nix/pkgs.git"; }; - fudo-secrets.url = "path:/state/secrets"; + fudo-secrets.url = "path:/secrets"; chute.url = "git+https://git.fudo.org/chute/chute.git?ref=stable";