modules: merge some nixos/darwin modules

1 files changed, 13 insertions, 29 deletions

diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix
index d266333..3dcac11 100644
--- a/modules/nixos/base/nix.nix
+++ b/modules/nixos/base/nix.nix
@@ -4,37 +4,21 @@
   inputs,
   ...
 }: let
+  inherit (builtins) attrNames map;
+  inherit (lib) mkDefault mkIf;
   cfg = config.base.nix-settings;
-  inherit (lib) mkDefault mkEnableOption mkIf;
-in {
-  options.base.nix-settings.enable = mkEnableOption "base nix settings";
-
-  imports = [
-    ./documentation.nix
-    ./packages.nix
-  ];
-
-  config = let
-    channelPath = i: "/etc/nix/channels/${i}";
-    mapInputs = fn: builtins.map fn (builtins.attrNames inputs);
-  in
-    mkIf cfg.enable {
-      nix = {
-        gc = {
-          automatic = mkDefault true;
-          dates = mkDefault "weekly";
-          options = mkDefault "--delete-older-than 7d";
-        };
 
-        settings = {
-          auto-optimise-store = true;
-          experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "repl-flake"];
-        };
+  channelPath = i: "/etc/nix/channels/${i}";
 
-        nixPath = mapInputs (i: "${i}=${channelPath i}");
-      };
-
-      systemd.tmpfiles.rules =
-        mapInputs (i: "L+ ${channelPath i}     - - - - ${inputs.${i}.outPath}");
+  mapInputs = fn: map fn (attrNames inputs);
+in {
+  config = mkIf cfg.enable {
+    nix = {
+      nixPath = mapInputs (i: "${i}=${channelPath i}");
+      gc.dates = mkDefault "weekly";
     };
+
+    systemd.tmpfiles.rules =
+      mapInputs (i: "L+ ${channelPath i}     - - - - ${inputs.${i}.outPath}");
+  };
 }