From cdbde672d81df0fbb1c906903faf87194f18fab0 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Wed, 14 Sep 2022 14:30:35 -0700
Subject: [PATCH] lift `nix-serve` out of servo

i'm going to enable it on desktop
---
 machines/servo/default.nix            |  2 +-
 machines/servo/services/nix-serve.nix | 15 --------------
 modules/default.nix                   |  1 +
 modules/services/nixserve.nix         | 28 +++++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 16 deletions(-)
 delete mode 100644 machines/servo/services/nix-serve.nix
 create mode 100644 modules/services/nixserve.nix

diff --git a/machines/servo/default.nix b/machines/servo/default.nix
index a3fc5bce..44e37743 100644
--- a/machines/servo/default.nix
+++ b/machines/servo/default.nix
@@ -14,7 +14,6 @@
     ./services/matrix.nix
     ./services/navidrome.nix
     ./services/nginx.nix
-    ./services/nix-serve.nix
     ./services/pleroma.nix
     ./services/postfix.nix
     ./services/postgres.nix
@@ -28,6 +27,7 @@
   ];
   sane.impermanence.enable = true;
   sane.services.duplicity.enable = true;
+  sane.services.nixserve.enable = true;
 
   # TODO: look into the EFI stuff
   boot.loader.grub.enable = false;
diff --git a/machines/servo/services/nix-serve.nix b/machines/servo/services/nix-serve.nix
deleted file mode 100644
index 36db26d3..00000000
--- a/machines/servo/services/nix-serve.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# docs: https://nixos.wiki/wiki/Binary_Cache
-# to copy something to this machine's nix cache, do:
-#   nix copy --to ssh://nixcache.uninsane.org PACKAGE
-{ config, ... }:
-
-{
-  services.nix-serve = {
-    enable = true;
-    secretKeyFile = config.sops.secrets.nix_serve_privkey.path;
-  };
-
-  sops.secrets.nix_serve_privkey = {
-    sopsFile = ../../../secrets/servo.yaml;
-  };
-}
diff --git a/modules/default.nix b/modules/default.nix
index dd82b252..a29b989a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,6 +8,7 @@
     ./impermanence.nix
     ./nixcache.nix
     ./services/duplicity.nix
+    ./services/nixserve.nix
     ./universal
   ];
 }
diff --git a/modules/services/nixserve.nix b/modules/services/nixserve.nix
new file mode 100644
index 00000000..446036b5
--- /dev/null
+++ b/modules/services/nixserve.nix
@@ -0,0 +1,28 @@
+# docs: https://nixos.wiki/wiki/Binary_Cache
+# to copy something to this machine's nix cache, do:
+#   nix copy --to ssh://nixcache.uninsane.org PACKAGE
+{ config, lib, ... }:
+
+with lib;
+let
+  cfg = config.sane.services.nixserve;
+in
+{
+  options = {
+    sane.services.nixserve.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.nix-serve = {
+      enable = true;
+      secretKeyFile = config.sops.secrets.nix_serve_privkey.path;
+    };
+
+    sops.secrets.nix_serve_privkey = {
+      sopsFile = ../../secrets/servo.yaml;
+    };
+  };
+}