From 47e10205ba325e668324685b9700d897ffaf2869 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 30 Jun 2024 11:01:14 -0400
Subject: modules/base: streamline

---
 modules/darwin/base/default.nix  | 6 +++++-
 modules/darwin/base/programs.nix | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'modules/darwin/base')

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;
-- 
cgit v1.2.3