From 89dd6985d810ae4675db5219799b3f2c3e14af07 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Wed, 12 Mar 2025 23:04:04 -0700
Subject: [PATCH] migrate chezmoi to base

---
 provision/hosts/bulwark/configuration.nix | 1 -
 provision/hosts/htpc/configuration.nix    | 1 -
 provision/hosts/kestrel/configuration.nix | 1 -
 provision/hosts/osprey/configuration.nix  | 1 -
 provision/hosts/shivan/configuration.nix  | 1 -
 provision/hosts/torus/configuration.nix   | 1 -
 provision/hosts/wsl/configuration.nix     | 1 -
 provision/modules/base/default.nix        | 1 +
 provision/modules/programs/chezmoi.nix    | 9 +++------
 provision/modules/programs/default.nix    | 1 -
 10 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index 219330a3..c8a1a945 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -26,7 +26,6 @@
       pc.enable = true;
     };
     programs = {
-      chezmoi.apply = true;
       kitty.enable = true;
     };
     services = {
diff --git a/provision/hosts/htpc/configuration.nix b/provision/hosts/htpc/configuration.nix
index e0ff1614..0667b6d9 100644
--- a/provision/hosts/htpc/configuration.nix
+++ b/provision/hosts/htpc/configuration.nix
@@ -15,7 +15,6 @@
       gnome.enable = true;
     };
     programs = {
-      chezmoi.apply = true;
       kitty.enable = true;
     };
     services = {
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 7c33081e..bcf9af93 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -48,7 +48,6 @@
     };
     programs = {
       borg.enable = true;
-      chezmoi.apply = true;
       kitty.enable = true;
       virt-manager.enable = true;
     };
diff --git a/provision/hosts/osprey/configuration.nix b/provision/hosts/osprey/configuration.nix
index 3c545c9d..7cd18546 100644
--- a/provision/hosts/osprey/configuration.nix
+++ b/provision/hosts/osprey/configuration.nix
@@ -38,7 +38,6 @@
     };
     programs = {
       appgate-sdp.enable = true;
-      chezmoi.apply = true;
       kitty.enable = true;
       virt-manager.enable = true;
     };
diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix
index 0112e912..058848ac 100644
--- a/provision/hosts/shivan/configuration.nix
+++ b/provision/hosts/shivan/configuration.nix
@@ -26,7 +26,6 @@
     };
     programs = {
       kitty.enable = true;
-      chezmoi.apply = true;
       virt-manager.enable = false;
     };
     services = {
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index f3746c3a..008c344d 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -93,7 +93,6 @@
   # Modules
   modules = {
     programs = {
-      chezmoi.apply = true;
       borg.enable = true;
     };
     services = {
diff --git a/provision/hosts/wsl/configuration.nix b/provision/hosts/wsl/configuration.nix
index 43b69d30..0685b918 100644
--- a/provision/hosts/wsl/configuration.nix
+++ b/provision/hosts/wsl/configuration.nix
@@ -58,7 +58,6 @@ in
   # Modules 
   modules = {
     programs = {
-      chezmoi.apply = true;
       git.keys = false;
     };
   };
diff --git a/provision/modules/base/default.nix b/provision/modules/base/default.nix
index 4a94846a..13b17329 100644
--- a/provision/modules/base/default.nix
+++ b/provision/modules/base/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./terminal.nix
+    ../programs/chezmoi.nix
     ../programs/git.nix
   ];
 }
diff --git a/provision/modules/programs/chezmoi.nix b/provision/modules/programs/chezmoi.nix
index 46e1eb41..92e325de 100644
--- a/provision/modules/programs/chezmoi.nix
+++ b/provision/modules/programs/chezmoi.nix
@@ -3,20 +3,17 @@
 let cfg = config.modules.programs.chezmoi;
 in {
   options.modules.programs.chezmoi = with lib; {
-    enable = lib.mkOption {
+    apply = lib.mkOption {
       type = with types; bool;
       default = true;
     };
-    apply = lib.mkOption {
-      type = with types; bool;
-      default = false;
-    };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = {
     environment.systemPackages = with pkgs; [ 
       chezmoi # Manage your dotfiles across multiple machines, securely
     ];
+
     home-manager.users.${user} = lib.mkIf cfg.apply {
       home.activation.chezmoi = home-manager.lib.hm.dag.entryAfter [ "installPackages" ] ''
         _saved_path=$PATH
diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix
index 8059b872..fbbaf99e 100644
--- a/provision/modules/programs/default.nix
+++ b/provision/modules/programs/default.nix
@@ -5,7 +5,6 @@
     ./borg.nix
     ./chrome.nix
     ./firefox.nix
-    ./chezmoi.nix 
     ./kitty.nix
     ./nvim.nix
     ./virt-manager.nix