Compare commits

..

No commits in common. "0ec67df9a38a9f25cbe1842181591ada0eaf2725" and "3873ab7296915cc54f8d3689c38b5ad8a16a56dd" have entirely different histories.

6 changed files with 1 additions and 53 deletions

View File

@ -41,7 +41,6 @@ in
home.packages = [ home.packages = [
pkgs.noti # Create notifications programmatically pkgs.noti # Create notifications programmatically
pkgs.ice-bar # Menu bar hiding
]; ];
}; };

View File

@ -38,7 +38,6 @@ in
"d /var/lib/actualbudget 0770 actualbudget shared" "d /var/lib/actualbudget 0770 actualbudget shared"
]; ];
# TODO: switch to NixOS service
virtualisation.oci-containers.containers.actualbudget = { virtualisation.oci-containers.containers.actualbudget = {
workdir = null; workdir = null;
volumes = [ "/var/lib/actualbudget:/data" ]; volumes = [ "/var/lib/actualbudget:/data" ];
@ -62,35 +61,6 @@ in
autoStart = true; autoStart = true;
}; };
virtualisation.oci-containers.containers.actualbudget-prometheus-exporter = {
workdir = null;
user = builtins.toString config.users.users.actualbudget.uid;
pull = "missing";
privileged = false;
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.6";
hostname = null;
environmentFiles = [ config.secrets.actualbudget.dest ];
environment = {
ACTUAL_SERVER_URL = "http://127.0.0.1:5006";
ACTUAL_BUDGET_ID_1 = "My-Finances-1daef08";
};
dependsOn = [ "actualbudget" ];
autoStart = true;
};
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;
};
# Allow web traffic to Caddy # Allow web traffic to Caddy
nmasur.presets.services.caddy.routes = [ nmasur.presets.services.caddy.routes = [
{ {

View File

@ -1,17 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBQY3lv
SG9kNkN1S3RZdE80cWJTd0k0UkdiNmZXT085Um9Vd0FGYWpObHc0CnQvVjF4L0xu
ajNvQkFueVREaWxLWFhyNGkvL2ZlOHdEYXdTRkowbk9WUUUKLT4gc3NoLWVkMjU1
MTkgWXlTVU1RIE5aT3ZlMDJjNkJaZmFDV3ZKSHo5UEhnTlM5dHk1R0dYSXFNOWxJ
OThEaGcKcmNsMVUxaTI1b0FtbFdtMzlVYVZxcnllVmlwaDRuUkR4d3BNbm12eU5x
OAotPiBzc2gtZWQyNTUxOSBuanZYNUEgR3BmQk5Nd0E3RC9UQ1ZoWmxTNlhubjVZ
Vi8xL3V3YTNqUVh2ZVZrRkNtawpLaWhxY1FQajJZeGJzakd3ZDhrbmd4T2JNVlUy
dzFOMGcwRmJML3hPTzRBCi0+IHNzaC1lZDI1NTE5IENxSU9VQSBDNTQzZ0syVHNS
TTJPUm9OMUcyNTY5VGZkNEVESmt2eVQrSzJlUEgwS0E4ClRqbk9FTGZNRG9zSHlC
UXQyN0N1WDN4MHNrNFgrUjdQQUc4aU8xajRVdkEKLT4gc3NoLWVkMjU1MTkgejFP
Y1p3IHpiaEsvbCtwMlkyMWpJMS9XWExudDRpaE4xMmQ4eXIzU2RaTGd3TUg3eHMK
anpIV01KVDdvZGI5M1dmME1KaC9jcFkrVlN4TmlXN21tUnhIYnlEMEdHcwotLS0g
dy9LeGpiNkowQkNwOFNFeHUveGRveDRhajVtNEU3SWE0MEhOYTl6ZHM0QQq/Dg+2
OrqL8yCAai3J8djSktSmhAc/jdbEnHVdl3943Enyrn+Zz2HcUe96RySrleCt+QxL
Dezprhehi7jK7KmIAGOspicA0e/4GQ8txsb2fQ==
-----END AGE ENCRYPTED FILE-----

View File

@ -53,9 +53,6 @@ in
]; ];
}; };
# Don't enable vmagent because we already have victoriametrics running anyway
services.vmagent.enable = lib.mkForce false;
systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable { systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
description = "VictoriaMetrics basic auth proxy"; description = "VictoriaMetrics basic auth proxy";
after = [ "network.target" ]; after = [ "network.target" ];

View File

@ -23,9 +23,7 @@ in
}; };
services = { services = {
nix.enable = lib.mkDefault true; nix.enable = lib.mkDefault true;
openssh.enable = lib.mkDefault true;
prometheus-exporters.enable = lib.mkDefault true; prometheus-exporters.enable = lib.mkDefault true;
vm-agent.enable = lib.mkDefault true;
}; };
}; };

View File

@ -36,6 +36,7 @@ in
paperless.enable = lib.mkDefault true; paperless.enable = lib.mkDefault true;
postgresql.enable = lib.mkDefault true; postgresql.enable = lib.mkDefault true;
samba.enable = lib.mkDefault true; samba.enable = lib.mkDefault true;
vm-agent.enable = lib.mkDefault true;
}; };
}; };