From 3dd920bb8ad335d2e725b0341e5be54a2cb92051 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 30 Mar 2024 15:56:29 +0100 Subject: [PATCH] personal-cli: Add attic to connect to self-hosted caches --- flake.lock | 351 ++++++++++++++++++++++++++++++-------------- flake.nix | 3 + personal-cli/hm.nix | 1 + 3 files changed, 241 insertions(+), 114 deletions(-) diff --git a/flake.lock b/flake.lock index b003fc7..f345f05 100644 --- a/flake.lock +++ b/flake.lock @@ -1,10 +1,32 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1711742460, + "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "attic", + "type": "github" + } + }, "cargo2nix": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_10", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_4" }, "locked": { @@ -24,7 +46,7 @@ }, "comma": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "naersk": [ "naersk" ], @@ -47,9 +69,30 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "devshell": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "nixpkgs": [ "nixvim", "nixpkgs" @@ -87,9 +130,9 @@ }, "fioul": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -107,6 +150,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -122,7 +181,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -138,7 +197,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -152,7 +211,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -208,15 +267,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -227,7 +283,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1701680307, @@ -245,7 +301,7 @@ }, "flake-utils_11": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1701680307, @@ -262,6 +318,24 @@ } }, "flake-utils_12": { + "inputs": { + "systems": "systems_11" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_13": { "inputs": { "systems": "systems_12" }, @@ -279,7 +353,7 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_14": { "inputs": { "systems": "systems_13" }, @@ -297,7 +371,7 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_15": { "inputs": { "systems": "systems_14" }, @@ -315,7 +389,7 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_16": { "inputs": { "systems": "systems_15" }, @@ -333,7 +407,7 @@ "type": "github" } }, - "flake-utils_16": { + "flake-utils_17": { "inputs": { "systems": "systems_16" }, @@ -352,6 +426,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -369,7 +461,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -387,7 +479,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": "systems_5" }, @@ -405,7 +497,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { "systems": "systems_6" }, @@ -423,7 +515,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "inputs": { "systems": "systems_7" }, @@ -441,7 +533,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_8": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -456,7 +548,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_9": { "inputs": { "systems": "systems_8" }, @@ -474,24 +566,6 @@ "type": "github" } }, - "flake-utils_9": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -516,9 +590,9 @@ }, "glaurung": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "naersk": "naersk_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -537,9 +611,9 @@ }, "gsm": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "naersk": "naersk_3", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -664,7 +738,7 @@ "mujmap": { "inputs": { "cargo2nix": "cargo2nix", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "nixpkgs": [ "mujmap", "cargo2nix", @@ -687,7 +761,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1698153314, @@ -705,7 +779,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1698420672, @@ -723,7 +797,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1698420672, @@ -761,7 +835,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": [ "nixpkgs" ] @@ -883,16 +957,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698266953, - "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -913,6 +989,37 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1711739168, + "narHash": "sha256-9UyrGa7PnV81rZMYDUWJJTGRvasUDqLMMjXNlZKU4eE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5102995fe26a6095281bc8c7b654e0d4a7fceda9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-traxys": { "locked": { "lastModified": 1692884435, @@ -930,6 +1037,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1682600000, "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", @@ -945,7 +1068,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1710631334, "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", @@ -961,7 +1084,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -977,7 +1100,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -994,6 +1117,20 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1698266953, + "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1698266953, "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=", @@ -1009,7 +1146,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -1025,21 +1162,21 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_5": { + "locked": { + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1699343069, "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", @@ -1055,7 +1192,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -1071,7 +1208,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1707268954, "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", @@ -1085,7 +1222,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1707268954, "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", @@ -1101,26 +1238,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -1928,8 +2049,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_11", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_12", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -1956,7 +2077,7 @@ }, "raclette": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_13", "hyperfine": "hyperfine", "naersk": [ "naersk" @@ -1982,7 +2103,7 @@ }, "roaming_proxy": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "naersk": [ "naersk" ], @@ -2007,6 +2128,7 @@ }, "root": { "inputs": { + "attic": "attic", "comma": "comma", "fast-syntax-highlighting": "fast-syntax-highlighting", "fioul": "fioul", @@ -2023,7 +2145,8 @@ "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-traxys": "nixpkgs-traxys", "nixvim": "nixvim", "nur": "nur", @@ -2084,8 +2207,8 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1698199907, @@ -2103,8 +2226,8 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1699495996, @@ -2122,8 +2245,8 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1707358215, @@ -2168,8 +2291,8 @@ }, "rust-overlay_5": { "inputs": { - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_14", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1710123130, @@ -2187,8 +2310,8 @@ }, "rust-overlay_6": { "inputs": { - "flake-utils": "flake-utils_15", - "nixpkgs": "nixpkgs_13" + "flake-utils": "flake-utils_16", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1699150490, @@ -2206,7 +2329,7 @@ }, "rust-overlay_7": { "inputs": { - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_17", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index e22bf14..5340a66 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:nixos/nixpkgs"; nixpkgs-traxys.url = "github:traxys/nixpkgs/inflight"; nix-gaming = { url = "github:fufexan/nix-gaming"; @@ -39,6 +40,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; gsm.url = "github:traxys/git-series-manager"; + attic.url = "github:zhaofengli/attic"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -320,6 +322,7 @@ inherit (nixpkgs-traxys.legacyPackages."${system}") groovy-language-server; inherit (inputs.mujmap.packages."${system}") mujmap; + inherit (inputs.attic.packages."${system}") attic; }; in packages diff --git a/personal-cli/hm.nix b/personal-cli/hm.nix index d5f1925..3c2f229 100644 --- a/personal-cli/hm.nix +++ b/personal-cli/hm.nix @@ -21,6 +21,7 @@ in { nixpkgs-review nix-init mujmap + attic ]; services.syncthing.enable = true;