arrange users marisa:spark and satori:bat

Signed-off-by: natto1784 <natto@weirdnatto.in>

home/default.nix

@@ -1,4 +1,11 @@
 { self, inputs, globalArgs, ... }:
+let
+  commonModules = [
+    ./modules/zsh.nix
+    ./modules/programs.nix
+    globalArgs
+  ];
+in
 {
   flake.homeConfigurations = {
     natto = inputs.home-manager.lib.homeManagerConfiguration {
@@ -6,8 +13,29 @@
         ./natto
         ./modules/secret.nix
         inputs.hyprland.homeManagerModules.default
-        globalArgs
-      ];
+      ] ++ commonModules;
+      pkgs = self.legacyPackages.x86_64-linux;
+    };
+
+    spark = inputs.home-manager.lib.homeManagerConfiguration {
+      modules = [{
+        home = {
+          homeDirectory = "/home/spark";
+          username = "spark";
+          stateVersion = "22.11";
+        };
+      }] ++ commonModules;
+      pkgs = self.legacyPackages.aarch64-linux;
+    };
+
+    bat = inputs.home-manager.lib.homeManagerConfiguration {
+      modules = [{
+        home = {
+          homeDirectory = "/home/bat";
+          username = "bat";
+          stateVersion = "22.11";
+        };
+      }] ++ commonModules;
       pkgs = self.legacyPackages.x86_64-linux;
     };
   };

home/modules/programs.nix

@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  programs = {
+    home-manager.enable = true;
+    password-store.enable = true;
+    direnv.enable = true;
+  };
+}

home/modules/zsh.nix

@@ -0,0 +1,23 @@
+{ config, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    autocd = true;
+    history = rec {
+      expireDuplicatesFirst = true;
+      size = 30000;
+      save = size;
+    };
+    enableAutosuggestions = true;
+    enableCompletion = true;
+    enableSyntaxHighlighting = true;
+    prezto = {
+      enable = true;
+      prompt.theme = "pure";
+      autosuggestions.color = "fg=yellow,bold";
+    };
+    initExtra = ''
+      unsetopt extendedGlob
+    '';
+  };
+}

home/natto/programs.nix

@@ -1,7 +1,6 @@
 { pkgs, config, colors, ... }:
 {
   programs = {
-    home-manager.enable = true;
     firefox = {
       enable = true;
       profiles.natto = {
@@ -22,8 +21,6 @@
       };
     };
     go.enable = true;
-    password-store.enable = true;
-    direnv.enable = true;
     foot = {
       enable = true;
       settings = {

home/natto/zsh.nix

@@ -1,29 +1,12 @@
-{ config, ... }:
+{ config, lib, ... }:
 let
   secretPath = "${config.home.homeDirectory}/.zshenv_secret";
 in
 {
-  programs.zsh = {
-    enable = true;
-    autocd = true;
-    history = rec {
-      expireDuplicatesFirst = true;
-      size = 30000;
-      save = size;
-    };
-    enableAutosuggestions = true;
-    enableCompletion = true;
-    enableSyntaxHighlighting = true;
-    prezto = {
-      enable = true;
-      prompt.theme = "pure";
-      autosuggestions.color = "fg=yellow,bold";
-    };
-    initExtra = ''
-      . ${secretPath};
-      unsetopt extendedGlob
-    '';
-  };
+  programs.zsh.initExtra = lib.mkForce ''
+    . ${secretPath};
+    unsetopt extendedGlob
+  '';
 
   age.secrets.zshenv_secret = {
     file = ./secrets/.zshenv_secret;