From 2e3f69dfceecbc8c392b6c3e5076cd3aee56b069 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 4 Aug 2024 22:24:39 +0900 Subject: feat(modules/atticd)!: import atticd inside module --- modules/services/atticd.nix | 6 +++++- nixos/default.nix | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/services/atticd.nix b/modules/services/atticd.nix index ef79871..e2a7f55 100644 --- a/modules/services/atticd.nix +++ b/modules/services/atticd.nix @@ -1,10 +1,14 @@ -{ config, lib, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: with lib; let cfg = config.modules.services.atticd; in { + imports = [ + inputs.attic.nixosModules.atticd + ]; + options.modules.services.atticd = { enable = mkEnableOption "Whether to enable atticd, a Multi-tenant Nix Binary Cache"; diff --git a/nixos/default.nix b/nixos/default.nix index 4af435a..237f275 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -6,7 +6,6 @@ nixpkgs = unstable; extraModules = [ inputs.sops-nix.nixosModules.sops - inputs.attic.nixosModules.atticd ]; }; @@ -15,7 +14,6 @@ nixpkgs = unstable; extraModules = [ inputs.sops-nix.nixosModules.sops - inputs.attic.nixosModules.atticd ]; }; @@ -24,7 +22,6 @@ nixpkgs = unstable; extraModules = [ inputs.sops-nix.nixosModules.sops - inputs.attic.nixosModules.atticd ]; overlays = [ (final: prev: { -- cgit 1.4.1