Commit 557a793b731c

@@ -32,6 +32,7 @@
 
     # Remote build system
     ../../modules/job-notify
+    ../../modules/nixpkgs-consolidate
   ];
 
   # Firewall is enabled in openshift-port-forward.nix
@@ -64,6 +65,15 @@
     defaultTopic = "builds";
   };
 
+  # Nixpkgs WIP branch consolidation automation
+  services.nixpkgs-consolidate = {
+    enable = true;
+    user = "vincent";
+    schedule = "daily";
+    ntfyTokenFile = config.age.secrets."ntfy-token".path;
+    configFile = "/home/vincent/.config/nixpkgs-automation/branches.conf";
+  };
+
   services = {
     logind.settings.Login = {
       HandleLidSwitch = "ignore";
@@ -152,9 +162,7 @@
   };
 
   # Ollama Prometheus Exporter (Docker-based, built locally)
-  systemd.tmpfiles.rules = [
-    "d /var/lib/ollama-exporter 0755 root root -"
-  ];
+  # Note: systemd.tmpfiles.rules consolidated below with git-builds
 
   systemd.services.ollama-exporter = {
     description = "Ollama Prometheus Exporter";
@@ -207,8 +215,9 @@
     ];
   };
 
-  # Git builds directory structure
+  # Directory structure for systemd services
   systemd.tmpfiles.rules = [
+    "d /var/lib/ollama-exporter 0755 root root -"
     "d /var/lib/git-builds 0755 builder users -"
   ];