diff --git a/flake.lock b/flake.lock index c9427f7c..7911719e 100644 --- a/flake.lock +++ b/flake.lock @@ -86,28 +86,6 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1707922053, - "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -130,27 +108,6 @@ } }, "crane_2": { - "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" - } - }, - "crane_3": { "inputs": { "flake-compat": [ "lanzaboote", @@ -188,7 +145,7 @@ "devshell": "devshell", "flake-parts": "flake-parts_2", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pnpm2nix": "pnpm2nix", "pre-commit-hooks": "pre-commit-hooks" }, @@ -231,8 +188,8 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1711099426, @@ -285,22 +242,6 @@ } }, "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, @@ -316,7 +257,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -332,7 +273,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -465,40 +406,7 @@ "type": "github" } }, - "flake-utils_10": { - "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_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -516,7 +424,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": "systems_4" }, @@ -534,7 +442,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_5" }, @@ -552,7 +460,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": "systems_7" }, @@ -570,7 +478,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { "systems": "systems_8" }, @@ -588,7 +496,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { "systems": "systems_9" }, @@ -606,7 +514,7 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { "systems": "systems_10" }, @@ -624,6 +532,24 @@ "type": "github" } }, + "flake-utils_9": { + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -842,10 +768,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_3", - "flake-compat": "flake-compat_3", + "crane": "crane_2", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], @@ -869,7 +795,7 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ], @@ -930,7 +856,7 @@ "inputs": { "flake-parts": "flake-parts_3", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -950,7 +876,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1707614138, @@ -1079,7 +1005,7 @@ }, "nixos-licheepi4a": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1709742425, @@ -1097,9 +1023,9 @@ }, "nixos-rk3588": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixos-generators": "nixos-generators_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { @@ -1118,11 +1044,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -1185,22 +1111,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1702780907, - "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1704874635, "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", @@ -1216,7 +1126,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -1232,7 +1142,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1707786466, "narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=", @@ -1248,7 +1158,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1704874635, "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", @@ -1280,39 +1190,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1702921762, - "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1703134684, "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", @@ -1328,7 +1206,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1706732774, "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", @@ -1344,7 +1222,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1707451808, "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", @@ -1360,7 +1238,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1691280485, "narHash": "sha256-/8Ct9092OC1TTNzHgbcE9ejQdS2QxZYGqrWXEwUxdtQ=", @@ -1376,7 +1254,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1709309926, "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", @@ -1392,7 +1270,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1707956935, "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", @@ -1408,7 +1286,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -1422,9 +1300,25 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1702921762, + "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nuenv": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -1443,7 +1337,7 @@ }, "nur-ryan4yin": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1705366605, @@ -1461,7 +1355,7 @@ }, "pnpm2nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "daeuniverse", "nixpkgs" @@ -1499,14 +1393,14 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_4", "gitignore": "gitignore", "nixpkgs": [ "daeuniverse", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1706424699, @@ -1537,7 +1431,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1681413034, @@ -1588,13 +1482,13 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_10", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_9", "gitignore": "gitignore_4", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1708018599, @@ -1615,7 +1509,6 @@ "agenix": "agenix", "anyrun": "anyrun", "astronvim": "astronvim", - "attic": "attic", "daeuniverse": "daeuniverse", "disko": "disko", "doomemacs": "doomemacs", @@ -1632,9 +1525,9 @@ "nixos-hardware": "nixos-hardware", "nixos-licheepi4a": "nixos-licheepi4a", "nixos-rk3588": "nixos-rk3588", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-stable": "nixpkgs-stable_4", + "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", @@ -1695,7 +1588,7 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nuenv", "nixpkgs" diff --git a/flake.nix b/flake.nix index 37a5cdf4..633efafc 100644 --- a/flake.nix +++ b/flake.nix @@ -111,8 +111,6 @@ daeuniverse.url = "github:daeuniverse/flake.nix"; # daeuniverse.url = "github:daeuniverse/flake.nix/exp"; - attic.url = "github:zhaofengli/attic"; - haumea = { url = "github:nix-community/haumea/v0.2.2"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/base/core/core.nix b/home/base/core/core.nix index b4694b48..c172b59b 100644 --- a/home/base/core/core.nix +++ b/home/base/core/core.nix @@ -1,6 +1,5 @@ { pkgs, - attic, nur-ryan4yin, ... }: { @@ -52,8 +51,6 @@ # productivity caddy # A webserver with automatic HTTPS via Let's Encrypt(replacement of nginx) croc # File transfer between computers securely and easily - # self-hosted nix cache server - attic.packages.${pkgs.system}.attic-client ncdu # analyzer your disk usage Interactively, via TUI(replacement of `du`) ]; diff --git a/hosts/12kingdoms-rakushun/README.md b/hosts/12kingdoms-rakushun/README.md index 861fac06..68c16df2 100644 --- a/hosts/12kingdoms-rakushun/README.md +++ b/hosts/12kingdoms-rakushun/README.md @@ -20,7 +20,6 @@ Services: 1. prometheus + alertmanager + grafana + loki: Monitor the metrics/logs of my homelab. 1. restic: Backup my personal data to cloud or NAS. 1. synthing: Sync file between android/macbook/PC and NAS. -1. attic: Nix cache server. 1. gitea: Self-hosted git service. 1. sftpgo: SFTP server. 1. transmission & AriaNg: Torrent downloader and HTTP downloader diff --git a/hosts/12kingdoms-rakushun/attic.nix b/hosts/12kingdoms-rakushun/attic.nix deleted file mode 100644 index 29e2147a..00000000 --- a/hosts/12kingdoms-rakushun/attic.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - config, - attic, - ... -}: { - #===================================================== - # - # Attic - # - # A self-hostable Nix Binary Cache server - # backed by an S3-compatible storage provider - # - # https://docs.attic.rs/tutorial.html - # - #===================================================== - - imports = [ - attic.nixosModules.atticd - ]; - - # Self-Hosted Nix Cache Server - # https://github.com/zhaofengli/attic - # - # The first thing to do after setting up the server is: - # 1. Generate a admin token on the server via command: - # `sudo atticd-atticadm make-token --sub "admin-1" --validity "2y" --pull "*" --push "*" --delete "*" --create-cache "*" --configure-cache "*" --configure-cache-retention "*" --destroy-cache "*"` - # 2. Login at the desktop via command: - # `attic login central http://attic.writefor.fun ` - # 3. Create a new cache via command: - # `attic cache create central` - # `attic use central` - # 4. Push Caches to the cache server via: - # # push the nixos system's cache - # nom build ".#nixosConfigurations.rakushun.config.system.build.toplevel" --show-trace --verbose - # attic push central result - # - # it's similar to cachix, related docs: - # https://docs.attic.rs/reference/attic-cli.html - # https://docs.cachix.org/pushing#pushing - services.atticd = { - enable = true; - - # Replace with absolute path to your credentials file - # The HS256 JWT secret can be generated with the openssl: - # openssl rand 64 | base64 -w0 - # - # Content: - # ATTIC_SERVER_TOKEN_HS256_SECRET_BASE64="output from openssl" - credentialsFile = config.age.secrets."attic-nix-cache-server.env".path; - - settings = { - listen = "127.0.0.1:3300"; - - # Data chunking - # - # Warning: If you change any of the values here, it will be - # difficult to reuse existing chunks for newly-uploaded NARs - # since the cutpoints will be different. As a result, the - # deduplication ratio will suffer for a while after the change. - chunking = { - # The minimum NAR size to trigger chunking - # - # If 0, chunking is disabled entirely for newly-uploaded NARs. - # If 1, all NARs are chunked. - nar-size-threshold = 64 * 1024; # 64 KiB - - # The preferred minimum size of a chunk, in bytes - min-size = 16 * 1024; # 16 KiB - - # The preferred average size of a chunk, in bytes - avg-size = 64 * 1024; # 64 KiB - - # The preferred maximum size of a chunk, in bytes - max-size = 256 * 1024; # 256 KiB - }; - }; - }; -} diff --git a/hosts/12kingdoms-rakushun/caddy.nix b/hosts/12kingdoms-rakushun/caddy.nix index ba2d3d3e..94cdb907 100644 --- a/hosts/12kingdoms-rakushun/caddy.nix +++ b/hosts/12kingdoms-rakushun/caddy.nix @@ -39,12 +39,6 @@ in { } ''; - # Datastore - virtualHosts."attic.writefor.fun".extraConfig = '' - encode zstd gzip - reverse_proxy http://localhost:3300 - ''; - virtualHosts."git.writefor.fun".extraConfig = '' encode zstd gzip reverse_proxy http://localhost:3301 diff --git a/hosts/idols-ai/impermanence.nix b/hosts/idols-ai/impermanence.nix index 62873889..dcbb8ef6 100644 --- a/hosts/idols-ai/impermanence.nix +++ b/hosts/idols-ai/impermanence.nix @@ -75,7 +75,6 @@ # misc ".config/pulse" - ".config/attic" # attic nix cache server ".pki" ".steam" # steam games diff --git a/secrets/nixos.nix b/secrets/nixos.nix index b447adb7..52e52e9d 100644 --- a/secrets/nixos.nix +++ b/secrets/nixos.nix @@ -221,12 +221,6 @@ in { file = "${mysecrets}/server/alertmanager.env.age"; } // high_security; - - "attic-nix-cache-server.env" = - { - file = "${mysecrets}/server/attic-nix-cache-server.env.age"; - } - // high_security; }; })