configuration/services/battery-manager.nix

@@ -4,13 +4,9 @@
 
   services.batteryManager = {
     enable = true;
+    battery = "3ca39300-c523-4315-b9a3-d030f85a9373";
 
     emailFile = "${config.sops.secrets."battery-manager/email".path}";
     passwordFile = "${config.sops.secrets."battery-manager/password".path}";
-
-    settings = {
-      battery_id = "3ca39300-c523-4315-b9a3-d030f85a9373";
-      log_level = "DEBUG";
-    };
   };
 }

configuration/services/conduit/default.nix

@@ -59,8 +59,11 @@ in
     relay-ips = [ "116.202.158.55" ];
 
     # SSL config
-    pkey = "${config.security.acme.certs."tlater.net".directory}/key.pem";
-    cert = "${config.security.acme.certs."tlater.net".directory}/fullchain.pem";
+    #
+    # TODO(tlater): Switch to letsencrypt once google fix:
+    #  https://github.com/vector-im/element-android/issues/1533
+    pkey = config.sops.secrets."turn/ssl-key".path;
+    cert = config.sops.secrets."turn/ssl-cert".path;
 
     # Based on suggestions from
     # https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md

configuration/sops.nix

@@ -1,11 +1,18 @@
+{ config, lib, ... }:
 {
   sops = {
     defaultSopsFile = ../keys/production.yaml;
 
     secrets = {
-      "battery-manager/email" = { };
+      "battery-manager/email" = lib.mkIf config.services.batteryManager.enable {
+        owner = "battery-manager";
+        group = "battery-manager";
+      };
 
-      "battery-manager/password" = { };
+      "battery-manager/password" = lib.mkIf config.services.batteryManager.enable {
+        owner = "battery-manager";
+        group = "battery-manager";
+      };
 
       # Gitea
       "forgejo/metrics-token" = {

flake.nix

@@ -23,9 +23,11 @@
     };
 
     sonnenshift = {
-      url = "git+ssh://git@github.com/sonnenshift/battery-manager?ref=tlater/rust-rewrite";
+      url = "git+ssh://git@github.com/sonnenshift/battery-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixpkgs-crowdsec.url = "github:tlater/nixpkgs/tlater/fix-crowdsec";
   };
 
   outputs =
@@ -104,6 +106,7 @@
         in
         {
           default = vm.config.system.build.vm;
+          crowdsec = pkgs.callPackage "${inputs.nixpkgs-crowdsec}/pkgs/by-name/cr/crowdsec/package.nix" { };
           crowdsec-hub = localPkgs.crowdsec.hub;
           crowdsec-firewall-bouncer = localPkgs.crowdsec.firewall-bouncer;
         };

modules/crowdsec/default.nix

@@ -1,4 +1,5 @@
 {
+  flake-inputs,
   pkgs,
   lib,
   config,
@@ -8,6 +9,8 @@ let
   cfg = config.security.crowdsec;
   settingsFormat = pkgs.formats.yaml { };
 
+  crowdsec = flake-inputs.self.packages.${pkgs.system}.crowdsec;
+
   hub = pkgs.fetchFromGitHub {
     owner = "crowdsecurity";
     repo = "hub";
@@ -16,14 +19,14 @@ let
   };
 
   cscli = pkgs.writeShellScriptBin "cscli" ''
-    export PATH="$PATH:${cfg.package}/bin/"
+    export PATH="$PATH:${crowdsec}/bin/"
 
     sudo=exec
     if [ "$USER" != "crowdsec" ]; then
         sudo='exec /run/wrappers/bin/sudo -u crowdsec'
     fi
 
-    $sudo ${cfg.package}/bin/cscli "$@"
+    $sudo ${crowdsec}/bin/cscli "$@"
   '';
 
   acquisitions = ''
@@ -50,7 +53,7 @@ in
 
       package = lib.mkOption {
         type = package;
-        default = pkgs.crowdsec;
+        default = crowdsec;
       };
 
       stateDirectory = lib.mkOption {

pkgs/crowdsec/_sources/generated.json

@@ -21,7 +21,7 @@
     },
     "crowdsec-hub": {
         "cargoLocks": null,
-        "date": "2025-02-16",
+        "date": "2025-01-30",
         "extract": null,
         "name": "crowdsec-hub",
         "passthru": null,
@@ -33,10 +33,10 @@
             "name": null,
             "owner": "crowdsecurity",
             "repo": "hub",
-            "rev": "f7d7f476f88a4af05e1cfb3994536990adecfb57",
-            "sha256": "sha256-m78uipryHDKixJzrF4K59ioAJ3WJN1JlXEC0DNVMCJ8=",
+            "rev": "8f102f5ac79af59d3024ca2771b65ec87411ac02",
+            "sha256": "sha256-8K1HkBg0++Au1dr2KMrl9b2ruqXdo+vqWngOCwL11Mo=",
             "type": "github"
         },
-        "version": "f7d7f476f88a4af05e1cfb3994536990adecfb57"
+        "version": "8f102f5ac79af59d3024ca2771b65ec87411ac02"
     }
 }

pkgs/crowdsec/_sources/generated.nix

@@ -14,14 +14,14 @@
   };
   crowdsec-hub = {
     pname = "crowdsec-hub";
-    version = "f7d7f476f88a4af05e1cfb3994536990adecfb57";
+    version = "8f102f5ac79af59d3024ca2771b65ec87411ac02";
     src = fetchFromGitHub {
       owner = "crowdsecurity";
       repo = "hub";
-      rev = "f7d7f476f88a4af05e1cfb3994536990adecfb57";
+      rev = "8f102f5ac79af59d3024ca2771b65ec87411ac02";
       fetchSubmodules = false;
-      sha256 = "sha256-m78uipryHDKixJzrF4K59ioAJ3WJN1JlXEC0DNVMCJ8=";
+      sha256 = "sha256-8K1HkBg0++Au1dr2KMrl9b2ruqXdo+vqWngOCwL11Mo=";
     };
-    date = "2025-02-16";
+    date = "2025-01-30";
   };
 }