From 585c6c6f1a21d22bb51684431e75531d6f710c32 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 15 Oct 2023 03:12:41 +0200 Subject: [PATCH] fix(deploy): canonicalize previous system toplevel --- flake.lock | 231 ++++++++++++++++++++++++++++++++++++------------ pkgs/deploy.nix | 2 +- 2 files changed, 176 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 654ef41..c59e916 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1695384796, + "lastModified": 1696775529, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1695840507, - "narHash": "sha256-WAZMw/HqNqaCRCx/DDPWzITDIV8ui9c3PaiTzxYPoTE=", + "lastModified": 1696078264, + "narHash": "sha256-NF5G9CHaVWDD6DY0TP8z0cx30dAL1ciFYcVidVvb+NA=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "2e67a4da6749c8b4cd4006233f7eb07eff2a823b", + "rev": "e529da8197f024c0069c4fde6237505e305b8d0a", "type": "github" }, "original": { @@ -105,6 +105,118 @@ "type": "github" } }, + "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1674275109, + "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", + "repo": "base16-vim", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat_2", @@ -222,11 +334,11 @@ ] }, "locked": { - "lastModified": 1695864092, - "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=", + "lastModified": 1697230660, + "narHash": "sha256-Faw7qTLNVZYxW1nBHKhfrKY0lOicJaxxHh5u/Gq4M3Q=", "owner": "nix-community", "repo": "disko", - "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32", + "rev": "6ad5c9c17cbd5514ce0cc2692dd82dd6d8e5d879", "type": "github" }, "original": { @@ -363,11 +475,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -552,11 +664,11 @@ ] }, "locked": { - "lastModified": 1695940293, - "narHash": "sha256-VwnxcgJ97Ky++/JtR92nCkamIZm7sOyuCBn/RDW1ADE=", + "lastModified": 1697323135, + "narHash": "sha256-tlAv11c0NIRTk2IzpFxYknHrveeFXojVyCTAMg749Zg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2ccb5cb542357af20eb18c83f38571da7b3bcff6", + "rev": "d4a5076ea8c2c063c45e0165f9f75f69ef583e20", "type": "github" }, "original": { @@ -567,11 +679,11 @@ }, "impermanence": { "locked": { - "lastModified": 1694622745, - "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=", + "lastModified": 1697303681, + "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", "owner": "nix-community", "repo": "impermanence", - "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e", + "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", "type": "github" }, "original": { @@ -586,11 +698,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1695557304, - "narHash": "sha256-HYoJE+KE6/zGHgRI496n9E1abDFaqsl9EnEfGIEEqLo=", + "lastModified": 1696766909, + "narHash": "sha256-lU1BmCWpQ9cx64YnJKc89lMg9cx4pCokXIbh5J//2t0=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "cb8bfd550aaaf32a330c1c8870a3d9a5bfa00954", + "rev": "9f495e4feea66426589cbb59ac8b972993b5d872", "type": "github" }, "original": { @@ -621,11 +733,11 @@ ] }, "locked": { - "lastModified": 1695847632, - "narHash": "sha256-RXDg0N2e8YYVKkQt7BE40y03QxYEYds4/+HrwpIMPoM=", + "lastModified": 1697304130, + "narHash": "sha256-ovr9mPbMW9UxI1iSeQrIJO8Q2YfLTe8hcRkl6ec0v3c=", "owner": "astro", "repo": "microvm.nix", - "rev": "67bf176ff48141292a66d8bce541463ee49d0fb5", + "rev": "38ce07ca9c5c02c391682defe0bfff947cc5d7a1", "type": "github" }, "original": { @@ -641,11 +753,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1695258303, - "narHash": "sha256-5Ibd9qjkAk04y8GyweQF+ciIaPzRaet3xZAmTDOWCng=", + "lastModified": 1696813662, + "narHash": "sha256-dQTBtvjdzKa7+ViWiDdnBpdtDS4FD+gWuJJrfIrxSkc=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "39657d146828157ef51c4f2d8bebb96a77075fc6", + "rev": "7cdbfd5ffe59fe54fd5c44be96f58c45e25d5b62", "type": "github" }, "original": { @@ -661,11 +773,11 @@ ] }, "locked": { - "lastModified": 1695526222, - "narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=", + "lastModified": 1696736548, + "narHash": "sha256-Dg0gJ9xVXud55sAbXspMapFYZOpVAldQQo7MFp91Vb0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647", + "rev": "2902dc66f64f733bfb45754e984e958e9fe7faf9", "type": "github" }, "original": { @@ -697,11 +809,11 @@ ] }, "locked": { - "lastModified": 1693791338, - "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", + "lastModified": 1696058303, + "narHash": "sha256-eNqKWpF5zG0SrgbbtljFOrRgFgRzCc4++TMFADBMLnc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", + "rev": "150f38bd1e09e20987feacb1b0d5991357532fb5", "type": "github" }, "original": { @@ -712,11 +824,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695887975, - "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", + "lastModified": 1697100850, + "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", + "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", "type": "github" }, "original": { @@ -748,11 +860,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { @@ -764,11 +876,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1695516402, - "narHash": "sha256-pL7m8iu1OLs/7ywhh+Q8ltPgmtwbMpi7484yr32zgYI=", + "lastModified": 1696726172, + "narHash": "sha256-89yxFXzTA7JRyWo6hg7SD4DlS/ejYt8Y8IvGZHbSWsg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "01fc4cd75e577ac00e7c50b7e5f16cd9b6d633e8", + "rev": "59da6ac0c02c48aa92dee37057f978412797db2a", "type": "github" }, "original": { @@ -835,11 +947,11 @@ ] }, "locked": { - "lastModified": 1695933574, - "narHash": "sha256-tnssDhNt4+wBz1s7XWQ4kOWNs8I616E/IOGZLkkD2zQ=", + "lastModified": 1697300259, + "narHash": "sha256-gmLtTy9kuLnw5MekDHY1Roc36kkEsLNTnKq8lSQkD3U=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "d93a29c75d878bce117859e4f7710e1a6bafda4d", + "rev": "6b428305043afaf77119adb44dfea246c809e07f", "type": "github" }, "original": { @@ -850,11 +962,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695256509, - "narHash": "sha256-Je+ZId+dYrx0NOZ8J6le7CwZZdVZAAP5dddxK9kZNfA=", + "lastModified": 1696810678, + "narHash": "sha256-XAw8D1ZEbdqwhSvn8RsgeeNrDktx4YSikTb5V4ArsrA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff7daa56614b083d3a87e2872917b676e9ba62a6", + "rev": "35c640b19a189ce3a86698ce2fdcd87d085a339b", "type": "github" }, "original": { @@ -956,11 +1068,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "lastModified": 1696846637, + "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", "type": "github" }, "original": { @@ -1024,6 +1136,13 @@ "stylix": { "inputs": { "base16": "base16", + "base16-alacritty": "base16-alacritty", + "base16-fish": "base16-fish", + "base16-foot": "base16-foot", + "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", + "base16-vim": "base16-vim", "flake-compat": "flake-compat_6", "home-manager": [ "home-manager" @@ -1033,11 +1152,11 @@ ] }, "locked": { - "lastModified": 1694375893, - "narHash": "sha256-oJGESNjJ/6o6tfuUavBZ7go4Oun7g9YKv7OqaQaY/80=", + "lastModified": 1697094532, + "narHash": "sha256-SvTC0wNCGpoUBvo9//IoTv5NQjozY0Y5ViTziRO+vt8=", "owner": "danth", "repo": "stylix", - "rev": "c3c9f4784b4f08f6676340126858d936edbce1fa", + "rev": "feceaa9d81725c0ca28ab46326b6dd1310a10dea", "type": "github" }, "original": { @@ -1160,11 +1279,11 @@ ] }, "locked": { - "lastModified": 1694528738, - "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", + "lastModified": 1695822946, + "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", + "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a", "type": "github" }, "original": { diff --git a/pkgs/deploy.nix b/pkgs/deploy.nix index f59042b..7265359 100644 --- a/pkgs/deploy.nix +++ b/pkgs/deploy.nix @@ -101,7 +101,7 @@ for host in "''${HOSTS[@]}"; do store_path="''${TOPLEVEL_STORE_PATHS["$host"]}" echo " Applying ⚙️ $host" - prev_system=$(ssh "$host" -- readlink /nix/var/nix/profiles/system) + prev_system=$(ssh "$host" -- readlink -e /nix/var/nix/profiles/system) ssh "$host" -- /run/current-system/sw/bin/nix-env --profile /nix/var/nix/profiles/system --set "$store_path" ssh "$host" -- "$store_path"/bin/switch-to-configuration "$ACTION" if [[ -n "$prev_system" ]]; then