Merge branch 'master' of github.com:starr-dusT/dotfiles

provision/hosts/bulwark/configuration.nix

@@ -35,6 +35,10 @@
     };
     programs = {
       kitty.enable = true;
+      chezmoi = {
+        enable = true;
+        apply = true;
+      };
     };
     services = {
       samba-client.enable = true;

provision/hosts/bulwark/default.nix

@@ -1,7 +1,7 @@
 { lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
 {
   inherit system;
-  specialArgs = { inherit user inputs home-manger; };
+  specialArgs = { inherit user inputs home-manager jovian-nixos; };
   modules = [
     ../default                            # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines

provision/hosts/bulwark/steam-deck.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     (jovian-nixos + "/modules")
-    home-manager.nixosModule
+    #home-manager.nixosModule
   ];
 
   jovian = {

provision/hosts/kestrel/configuration.nix

@@ -54,6 +54,10 @@
     };
     programs = {
       kitty.enable = true;
+      chezmoi = {
+        enable = true;
+        apply = true;
+      };
     };
     services = {
       peripherals.enable = true;

provision/hosts/shivan/configuration.nix

@@ -37,6 +37,10 @@
     };
     programs = {
       kitty.enable = true;
+      chezmoi = {
+        enable = true;
+        apply = true;
+      };
     };
     services = {
       peripherals.enable = true;

provision/hosts/torus/configuration.nix

@@ -96,6 +96,12 @@
     devel = {
       tooling.enable = true;
     };
+    programs = {
+      chezmoi = {
+        enable = true;
+        apply = true;
+      };
+    };
     services = {
       jellyfin.enable = true;
     };

provision/hosts/wsl/configuration.nix

@@ -50,6 +50,12 @@ in
       python.enable = true;
       tooling.enable = true;
     };
+    programs = {
+      chezmoi = {
+        enable = true;
+        apply = true;
+      };
+    };
     system = {
       ssh.enable = true;
       terminal.enable = true;

provision/modules/programs/chezmoi.nix

@@ -0,0 +1,25 @@
+{ config, lib, pkgs, user, home-manager, ... }:
+
+let cfg = config.modules.programs.chezmoi;
+in {
+  options.modules.programs.chezmoi = with lib; {
+    enable = lib.mkEnableOption "chezmoi";
+    apply = lib.mkOption {
+      type = with types; bool;
+      default = false;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ 
+      chezmoi # Manages your dotfiles across multiple machines, ensuring consistency and version control
+    ];
+
+    # 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" ] ''
+        run ${pkgs.chezmoi}/bin/chezmoi apply --force
+      '';
+    };
+  };
+}

provision/modules/programs/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./kitty.nix ];
+  imports = [ ./chezmoi.nix ./kitty.nix ];
 }