From 743660d41476e5aa165c64563749e20a03be0901 Mon Sep 17 00:00:00 2001 From: nzbr Date: Sun, 2 Jun 2024 02:45:30 +0200 Subject: [PATCH 1/2] fix: nixFlakes -> nix --- flake.nix | 2 +- scripts/encrypt | 2 +- scripts/update-keys | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4ab6114..d318fc7 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ bash gnused jq - nixFlakes + nix nixfmt python3 rage diff --git a/scripts/encrypt b/scripts/encrypt index dc4b97d..1cbdf04 100644 --- a/scripts/encrypt +++ b/scripts/encrypt @@ -14,7 +14,7 @@ for input in "$@"; do fi done -nixInstantiate=@nixFlakes@/bin/nix-instantiate +nixInstantiate=@nix@/bin/nix-instantiate sedBin=@gnused@/bin/sed ageBin=@rage@/bin/rage diff --git a/scripts/update-keys b/scripts/update-keys index ff45120..dc4b113 100644 --- a/scripts/update-keys +++ b/scripts/update-keys @@ -24,7 +24,7 @@ def fetchKeys(user: str, url: str) -> []: filename = "authorizedKeys.nix" data = json.loads( - subprocess.check_output(["@nixFlakes@/bin/nix", "eval", "--json", "-f", filename]) + subprocess.check_output(["@nix@/bin/nix", "eval", "--json", "-f", filename]) ) data["keys"] = { @@ -34,7 +34,7 @@ data["keys"] = { nix = subprocess.check_output( ["@nixfmt@/bin/nixfmt"], input = subprocess.check_output( - ["@nixFlakes@/bin/nix", "eval", "--impure", "--expr", "builtins.fromJSON (builtins.readFile \"/dev/stdin\")"], + ["@nix@/bin/nix", "eval", "--impure", "--expr", "builtins.fromJSON (builtins.readFile \"/dev/stdin\")"], input=json.dumps(data).encode("UTF-8") ) ).decode("UTF-8") From cc3dda0763af5ad295b2047f06be393752a58e9c Mon Sep 17 00:00:00 2001 From: nzbr Date: Sun, 2 Jun 2024 02:49:34 +0200 Subject: [PATCH 2/2] chore: update to 24.05 --- flake.lock | 121 +++++++++++++++++++++++++++++++++++++++++++---------- flake.nix | 4 +- 2 files changed, 102 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index f4a803e..768baf9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,19 @@ "nodes": { "agenix": { "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1652712410, - "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -23,15 +26,37 @@ "darwin": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1661154924, - "narHash": "sha256-zwkShc4VZ9feLeIrWjdm6YkZBoobzXETF5xIIgi++Ec=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5af1aa51f63d734284bf6728a21d2c9c31eb7492", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "darwin_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -52,11 +77,11 @@ ] }, "locked": { - "lastModified": 1659725433, - "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=", + "lastModified": 1715699772, + "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", "owner": "serokell", "repo": "deploy-rs", - "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb", + "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", "type": "github" }, "original": { @@ -68,11 +93,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -82,12 +107,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -96,18 +124,39 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1661094678, - "narHash": "sha256-RtaVb6SqfrgCi20gdju1ogS3u1ocyLnhsgolazrCwL0=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23534df34c1c499a6c82ce690df06d8c6e4e759d", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -131,12 +180,42 @@ "root": { "inputs": { "agenix": "agenix", - "darwin": "darwin", + "darwin": "darwin_2", "deploy-rs": "deploy-rs", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nmd": "nmd" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d318fc7..e9b3b29 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "TODO: add description"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nmd = { url = "github:nix-basement/nmd"; flake = false; @@ -71,13 +71,13 @@ gnused jq nix - nixfmt python3 rage ; wireguard = pkgs.wireguard-tools; nixpkgs = toString inputs.nixpkgs; + nixfmt = pkgs.nixfmt-rfc-style; }; }) (find "" "${self}/scripts")