From ba5bcf601c02ca81b553c7ffa14dc041be8e217c Mon Sep 17 00:00:00 2001 From: hexchen Date: Tue, 13 Dec 2022 21:01:35 +0000 Subject: [PATCH] flake: update nix-hexchen and remove reference to deploy --- flake.lock | 152 +++++++++++++++++++++++++++++++++++++++++------------ flake.nix | 2 - 2 files changed, 119 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index a5f9b3c..8bd4e11 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,37 @@ "type": "gitlab" } }, + "colmena": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": [ + "nix-hexchen", + "nixpkgs" + ], + "stable": "stable" + }, + "locked": { + "lastModified": 1669917327, + "narHash": "sha256-YYjaNOUJZaM5t35GbWtfX825TlI9LAksbfdhaCYWmfY=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "64c46fa0169233d4faed70c52583cd3183c7f5aa", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "colmena", + "type": "github" + } + }, "cyberchaos": { "inputs": { "digital-nftables": "digital-nftables", "digital-secretFiles": "digital-secretFiles", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nix-hexchen", "nixpkgs" @@ -28,16 +54,17 @@ }, "locked": { "host": "cyberchaos.dev", - "lastModified": 1668290886, - "narHash": "sha256-fkSHW98kVyH8E0bHWvMhgOd/xPfVTEj6/ehaQMhvapk=", + "lastModified": 1670798167, + "narHash": "sha256-qXy2lr7jUjF3Z9i9hS+SPB3Xs8eKpHXBVGXcuKHaOr0=", "owner": "cyberchaoscreatures", "repo": "nixlib", - "rev": "fbad9753debcb7bd6a1d41c450a3fdbe5223c36d", + "rev": "3ee042145ebc6e8c985f1936095496f6ef68b303", "type": "gitlab" }, "original": { "host": "cyberchaos.dev", "owner": "cyberchaoscreatures", + "ref": "update-akkoma", "repo": "nixlib", "type": "gitlab" } @@ -101,17 +128,17 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1660901074, - "narHash": "sha256-3apl0eQlfBj3y0gDdoPp2M6PXYnhxs0QWOHp8B8A9sc=", + "lastModified": 1662497747, + "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "c44bc81a05f3758ceaa28921dd9c830b9c571e61", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", "type": "github" }, "original": { "owner": "doomemacs", - "ref": "master", "repo": "doomemacs", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", "type": "github" } }, @@ -291,7 +318,38 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -385,7 +443,7 @@ "evil-org-mode": "evil-org-mode", "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": [ "nix-hexchen", "flake-utils" @@ -409,22 +467,50 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1665958150, - "narHash": "sha256-LhVCEqZ3JPr/5YuishMI3N9UAK8aam8xAd8eGNkwygk=", + "lastModified": 1669944738, + "narHash": "sha256-gTF/TuQmRMdEqPM1W752A2QHKyGnXo6/2cD94b+8OSg=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "c9a6efdab4bdda28ec372cff97b0557351aa6098", + "rev": "da227e13707789198870deb3222af0f5f12b475d", "type": "github" }, "original": { "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "c9a6efdab4bdda28ec372cff97b0557351aa6098", + "type": "github" + } + }, + "nix-eval-jobs": { + "inputs": { + "flake-utils": [ + "nix-hexchen", + "colmena", + "flake-utils" + ], + "nixpkgs": [ + "nix-hexchen", + "colmena", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660713017, + "narHash": "sha256-w6KLNkT/2fI7UvPg3NoKj7gve4CgUHpyWOFq0BUwW7o=", + "owner": "zhaofengli", + "repo": "nix-eval-jobs", + "rev": "b4c078a4870c5b1a5b74420ca1dca41f4d75b7cc", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "colmena", + "repo": "nix-eval-jobs", "type": "github" } }, "nix-hexchen": { "inputs": { + "colmena": "colmena", "cyberchaos": "cyberchaos", "deploy-rs": [ "deploy-rs" @@ -439,7 +525,7 @@ "nix-doom-emacs", "emacs-overlay" ], - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": [ "deploy-rs", "utils" @@ -452,16 +538,15 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "nixpkgs-bindfix": "nixpkgs-bindfix", "sops-nix": "sops-nix", "waybar-iceportal": "waybar-iceportal" }, "locked": { - "lastModified": 1669389263, - "narHash": "sha256-3wlJRLaCC4UrPN71TPVtxxANoVTX6H8Dceot4EZD3x8=", + "lastModified": 1670963693, + "narHash": "sha256-Aefm7Dsv8C7DdaLmhWjIPjNBgWA6pcGihmN6oPPjkDE=", "owner": "hexchen", "repo": "nixfiles", - "rev": "9774eef022655866e4bc4183425eeaba7babc313", + "rev": "86eb5c7dd9758bd44b6af35842b06c62cad82ea4", "type": "gitlab" }, "original": { @@ -543,21 +628,6 @@ "type": "github" } }, - "nixpkgs-bindfix": { - "locked": { - "lastModified": 1646653989, - "narHash": "sha256-X7cClFjpVm5emaEg9eABeXvG6yx7HCoTIqOE04ICjxA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bea64c8d594d0074d17a4513a2d2d856b1b0fee0", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "bea64c8d594d0074d17a4513a2d2d856b1b0fee0", - "type": "indirect" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1670267727, @@ -750,6 +820,22 @@ "type": "github" } }, + "stable": { + "locked": { + "lastModified": 1669735802, + "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "ts-fold": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index e4ca202..796f620 100644 --- a/flake.nix +++ b/flake.nix @@ -59,8 +59,6 @@ system = "x86_64-linux"; modules = [ ./hosts/parsons/configuration.nix - # not used anymore, but other things in nix-hexchen still depend on it - nix-hexchen.nixosModules.deploy { nixpkgs.pkgs = pkgs; } ]; specialArgs = {