platforms/nixos/modules/nmasur/presets/services/actualbudget/actualbudget-budget-id.age

@@ -1,17 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyA0VjJk
-a2c0Q1pVcEVCdjd3OE1xZ2s2a29YdjdWTUZkK1hnMFNwVTRVMVFVCkhpY2tjQmFz
-K3dzVEgrcnBuRlgyZzYwWGtiQzh6RjNtNmNUb2FSVCsxMTAKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIFM3cVpTaVFYK1NEYitaSEtLUE5yVDhXTGNHSnN3UjdROTVDeXND
-VjFUQjAKYnF6RWtjaFZNM1cxSTJUV0p4UExoenhicGpESEk0R2Q0VncrUldwSndi
-UQotPiBzc2gtZWQyNTUxOSBuanZYNUEgOTltRmlNNFQzTWpsVVdHUXBqS1lKRldJ
-dW9kVHJqZFRrQWFTK2ZDMi8zZwpTUlRqZUkzSWlibGhMVzRwQmdldVREeGpsRTRr
-L1FUZHowdVprNlEvVVJ3Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBjeUZRdmtENUQw
-Ukoxb3NNYU5JeE1OSVBGcWhPZS9mY1BEb0tVbnB3bVdNCnRHRXhpd0dEbWZuNEg0
-a1BMdk5yc2x6Y0EzQXo1U1hwZnJuUzJ1ckt1VDAKLT4gc3NoLWVkMjU1MTkgejFP
-Y1p3IExJeHhnTlgrSXpVYkxWdnZldlR4Q1JzZE9PWFowbWJSQ1pTbkp3YWFoUzgK
-L1ErSnZ3cWVXeVU0TThPaFVsVjBTdHh1YlQ3cTduQ2xIejZScEJSZGp6MAotLS0g
-SFJpT2JlSktBaFZhdjlyOWRhLzJiT21OditjczZJcU9iMFJMUzhNdzVZMAp0yAab
-89wcmBqmuQLoFYRs/Tj+UvWa4UaXvNFGZM9zIH8WEJDxO+QviDL1NETOuI4T9X1q
-JYa7c4PAwV8KgMkdKpHVJ3sN1+Kg82UXXSCTjpRHa33OBZTC
------END AGE ENCRYPTED FILE-----

platforms/nixos/modules/nmasur/presets/services/actualbudget/actualbudget.nix

@@ -67,41 +67,29 @@ in
       user = builtins.toString config.users.users.actualbudget.uid;
       pull = "missing";
       privileged = false;
-      ports = [ "127.0.0.1:5007:3001" ];
+      ports = [ "127.0.0.1:${builtins.toString cfg.port}:5007" ];
       networks = [ ];
       log-driver = "journald";
       labels = {
         app = "actualbudget-prometheus-exporter";
       };
-      image = "docker.io/sakowicz/actual-budget-prometheus-exporter:1.1.5";
+      image = "docker.io/sakowicz/actual-budget-prometheus-exporter:1.1.6";
       hostname = null;
-      environmentFiles = [
-        config.secrets.actualbudget-password.dest
-        config.secrets.actualbudget-budget-id.dest
-      ];
+      environmentFiles = [ config.secrets.actualbudget.dest ];
       environment = {
-        ACTUAL_SERVER_URL = "https://${hostnames.budget}:443";
+        ACTUAL_SERVER_URL = "http://127.0.0.1:5006";
+        ACTUAL_BUDGET_ID_1 = "My-Finances-1daef08";
       };
       dependsOn = [ "actualbudget" ];
       autoStart = true;
     };
 
-    nmasur.presets.services.prometheus-exporters.scrapeTargets = [
-      "127.0.0.1:5007"
-    ];
-
-    secrets.actualbudget-password = {
+    secrets.actualbudget = {
       source = ./actualbudget-password.age;
       dest = "${config.secretsDirectory}/actualbudget-password";
       owner = builtins.toString config.users.users.actualbudget.uid;
       group = builtins.toString config.users.users.actualbudget.uid;
     };
-    secrets.actualbudget-budget-id = {
-      source = ./actualbudget-budget-id.age;
-      dest = "${config.secretsDirectory}/actualbudget-budget-id";
-      owner = builtins.toString config.users.users.actualbudget.uid;
-      group = builtins.toString config.users.users.actualbudget.uid;
-    };
 
     # Allow web traffic to Caddy
     nmasur.presets.services.caddy.routes = [

platforms/nixos/modules/nmasur/presets/services/metrics/vm-agent.nix

@@ -11,7 +11,7 @@
 let
 
   inherit (config.nmasur.settings) hostnames;
-  cfg = config.nmasur.presets.services.vmagent;
+  cfg = config.nmasur.presets.services.vm-agent;
 
   username = "prometheus";
 
@@ -30,8 +30,8 @@ let
 in
 {
 
-  options.nmasur.presets.services.vmagent.enable =
-    lib.mkEnableOption "vmagent VictoriaMetrics collector";
+  options.nmasur.presets.services.vm-agent.enable =
+    lib.mkEnableOption "vm-agent VictoriaMetrics collector";
 
   config = lib.mkIf cfg.enable {
 

platforms/nixos/modules/nmasur/profiles/base.nix

@@ -25,7 +25,7 @@ in
         nix.enable = lib.mkDefault true;
         openssh.enable = lib.mkDefault true;
         prometheus-exporters.enable = lib.mkDefault true;
-        vmagent.enable = lib.mkDefault true;
+        vm-agent.enable = lib.mkDefault true;
       };
     };