dendrify: comfy-station

modules/bin/nix-scripts.nix

@@ -1,12 +1,5 @@
-{
-  config,
-  lib,
-  pkgs,
-  isHM,
-  ...
-}: let
-  cfg = config.hive.nix-scripts;
-  home-rebuild =
+{...}: let
+  home-rebuild = pkgs:
     pkgs.writeShellScriptBin ".home-rebuild"
     ''
       set -e
@@ -20,7 +13,7 @@
       ${pkgs.git}/bin/git commit --no-gpg-sign -am "Home $gen by $by"
       popd
     '';
-  rebuild =
+  rebuild = pkgs:
     pkgs.writeShellScriptBin ".nixos-rebuild"
     ''
       set -e
@@ -34,7 +27,7 @@
       ${pkgs.git}/bin/git commit --no-gpg-sign -am "System $gen by $by"
       popd
     '';
-  upgrade =
+  upgrade = pkgs:
     pkgs.writeShellScriptBin ".nixos-upgrade"
     ''
       set -e
@@ -63,7 +56,7 @@
       ${pkgs.git}/bin/git branch -D "$branch_staging"
       popd
     '';
-  update =
+  update = pkgs:
     pkgs.writeShellScriptBin ".nixos-update"
     ''
       set -e
@@ -94,25 +87,16 @@
       popd
     '';
 in {
-  options = {
-    hive.nix-scripts.enable = lib.mkEnableOption "Enable the nix build/update scripts";
+  flake.nixosModules.nix-scripts = {pkgs, ...}: {
+    environment.systemPackages = [
+      (rebuild pkgs)
+      (upgrade pkgs)
+      (update pkgs)
+    ];
+  };
+  flake.homeModules.nix-scripts = {pkgs, ...}: {
+    home.packages = [
+      (home-rebuild pkgs)
+    ];
   };
-
-  config =
-    lib.mkIf cfg.enable
-    (
-      if isHM
-      then {
-        home.packages = [
-          home-rebuild
-        ];
-      }
-      else {
-        environment.systemPackages = [
-          rebuild
-          upgrade
-          update
-        ];
-      }
-    );
 }