modules: merge some nixos/darwin modules

5 files changed, 11 insertions, 49 deletions

diff --git a/modules/darwin/base/default.nix b/modules/darwin/base/default.nix
index 94dcf19..583accd 100644
--- a/modules/darwin/base/default.nix
+++ b/modules/darwin/base/default.nix
@@ -9,8 +9,7 @@ in {
   options.base.enable = mkEnableOption "base darwin module";
 
   imports = [
-    ./documentation.nix
-    ./locale.nix
+    ../../shared
     ./nix.nix
     ./packages.nix
   ];
diff --git a/modules/darwin/base/documentation.nix b/modules/darwin/base/documentation.nix
deleted file mode 100644
index ecc5813..0000000
--- a/modules/darwin/base/documentation.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.base.documentation;
-  inherit (lib) mkEnableOption mkIf;
-in {
-  options.base.documentation.enable = mkEnableOption "base module documentation";
-
-  config = mkIf cfg.enable {
-    documentation.man.enable = true;
-  };
-}
diff --git a/modules/darwin/base/locale.nix b/modules/darwin/base/locale.nix
deleted file mode 100644
index af7a6ca..0000000
--- a/modules/darwin/base/locale.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.base.defaultLocale;
-  inherit (lib) mkEnableOption mkIf;
-in {
-  options.base.defaultLocale.enable = mkEnableOption "enable default locale";
-
-  config = mkIf cfg.enable {
-    time.timeZone = "America/New_York";
-  };
-}
diff --git a/modules/darwin/base/nix.nix b/modules/darwin/base/nix.nix
index 39d8ffa..c853650 100644
--- a/modules/darwin/base/nix.nix
+++ b/modules/darwin/base/nix.nix
@@ -1,23 +1,18 @@
 {
   config,
   lib,
+  inputs,
   ...
 }: let
+  inherit (builtins) attrNames map;
+  inherit (lib) mkIf;
   cfg = config.base.nix-settings;
-  inherit (lib) mkDefault mkEnableOption mkIf;
-in {
-  options.base.nix-settings.enable = mkEnableOption "base nix settings";
-
-  config = mkIf cfg.enable {
-    nix = {
-      gc.automatic = mkDefault true;
 
-      settings = {
-        experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "repl-flake"];
-        trusted-users = mkDefault ["root" "@wheel"];
-      };
-    };
+  channelPath = i: "${inputs.${i}.outPath}";
 
-    services.nix-daemon.enable = true;
+  mapInputs = fn: map fn (attrNames inputs);
+in {
+  config = mkIf cfg.enable {
+    nix.nixPath = mapInputs (i: "${i}=${channelPath i}");
   };
 }
diff --git a/modules/darwin/base/packages.nix b/modules/darwin/base/packages.nix
index 14a07e6..97fb77c 100644
--- a/modules/darwin/base/packages.nix
+++ b/modules/darwin/base/packages.nix
@@ -4,13 +4,9 @@
   ...
 }: let
   cfg = config.base.defaultPackages;
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkIf;
 in {
-  options.base.defaultPackages.enable = mkEnableOption "base module default packages";
-
   config = mkIf cfg.enable {
-    programs = {
-      vim.enable = true;
-    };
+    programs.vim.enable = true;
   };
 }