From 44245ab5f9ff36a68b996c167eef927d523a848f Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 21 Apr 2024 19:36:06 +0200 Subject: [PATCH] chore(etna): disable attic just unused, adds yet another thing to compile so i don't really see the point anymore --- .github/workflows/ci.yml | 9 ++++----- flake.lock | 31 ------------------------------- flake.nix | 14 -------------- secrets/secrets.nix | 1 - systems/default.nix | 1 - systems/etna/attic.nix | 37 ------------------------------------- systems/etna/default.nix | 1 - 7 files changed, 4 insertions(+), 90 deletions(-) delete mode 100644 systems/etna/attic.nix diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd9f197..41fd475 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,12 +31,11 @@ jobs: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@v9 - - name: setup attic - uses: ryanccn/attic-action@v0 + - name: setup cachix + uses: cachix/cachix-action@v13 with: - endpoint: https://attic.uku3lig.net - cache: uku - token: ${{ secrets.ATTIC_TOKEN }} + name: uku3lig + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - name: build run: nix build -L --accept-flake-config .#${{ matrix.pkg }} diff --git a/flake.lock b/flake.lock index abb13b9..8118337 100644 --- a/flake.lock +++ b/flake.lock @@ -51,36 +51,6 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": [ - "crane" - ], - "flake-compat": [], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "catppuccin": { "locked": { "lastModified": 1713552048, @@ -275,7 +245,6 @@ "inputs": { "agenix": "agenix", "api-rs": "api-rs", - "attic": "attic", "catppuccin": "catppuccin", "crane": "crane", "deploy-rs": "deploy-rs", diff --git a/flake.nix b/flake.nix index 320e124..848fac8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,6 @@ { description = "example flake idk"; - nixConfig = { - extra-substituters = ["https://attic.uku3lig.net/uku"]; - extra-trusted-public-keys = ["uku:kGzXVpH0LmCl9G+Omy5ObkcjTLdasfj3NlOEuWWfne8="]; - }; - outputs = {flake-parts, ...} @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { systems = ["x86_64-linux"]; @@ -70,15 +65,6 @@ inputs.flake-compat.follows = ""; }; - attic = { - url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs"; # trolley emojo - inputs.flake-utils.follows = "flake-utils"; - inputs.crane.follows = "crane"; - inputs.flake-compat.follows = ""; - }; - vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b75c6b0..7036576 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -18,7 +18,6 @@ in { "etna/apiRsEnv.age".publicKeys = main ++ [etna]; "etna/ukubotRsEnv.age".publicKeys = main ++ [etna]; "etna/minecraftEnv.age".publicKeys = main ++ [etna]; - "etna/atticEnv.age".publicKeys = main ++ [etna]; "etna/dendriteKey.age".publicKeys = main ++ [etna]; "etna/nextcloudAdminPass.age".publicKeys = main ++ [etna]; } diff --git a/systems/default.nix b/systems/default.nix index b2bf78e..4067cd0 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -63,7 +63,6 @@ in { modules = nixos ++ (with inputs; [ - attic.nixosModules.atticd api-rs.nixosModules.default ukubot-rs.nixosModules.default self.nixosModules.reposilite diff --git a/systems/etna/attic.nix b/systems/etna/attic.nix deleted file mode 100644 index b9fe2d7..0000000 --- a/systems/etna/attic.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - mkSecret, - ... -}: { - age.secrets = mkSecret "atticEnv" {}; - cfTunnels."attic.uku3lig.net" = "http://localhost:6000"; - - services.atticd = { - enable = true; - credentialsFile = config.age.secrets.atticEnv.path; - - settings = { - listen = "[::]:6000"; - api-endpoint = "https://attic.uku3lig.net/"; - - storage = { - type = "local"; - path = "/data/attic"; - }; - - chunking = { - nar-size-threshold = 65536; # 64 KiB - min-size = 16384; # 16 KiB - avg-size = 65536; # 64 KiB - max-size = 262144; # 256 KiB - }; - - compression.type = "zstd"; - - garbage-collection = { - interval = "1 day"; - default-retention-period = "6 weeks"; - }; - }; - }; -} diff --git a/systems/etna/default.nix b/systems/etna/default.nix index 01debe9..ac77b9a 100644 --- a/systems/etna/default.nix +++ b/systems/etna/default.nix @@ -18,7 +18,6 @@ in { ] ++ fudgeMyShitIn [ ./minecraft.nix - ./attic.nix ./dendrite.nix ./nextcloud.nix ./reposilite.nix