wip

flake.lock

@@ -267,11 +267,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735841882,
-        "narHash": "sha256-Fn7mOUV189e/AIzij1n6kvNOROOWA3qRY/8D4bcJRXk=",
+        "lastModified": 1734875198,
+        "narHash": "sha256-nTrmbQjVANsbTJ+uzL95MXZq8nTbJ/Ar4qfeHMfVtlE=",
         "ref": "master",
-        "rev": "8952e41601f633eee9ec0ab6f8dd0d2783581b8d",
-        "revCount": 364,
+        "rev": "18225f1644a3fba957ed27d7ec92d03a3eea5579",
+        "revCount": 362,
         "type": "git",
         "url": "ssh://gitea@git.ppp.pm:1122/alex/whib.git"
       },

hosts/pinwheel/home.nix

@@ -3,6 +3,8 @@
   imports = [ inputs.home-manager.nixosModules.home-manager ];
 
   config = {
+    hardware.saleae-logic.enable = true;
+
     home-manager = {
       useGlobalPkgs = true;
       useUserPackages = true;
@@ -25,6 +27,7 @@
           pkgs.htop
           pkgs.onlyoffice-bin
           pkgs.wdisplays
+          pkgs.saleae-logic-2
         ];
 
         home.stateVersion = "23.05";

hosts/tadpole/modules/certs/default.nix

@@ -18,7 +18,7 @@
         group = "nginx";
       };
 
-      "api.whib.ppp.pm" = {
+      "whib-api.ppp.pm" = {
         webroot = "/var/lib/acme/acme-challenge/";
         group = "nginx";
       };

hosts/tadpole/modules/default.nix

@@ -22,7 +22,6 @@ in
       };
 
       pppdotpm-site.enable = true;
-      whib-backend.enable = true;
     };
   };
 }

hosts/tadpole/modules/gitea/default.nix

@@ -7,6 +7,8 @@
 let
   conf = config.mod.gitea;
   gitDomain = "git.${conf.baseDomain}";
+
+  nginxEnable = config.mod.nginx.enable;
 in
 {
   options = {
@@ -35,12 +37,8 @@ in
     };
   };
 
