split home-manager into their own submodules

modules/scripts/download.nix

@@ -1,112 +0,0 @@
-{
-  inputs,
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
-  options.my.units = {
-    download.enable = lib.mkEnableOption "media download automation scripts";
-    downloadManga.enable = lib.mkEnableOption "manga download automation";
-  };
-  config =
-    let
-      inherit (inputs.jawz-scripts.packages.x86_64-linux) download;
-      gallerySecretsPath = lib.attrByPath [ "sops" "secrets" "gallery-dl/secrets" "path" ] null config;
-      wrappedDownload =
-        if gallerySecretsPath != null then
-          pkgs.symlinkJoin {
-            name = "download-with-secrets";
-            paths = [ download ];
-            buildInputs = [ pkgs.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/download --run 'if [ -r "${gallerySecretsPath}" ]; then set -a; source "${gallerySecretsPath}"; set +a; fi'
-            '';
-          }
-        else
-          download;
-    in
-    {
-      home-manager.users.jawz.programs.${config.my.shell.type}.shellAliases =
-        inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
-          {
-            dl = "${wrappedDownload}/bin/download -u jawz -i";
-          };
-      systemd.user = {
-        services =
-          let
-            mkDownloadService = desc: execStartCmd: {
-              restartIfChanged = true;
-              description = "Downloads ${desc}";
-              wantedBy = [ "default.target" ];
-              path = [ pkgs.bash ];
-              serviceConfig = {
-                TimeoutStartSec = 2000;
-                TimeoutStopSec = 2000;
-                Restart = "on-failure";
-                RestartSec = 30;
-                ExecStart = "${wrappedDownload}/bin/download ${execStartCmd}";
-              }
-              // lib.optionalAttrs (gallerySecretsPath != null) {
-                EnvironmentFile = gallerySecretsPath;
-              };
-            };
-          in
-          {
-            tuhmayto = lib.mkIf config.my.units.download.enable (
-              mkDownloadService "tuhmayto stuff" ''
-                -u jawz -i https://x.com/tuhmayto/media \
-                https://www.furaffinity.net/user/tuhmayto/ \
-                https://bsky.app/profile/tumayto.bsky.social''
-            );
-            "download@" = lib.mkIf (config.my.units.download.enable || config.my.units.downloadManga.enable) (
-              mkDownloadService "post from multiple sources" "%I"
-            );
-            "instagram@" = lib.mkIf config.my.units.download.enable (
-              mkDownloadService "post types from instagram" "instagram -u jawz -t %I"
-            );
-          };
-        timers =
-          let
-            downloadTimer = time: delay: {
-              enable = true;
-              description = "Downloads post types from different sites";
-              wantedBy = [ "timers.target" ];
-              timerConfig = {
-                OnCalendar = time;
-                RandomizedDelaySec = delay;
-                Persistent = true;
-              };
-            };
-          in
-          {
-            # "instagram@stories" = lib.mkIf config.my.units.download.enable (
-            #   downloadTimer "*-*-* 12:34:00" 120 // { }
-            # );
-            "download@main" = lib.mkIf config.my.units.download.enable (
-              downloadTimer "*-*-* 06,18:02:00" 30 // { }
-            );
-            "download@push" = lib.mkIf config.my.units.download.enable (downloadTimer "*:0/5" 30 // { });
-            "download@manga" = lib.mkIf config.my.units.downloadManga.enable (
-              downloadTimer "*-*-* 03:08:00" 30 // { }
-            );
-            tuhmayto = lib.mkIf config.my.units.download.enable {
-              enable = true;
-              description = "Downloads tuhmayto stuff";
-              wantedBy = [ "timers.target" ];
-              timerConfig = {
-                OnCalendar = "*:0/10";
-              };
-            };
-          };
-      };
-      my.scripts.download = {
-        enable = lib.mkDefault false;
-        install = true;
-        service = false;
-        name = "download";
-        package = wrappedDownload;
-      };
-    };
-}

modules/scripts/download/common.nix

@@ -0,0 +1,25 @@
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+}:
+let
+  inherit (inputs.jawz-scripts.packages.x86_64-linux) download;
+  gallerySecretsPath = lib.attrByPath [ "sops" "secrets" "gallery-dl/secrets" "path" ] null config;
+in
+{
+  inherit gallerySecretsPath;
+  wrappedDownload =
+    if gallerySecretsPath != null then
+      pkgs.symlinkJoin {
+        name = "download-with-secrets";
+        paths = [ download ];
+        buildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          wrapProgram $out/bin/download --run 'if [ -r "${gallerySecretsPath}" ]; then set -a; source "${gallerySecretsPath}"; set +a; fi'
+        '';
+      }
+    else
+      download;
+}

modules/scripts/download/home.nix

