forked from pub-solar/os
Compare commits
3 commits
23b2009c29
...
35caff9c1e
Author | SHA1 | Date | |
---|---|---|---|
teutat3s | 35caff9c1e | ||
teutat3s | a4484248c6 | ||
teutat3s | 2afe36eacb |
56
flake.lock
56
flake.lock
|
@ -97,11 +97,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727826117,
|
"lastModified": 1730504689,
|
||||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -115,11 +115,11 @@
|
||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1726560853,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -183,11 +183,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730016908,
|
"lastModified": 1730633670,
|
||||||
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
|
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e83414058edd339148dc142a8437edb9450574c8",
|
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -262,11 +262,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730070491,
|
"lastModified": 1730779758,
|
||||||
"narHash": "sha256-+RYCbdU6l4E4pr40++lrdhdE3gNC/BR54AL7xWG/YRU=",
|
"narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "5c0c6aaa797d6ccbb6cdab14de0248135735709d",
|
"rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -318,11 +318,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730068391,
|
"lastModified": 1730797322,
|
||||||
"narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=",
|
"narHash": "sha256-cH9emjYIbDYTde/CKOmU97rh7sKuyfedzPcTz4OTJkE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "6906ac67a1078cf950b8527341e229eeecb5bc30",
|
"rev": "1b0b927860d7eb367ee6a3123ddeb7a8e24bd836",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -333,11 +333,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729880355,
|
"lastModified": 1730531603,
|
||||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -349,11 +349,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-24-05": {
|
"nixpkgs-24-05": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729973466,
|
"lastModified": 1730741070,
|
||||||
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -365,14 +365,14 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727825735,
|
"lastModified": 1730504152,
|
||||||
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
@ -525,11 +525,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729880355,
|
"lastModified": 1730531603,
|
||||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -35,6 +35,9 @@ in
|
||||||
IP_URL = "https://billing.faenix.eu";
|
IP_URL = "https://billing.faenix.eu";
|
||||||
DISABLE_SETUP = true;
|
DISABLE_SETUP = true;
|
||||||
SETUP_COMPLETED = true;
|
SETUP_COMPLETED = true;
|
||||||
|
# Useful for debugging, logs to
|
||||||
|
# /var/lib/invoiceplane/<domain>/logs/
|
||||||
|
#ENABLE_DEBUG=true;
|
||||||
};
|
};
|
||||||
|
|
||||||
poolConfig = {
|
poolConfig = {
|
||||||
|
@ -67,9 +70,9 @@ in
|
||||||
# repository = "rclone:cloud.pub.solar:/backups/InvoicePlane";
|
# repository = "rclone:cloud.pub.solar:/backups/InvoicePlane";
|
||||||
# backupPrepareCommand = ''
|
# backupPrepareCommand = ''
|
||||||
# PW=$(cat ${config.age.secrets."invoiceplane-db-password".path})
|
# PW=$(cat ${config.age.secrets."invoiceplane-db-password".path})
|
||||||
# ${pkgs.docker-client}/bin/docker exec -t invoiceplane-db mariadb-dump --all-databases --password=$PW --user=invoiceplane > "${backupDir}/postgres.sql"
|
# ${pkgs.mariadb-client}/bin/mariadb-dump --all-databases --password=$PW --user=invoiceplane > "${backupDir}/mariadb-dump.sql"
|
||||||
# '';
|
# '';
|
||||||
# rcloneConfigFile = config.age.secrets."rclone-pie.conf".path;
|
# rcloneConfigFile = config.age.secrets."rclone-fae.conf".path;
|
||||||
# };
|
# };
|
||||||
#};
|
#};
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,20 +68,6 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#services.caddy = {
|
|
||||||
# enable = true;
|
|
||||||
# globalConfig = ''
|
|
||||||
# local_certs
|
|
||||||
# '';
|
|
||||||
# virtualHosts = {
|
|
||||||
# "paperless.fritz.box" = {
|
|
||||||
# extraConfig = ''
|
|
||||||
# reverse_proxy :${builtins.toString config.services.paperless.port}
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
#};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
80
|
80
|
||||||
443
|
443
|
||||||
|
@ -93,8 +79,8 @@ in
|
||||||
"d '${backupDir}' 0700 ${psCfg.user.name} users - -"
|
"d '${backupDir}' 0700 ${psCfg.user.name} users - -"
|
||||||
];
|
];
|
||||||
|
|
||||||
#age.secrets."rclone-pie.conf" = {
|
#age.secrets."rclone-fae.conf" = {
|
||||||
# file = "${flake.self}/secrets/rclone-pie.conf.age";
|
# file = "${flake.self}/secrets/rclone-fae.conf.age";
|
||||||
# path = "/root/.config/rclone/rclone.conf";
|
# path = "/root/.config/rclone/rclone.conf";
|
||||||
# mode = "400";
|
# mode = "400";
|
||||||
#};
|
#};
|
||||||
|
@ -112,7 +98,7 @@ in
|
||||||
# # See https://www.hosting.de/blog/verschluesselte-backups-mit-rclone-und-restic-in-nextcloud/
|
# # See https://www.hosting.de/blog/verschluesselte-backups-mit-rclone-und-restic-in-nextcloud/
|
||||||
# repository = "rclone:cloud.pub.solar:/backups/Paperless";
|
# repository = "rclone:cloud.pub.solar:/backups/Paperless";
|
||||||
# backupPrepareCommand = "${dataDir}/paperless-manage document_exporter ${backupDir} -c -p";
|
# backupPrepareCommand = "${dataDir}/paperless-manage document_exporter ${backupDir} -c -p";
|
||||||
# rcloneConfigFile = config.age.secrets."rclone-pie.conf".path;
|
# rcloneConfigFile = config.age.secrets."rclone-fae.conf".path;
|
||||||
# };
|
# };
|
||||||
#};
|
#};
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,7 +68,7 @@ let
|
||||||
if isString v then
|
if isString v then
|
||||||
escapeShellArg v
|
escapeShellArg v
|
||||||
# NOTE: If any value contains a , (comma) this will not get escaped
|
# NOTE: If any value contains a , (comma) this will not get escaped
|
||||||
else if isList v && any lib.strings.isCoercibleToString v then
|
else if isList v && lib.strings.isConvertibleWithToString v then
|
||||||
escapeShellArg (concatMapStringsSep "," toString v)
|
escapeShellArg (concatMapStringsSep "," toString v)
|
||||||
else if isInt v then
|
else if isInt v then
|
||||||
toString v
|
toString v
|
||||||
|
|
Loading…
Reference in a new issue