diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index f0b2f4ae..eb15537e 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -33,11 +33,8 @@
       steam.enable = true;
     };
     programs = {
+      chezmoi.apply = true;
       kitty.enable = true;
-      chezmoi = {
-        enable = true;
-        apply = true;
-      };
     };
     services = {
       samba-client.enable = true;
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 9d320dad..b1f1754f 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -53,11 +53,8 @@
       steam.enable = true;
     };
     programs = {
+      chezmoi.apply = true;
       kitty.enable = true;
-      chezmoi = {
-        enable = true;
-        apply = true;
-      };
     };
     services = {
       peripherals.enable = true;
diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix
index 4b83423f..624875df 100644
--- a/provision/hosts/shivan/configuration.nix
+++ b/provision/hosts/shivan/configuration.nix
@@ -37,10 +37,7 @@
     };
     programs = {
       kitty.enable = true;
-      chezmoi = {
-        enable = true;
-        apply = true;
-      };
+      chezmoi.apply = true;
     };
     services = {
       peripherals.enable = true;
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index f6b3906a..38868a23 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -97,10 +97,7 @@
       tooling.enable = true;
     };
     programs = {
-      chezmoi = {
-        enable = true;
-        apply = true;
-      };
+      chezmoi.apply = true;
     };
     services = {
       jellyfin.enable = true;
diff --git a/provision/hosts/wsl/configuration.nix b/provision/hosts/wsl/configuration.nix
index 8fd9ced2..044bff4d 100644
--- a/provision/hosts/wsl/configuration.nix
+++ b/provision/hosts/wsl/configuration.nix
@@ -51,10 +51,7 @@ in
       tooling.enable = true;
     };
     programs = {
-      chezmoi = {
-        enable = true;
-        apply = true;
-      };
+      chezmoi.apply = true;
     };
     system = {
       ssh.enable = true;
diff --git a/provision/modules/programs/chezmoi.nix b/provision/modules/programs/chezmoi.nix
index da625025..92ea08c8 100644
--- a/provision/modules/programs/chezmoi.nix
+++ b/provision/modules/programs/chezmoi.nix
@@ -3,7 +3,10 @@
 let cfg = config.modules.programs.chezmoi;
 in {
   options.modules.programs.chezmoi = with lib; {
-    enable = lib.mkEnableOption "chezmoi";
+    enable = lib.mkOption {
+      type = with types; bool;
+      default = true;
+    };
     apply = lib.mkOption {
       type = with types; bool;
       default = false;
@@ -12,9 +15,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ 
-      chezmoi # Manages your dotfiles across multiple machines, ensuring consistency and version control
+      chezmoi 
     ];
-
     # Optionally apply chezmoi dotfiles with home-manager activation
     home-manager.users.${user} = lib.mkIf cfg.apply {
       home.activation.chezmoi = home-manager.lib.hm.dag.entryAfter [ "installPackages" ] ''
diff --git a/provision/modules/system/terminal.nix b/provision/modules/system/terminal.nix
index 07cf31fa..0bed810b 100644
--- a/provision/modules/system/terminal.nix
+++ b/provision/modules/system/terminal.nix
@@ -8,7 +8,6 @@ in {
     environment.systemPackages = with pkgs; [
       killall # Command-line utility to terminate processes by name.
       pciutils # Utilities for inspecting and manipulating devices connected to the PCI bus.
-      chezmoi # Manages your dotfiles across multiple machines, ensuring consistency and version control.
       btop # Terminal-based resource monitor, providing an interactive view of system resources.
       nix-search-cli # Command-line utility for searching the Nix package repository.
       rbw # Command-line interface to the Bitwarden password manager.