-  config = lib.mkIf conf.enable {
+  config = lib.mkIf (conf.enable && nginxEnable) {
     assertions = [
-      {
-        assertion = config.services.nginx.enable;
-        message = "Option 'config.services.nginx' must be enabled";
-      }
       {
         assertion = conf.baseDomain != "";
         message = "Option 'mod.gitea.baseDomain' cannot be empty";

hosts/tadpole/modules/ppp.pm-site/default.nix

@@ -6,6 +6,8 @@
 }:
 let
   enabled = config.mod.pppdotpm-site.enable;
+
+  nginxEnabled = config.mod.nginx.enable;
 in
 {
   imports = [ inputs.pppdotpm-site.nixosModules.default ];
@@ -16,14 +18,7 @@ in
     };
   };
 
-  config = lib.mkIf enabled {
-    assertions = [
-      {
-        assertion = config.services.nginx.enable;
-        message = "Option 'config.services.nginx' must be enabled";
-      }
-    ];
-
+  config = lib.mkIf (enabled && nginxEnabled) {
     services.pppdotpm-site = {
       enable = true;
       domain = "ppp.pm";

hosts/tadpole/modules/whib/default.nix

@@ -15,18 +15,11 @@ in
   };
 
   config = lib.mkIf enabled {
-    assertions = [
-      {
-        assertion = config.services.nginx.enable;
-        message = "Option 'config.services.nginx' must be enabled";
-      }
-    ];
-
     services.whib-backend = {
       enable = true;
 
-      domain = "api.whib.ppp.pm";
-      useACMEHost = "api.whib.ppp.pm";
+      domain = "whib-api.ppp.pm";
+      useACMEHost = "whib-api.ppp.pm";
 
       backend = {
         signingKey = "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.whib-signing-key.path})";
@@ -51,9 +44,6 @@ in
       };
 
       grafana = {
-        domain = "grafana.whib.ppp.pm";
-        useACMEHost = "grafana.whib.ppp.pm";
-
         password = "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.whib-grafana-password.path})";
       };
     };
@@ -61,12 +51,11 @@ in
     age.secrets = {
       "whib-signing-key".file = ../../../../secrets/tadpole/whib-signing-key.age;
       "whib-postgres-password".file = ../../../../secrets/tadpole/whib-postgres-password.age;
-      "whib-grafana-password".file = ../../../../secrets/tadpole/whib-grafana-password.age;
-
       "whib-gpg-key".file = ../../../../secrets/tadpole/whib-gpg-key.age;
       "whib-backblaze-bucket".file = ../../../../secrets/tadpole/whib-backblaze-bucket.age;
       "whib-backblaze-key-id".file = ../../../../secrets/tadpole/whib-backblaze-key-id.age;
       "whib-backblaze-key".file = ../../../../secrets/tadpole/whib-backblaze-key.age;
+      "whib-grafana-password".file = ../../../../secrets/tadpole/whib-grafana-password.age;
     };
   };
 }

secrets/secrets.nix

@@ -48,9 +48,6 @@ in {
   "tadpole/alex.tadpole-git.ppp.pm.pub.age".publicKeys = [ tadpole alex ];
   "tadpole/gitea-dbpassword.age".publicKeys = [ tadpole alex ];
 
-  "tadpole/whib-signing-key.age".publicKeys = [ tadpole alex ];
-  "tadpole/whib-postgres-password.age".publicKeys = [ tadpole alex ];
-  "tadpole/whib-grafana-password.age".publicKeys = [ tadpole alex ];
   "tadpole/whib-gpg-key.age".publicKeys = [ tadpole alex ];
   "tadpole/whib-backblaze-bucket.age".publicKeys = [ tadpole alex ];
   "tadpole/whib-backblaze-key-id.age".publicKeys = [ tadpole alex ];

secrets/tadpole/whib-postgres-password.age

@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 5R7G9A WqkH9G2AGAcQfa9u+w6+QVXYVlozt0JsB/icILH/Jnc
-SGhXQ33eRtVtIEKdZCmpyxNUtFgtZhGUs9QX20GbHRg
--> ssh-ed25519 +oNaHQ k66ZToSUzHxDm0yZkI4+Gase/Q5GJrsB7c6+LvmgGSg
-6x9dzdloKJT2Tcawn4m2d518KUjdINGi4u+PFvMt9tQ
---- 395jqjDR3lBIIPOUIlnOJW/048qeJPC5CJbMJdpSjTo
-þÏ›Š<uI‚X"¤<0C>^CÚj};‡é´ÃKdÌíÒÅÙ—X•—bÔ§ÆÂWü,{7u+xšL]ÿž

secrets/tadpole/whib-signing-key.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 5R7G9A ncGAywK2O0Geyy5E9HmRdDCmCD7RwmflyyBXFKH4KSc
-4Izx8nT/k5yOMOG4InifQw+wzEDe9PqMyeF3LEicOKE
--> ssh-ed25519 +oNaHQ cPf/X971sb4pNKz9t0W318EpY3XJNB/OId7nGZ/ooXc
-Vp5x6PZML0jtPEjuaDo7KjtHdKv5SyPAS2+Fvhjbro8
---- 4jGA5763tvEcNDmNnYaoCfw99xROjqpKW0dMG23BqbE
-ŠŽ¼j^tþøª£…ÖÑB%<25>®a<>É×Å$öÖ8m}-LbMÎnè¼ÿþR÷×cZ–Áÿ=õˆ$xû«}¿Û)PHº{X”3¥á<C2A5>»¦¤’V±àü¶š½â£û€Õ•ª6Rs¦ùÌÿýr¡±b…nl<6E>]ƒž/ÈŽe@/‰*†¤õ:©Ú¸ãØV~¼¬V×a]`׫
-“¿¸=Ù¿v›z\…