@@ -0,0 +1,25 @@
+{
+  config,
+  inputs,
+  lib,
+  osConfig ? null,
+  pkgs,
+  ...
+}:
+let
+  shellType = inputs.self.lib.hmShellType config osConfig;
+  enabled =
+    inputs.self.lib.hmOnlyUser config osConfig "jawz"
+    && (osConfig.my.units.download.enable || osConfig.my.units.downloadManga.enable);
+  download = import ./common.nix {
+    config = if osConfig == null then { } else osConfig;
+    inherit inputs lib pkgs;
+  };
+in
+{
+  config = lib.mkIf enabled {
+    programs.${shellType}.shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
+      dl = "${download.wrappedDownload}/bin/download -u jawz -i";
+    };
+  };
+}

modules/scripts/download/nixos.nix

@@ -0,0 +1,95 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+let
+  download = import ./common.nix {
+    inherit
+      config
+      inputs
+      lib
+      pkgs
+      ;
+  };
+in
+{
+  options.my.units = {
+    download.enable = lib.mkEnableOption "media download automation scripts";
+    downloadManga.enable = lib.mkEnableOption "manga download automation";
+  };
+  config = {
+    systemd.user = {
+      services =
+        let
+          mkDownloadService = desc: execStartCmd: {
+            restartIfChanged = true;
+            description = "Downloads ${desc}";
+            wantedBy = [ "default.target" ];
+            path = [ pkgs.bash ];
+            serviceConfig = {
+              TimeoutStartSec = 2000;
+              TimeoutStopSec = 2000;
+              Restart = "on-failure";
+              RestartSec = 30;
+              ExecStart = "${download.wrappedDownload}/bin/download ${execStartCmd}";
+            }
+            // lib.optionalAttrs (download.gallerySecretsPath != null) {
+              EnvironmentFile = download.gallerySecretsPath;
+            };
+          };
+        in
+        {
+          tuhmayto = lib.mkIf config.my.units.download.enable (
+            mkDownloadService "tuhmayto stuff" ''
+              -u jawz -i https://x.com/tuhmayto/media \
+              https://www.furaffinity.net/user/tuhmayto/ \
+              https://bsky.app/profile/tumayto.bsky.social''
+          );
+          "download@" = lib.mkIf (config.my.units.download.enable || config.my.units.downloadManga.enable) (
+            mkDownloadService "post from multiple sources" "%I"
+          );
+          "instagram@" = lib.mkIf config.my.units.download.enable (
+            mkDownloadService "post types from instagram" "instagram -u jawz -t %I"
+          );
+        };
+      timers =
+        let
+          downloadTimer = time: delay: {
+            enable = true;
+            description = "Downloads post types from different sites";
+            wantedBy = [ "timers.target" ];
+            timerConfig = {
+              OnCalendar = time;
+              RandomizedDelaySec = delay;
+              Persistent = true;
+            };
+          };
+        in
+        {
+          "download@main" = lib.mkIf config.my.units.download.enable (
+            downloadTimer "*-*-* 06,18:02:00" 30 // { }
+          );
+          "download@push" = lib.mkIf config.my.units.download.enable (downloadTimer "*:0/5" 30 // { });
+          "download@manga" = lib.mkIf config.my.units.downloadManga.enable (
+            downloadTimer "*-*-* 03:08:00" 30 // { }
+          );
+          tuhmayto = lib.mkIf config.my.units.download.enable {
+            enable = true;
+            description = "Downloads tuhmayto stuff";
+            wantedBy = [ "timers.target" ];
+            timerConfig.OnCalendar = "*:0/10";
+          };
+        };
+    };
+    my.scripts.download = {
+      enable = lib.mkDefault false;
+      install = true;
+      service = false;
+      name = "download";
+      package = download.wrappedDownload;
+    };
+  };
+}

modules/scripts/update-org-agenda-cache.nix

@@ -1,21 +1,27 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
 }:
 {
-  config.my.scripts.update-org-agenda-cache = {
-    enable = lib.mkDefault false;
-    install = config.my.emacs.enable;
-    service = config.my.emacs.enable;
-    name = "update-org-agenda-cache";
-    timer = "*:0/30";
-    description = "runs a function which builds a cache file.";
-    package = pkgs.writeScriptBin "update-org-agenda-cache" ''
-      #!/usr/bin/env nix-shell
-      #! nix-shell -i bash -p bash
-      ${config.services.emacs.package}/bin/emacsclient --eval '(my/update-org-agenda-cache)'
-    '';
-  };
+  config.my.scripts.update-org-agenda-cache =
+    let
+      user = inputs.self.lib.getFirstUser config.my.emacs.users;
+      emacsPackage = config.home-manager.users.${user}.programs.doom-emacs.finalEmacsPackage;
+    in
+    {
+      enable = lib.mkDefault false;
+      install = config.my.emacs.enable;
+      service = config.my.emacs.enable;
+      name = "update-org-agenda-cache";
+      timer = "*:0/30";
+      description = "runs a function which builds a cache file.";
+      package = pkgs.writeScriptBin "update-org-agenda-cache" ''
+        #!/usr/bin/env nix-shell
+        #! nix-shell -i bash -p bash
+        ${emacsPackage}/bin/emacsclient --eval '(my/update-org-agenda-cache)'
+      '';
+    };
 }