From 94e2d64cbbb4c1901bbd7466f12662dba28005da Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 4 May 2023 17:09:32 -0400 Subject: modules: prefix with getchoo --- modules/base/default.nix | 12 +++--------- modules/base/documentation.nix | 4 ++-- modules/base/packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) (limited to 'modules/base') diff --git a/modules/base/default.nix b/modules/base/default.nix index b9a7c8b..72911a5 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: let - cfg = config.base; + cfg = config.getchoo.base; inherit (lib) mkDefault mkEnableOption mkIf; in { - options.base.enable = mkEnableOption "base module"; + options.getchoo.base.enable = mkEnableOption "base module"; imports = [ ./documentation.nix @@ -18,7 +18,7 @@ in { channelPath = "/etc/nix/channels/nixpkgs"; in mkIf cfg.enable { - base = { + getchoo.base = { documentation.enable = mkDefault true; defaultPackages.enable = mkDefault true; }; @@ -35,12 +35,6 @@ in { settings = { auto-optimise-store = true; experimental-features = ["nix-command" "flakes"]; - trusted-substituters = [ - "https://nix-community.cachix.org" - ]; - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; }; nixPath = [ diff --git a/modules/base/documentation.nix b/modules/base/documentation.nix index 0f3b9d3..9064507 100644 --- a/modules/base/documentation.nix +++ b/modules/base/documentation.nix @@ -4,10 +4,10 @@ pkgs, ... }: let - cfg = config.base.documentation; + cfg = config.getchoo.base.documentation; inherit (lib) mkEnableOption mkIf; in { - options.base.documentation.enable = mkEnableOption "base module documentation"; + options.getchoo.base.documentation.enable = mkEnableOption "base module documentation"; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [man-pages man-pages-posix]; diff --git a/modules/base/packages.nix b/modules/base/packages.nix index 68f56aa..a082196 100644 --- a/modules/base/packages.nix +++ b/modules/base/packages.nix @@ -4,10 +4,10 @@ pkgs, ... }: let - cfg = config.base.defaultPackages; + cfg = config.getchoo.base.defaultPackages; inherit (lib) mkEnableOption mkIf; in { - options.base.defaultPackages.enable = mkEnableOption "base module default packages"; + options.getchoo.base.defaultPackages.enable = mkEnableOption "base module default packages"; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ -- cgit v1.2.3