12 files changed, 29 insertions, 73 deletions
diff --git a/modules/darwin/base/default.nix b/modules/darwin/base/default.nix
index 532419f..e9ab743 100644
--- a/modules/darwin/base/default.nix
+++ b/modules/darwin/base/default.nix
@@ -1,8 +1,12 @@
+{ config, lib, ... }:
+let
+  cfg = config.base;
+in
 {
   imports = [
     ../../shared
     ./programs.nix
   ];
 
-  services.nix-daemon.enable = true;
+  config = lib.mkIf cfg.enable { services.nix-daemon.enable = true; };
 }
diff --git a/modules/darwin/base/programs.nix b/modules/darwin/base/programs.nix
index aefb852..74c059e 100644
--- a/modules/darwin/base/programs.nix
+++ b/modules/darwin/base/programs.nix
@@ -1,10 +1,9 @@
 { config, lib, ... }:
 let
   cfg = config.base.defaultPrograms;
-  enable = config.base.enable && cfg.enable;
 in
 {
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     programs = {
       bash.enable = true;
       vim.enable = true;
diff --git a/modules/nixos/archetypes/server.nix b/modules/nixos/archetypes/server.nix
index 165725d..053fda2 100644
--- a/modules/nixos/archetypes/server.nix
+++ b/modules/nixos/archetypes/server.nix
@@ -10,7 +10,6 @@ in
   config = lib.mkIf cfg.enable {
     base = {
       enable = true;
-      documentation.enable = false;
       defaultPrograms.enable = false;
     };
 
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
index d80d573..30e75d9 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -4,10 +4,12 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.base;
+in
 {
   imports = [
     ../../shared
-    ./documentation.nix
     ./networking.nix
     ./nix.nix
     ./programs.nix
@@ -15,16 +17,18 @@
     ./users.nix
   ];
 
-  services.journald.extraConfig = ''
-    MaxRetentionSec=1w
-  '';
-
-  system.activationScripts."upgrade-diff" = {
-    supportsDryActivation = true;
-    text = ''
-      ${lib.getExe pkgs.nvd} \
-        --nix-bin-dir=${config.nix.package}/bin \
-        diff /run/current-system "$systemConfig"
+  config = lib.mkIf cfg.enable {
+    services.journald.extraConfig = ''
+      MaxRetentionSec=1w
     '';
+
+    system.activationScripts."upgrade-diff" = {
+      supportsDryActivation = true;
+      text = ''
+        ${lib.getExe pkgs.nvd} \
+          --nix-bin-dir=${config.nix.package}/bin \
+          diff /run/current-system "$systemConfig"
+      '';
+    };
   };
 }
diff --git a/modules/nixos/base/documentation.nix b/modules/nixos/base/documentation.nix
deleted file mode 100644
index 986c6ee..0000000
--- a/modules/nixos/base/documentation.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.base.documentation;
-  enable = config.base.enable && cfg.enable;
-in
-{
-  config = lib.mkIf enable {
-    documentation.nixos.enable = false;
-
-    environment.systemPackages = with pkgs; [
-      man-pages
-      man-pages-posix
-    ];
-  };
-}
diff --git a/modules/nixos/base/networking.nix b/modules/nixos/base/networking.nix
index 49feca5..35e8558 100644
--- a/modules/nixos/base/networking.nix
+++ b/modules/nixos/base/networking.nix
@@ -1,16 +1,15 @@
 { config, lib, ... }:
 let
   cfg = config.base.networking;
-  enable = config.base.enable && cfg.enable;
 in
 {
   options.base.networking = {
     enable = lib.mkEnableOption "base network settings" // {
-      default = true;
+      default = config.base.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     networking.networkmanager = {
       enable = lib.mkDefault true;
       dns = "systemd-resolved";
diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix
index 6c49312..29b0264 100644
--- a/modules/nixos/base/nix.nix
+++ b/modules/nixos/base/nix.nix
@@ -7,7 +7,6 @@ in
   config = lib.mkIf enable {
     nix = {
       channel.enable = lib.mkDefault false;
-      gc.dates = lib.mkDefault "weekly";
       settings.trusted-users = [
         "root"
         "@wheel"
diff --git a/modules/nixos/base/security.nix b/modules/nixos/base/security.nix
index c3d606f..5857f0d 100644
--- a/modules/nixos/base/security.nix
+++ b/modules/nixos/base/security.nix
@@ -1,16 +1,15 @@
 { config, lib, ... }:
 let
   cfg = config.base.security;
-  enable = config.base.enable && cfg.enable;
 in
 {
   options.base.security = {
     enable = lib.mkEnableOption "base security settings" // {
-      default = true;
+      default = config.base.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     security = {
       apparmor.enable = lib.mkDefault true;
       audit.enable = lib.mkDefault true;
diff --git a/modules/shared/base/default.nix b/modules/shared/base/default.nix
index e2bbdee..c4b013d 100644
--- a/modules/shared/base/default.nix
+++ b/modules/shared/base/default.nix
@@ -14,7 +14,6 @@ in
   };
 
   imports = [
-    ./documentation.nix
     ./nix.nix
     ./programs.nix
   ];
diff --git a/modules/shared/base/documentation.nix b/modules/shared/base/documentation.nix
deleted file mode 100644
index 1335c17..0000000
--- a/modules/shared/base/documentation.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.base.documentation;
-  enable = config.base.enable && cfg.enable;
-in
-{
-  options.base.documentation = {
-    enable = lib.mkEnableOption "documentation settings" // {
-      default = true;
-    };
-  };
-
-  config = lib.mkIf enable {
-    documentation = {
-      doc.enable = false;
-      info.enable = false;
-    };
-  };
-}
diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix
index 9002455..f4177b5 100644
--- a/modules/shared/base/nix.nix
+++ b/modules/shared/base/nix.nix
@@ -6,16 +6,15 @@
 }:
 let
   cfg = config.base.nixSettings;
-  enable = config.base.enable && cfg.enable;
 in
 {
   options.base.nixSettings = {
     enable = lib.mkEnableOption "nix settings" // {
-      default = true;
+      default = config.base.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     nix = {
       settings = {
         auto-optimise-store = pkgs.stdenv.isLinux;
@@ -34,7 +33,7 @@ in
 
       gc = {
         automatic = lib.mkDefault true;
-        options = lib.mkDefault "--delete-older-than 7d";
+        options = lib.mkDefault "--delete-older-than 2d";
       };
     };
 
diff --git a/modules/shared/base/programs.nix b/modules/shared/base/programs.nix
index e5208b0..bba27b3 100644
--- a/modules/shared/base/programs.nix
+++ b/modules/shared/base/programs.nix
@@ -1,14 +1,8 @@
 { config, lib, ... }:
-let
-  cfg = config.base.defaultPrograms;
-  enable = config.base.enable && cfg.enable;
-in
 {
   options.base.defaultPrograms = {
     enable = lib.mkEnableOption "default programs" // {
-      default = true;
+      default = config.base.enable;
     };
   };
-
-  config = lib.mkIf enable { programs.gnupg.agent.enable = lib.mkDefault true; };
 }