modules/base: streamline

4 files changed, 4 insertions, 31 deletions

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; };
 }