Refactor

modules/scripts/clone.nix

@@ -1,12 +1,16 @@
+{ withSystem, ... }:
+
 {
-  flake.modules.homeManager.base =
+  perSystem =
-    { pkgs, ... }:
+    psArgs@{ pkgs, ... }:
     {
-      home.packages = [
+      packages.clone = pkgs.writeShellApplication {
-        (pkgs.writeShellApplication {
         name = "clone";
 
-          runtimeInputs = with pkgs; [ git ];
+        runtimeInputs = with pkgs; [
+          git
+          psArgs.config.packages.tmux-sessionizer
+        ];
 
         text = ''
           repo_url="$1"
@@ -36,7 +40,14 @@
             exit 1
           fi
         '';
-        })
+      };
+    };
+
+  flake.modules.homeManager.base =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        (withSystem pkgs.system (psArgs: psArgs.config.packages.clone))
       ];
     };
 }

modules/scripts/tmux-sessionizer/package.nix

@@ -1,12 +1,17 @@
+{ withSystem, ... }:
+
 {
-  flake.modules.homeManager.base =
+  perSystem =
     { pkgs, ... }:
     {
-      home.packages = [
+      packages.tmux-sessionizer = pkgs.writeShellApplication {
-        (pkgs.writeShellApplication {
         name = "tmux-sessionizer";
 
-          runtimeInputs = with pkgs; [ coreutils fzf tmux ];
+        runtimeInputs = with pkgs; [
+          coreutils
+          fzf
+          tmux
+        ];
 
         text = ''
           set -euo pipefail
@@ -71,7 +76,14 @@
 
           switch_to "$selected_name"
         '';
-        })
+      };
+    };
+
+  flake.modules.homeManager.base =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        (withSystem pkgs.system (psArgs: psArgs.config.packages.tmux-sessionizer))
       ];
     };
 }