diff --git a/flake.nix b/flake.nix index e8f83db..9576ca7 100644 --- a/flake.nix +++ b/flake.nix @@ -6,13 +6,9 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.darwin.follows = ""; }; - attic = { - url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, agenix, attic, ... }@attrs: + outputs = { self, nixpkgs, agenix, ... }@attrs: let containerDef = import ./containers.nix; serviceContainers = containerDef.containers; @@ -42,7 +38,6 @@ imports = [ agenix.nixosModules.default - attic.nixosModules.atticd ./hardware-configuration.nix ]; @@ -76,21 +71,6 @@ enable = true; }; - atticd = { - enable = true; - credentialsFile = - self.nixosConfigurations.eve-psr-nix0.config.age.secrets.attic_token.path; - settings = { - listen = "0.0.0.0:8040"; - chunking = { - nar-size-threshold = 64 * 1024; # 64 KiB - min-size = 16 * 1024; # 16 KiB - avg-size = 64 * 1024; # 64 KiB - max-size = 256 * 1024; # 256 KiB - }; - }; - }; - hydra = { enable = true; hydraURL = "https://hydra.matri.cx"; @@ -107,13 +87,6 @@ notificationSender = "hydra@matri.cx"; buildMachinesFiles = [ ]; }; - - minio = { - enable = true; - listenAddress = ":9000"; - rootCredentialsFile = - self.nixosConfigurations.eve-psr-nix0.config.age.secrets.minio_root.path; - }; }; virtualisation = { @@ -144,9 +117,7 @@ age = { secrets = { - attic_token.file = ./secrets/attic_token.age; keys.file = ./secrets/keys.age; - minio_root.file = ./secrets/minio_root.age; sezycei.file = ./secrets/sezycei.age; }; }; diff --git a/secrets/attic_token.age b/secrets/attic_token.age deleted file mode 100644 index 904916a..0000000 Binary files a/secrets/attic_token.age and /dev/null differ diff --git a/secrets/minio_root.age b/secrets/minio_root.age deleted file mode 100644 index 9d3d9ee..0000000 Binary files a/secrets/minio_root.age and /dev/null differ