This commit is contained in:
41666 2025-04-11 21:08:25 -07:00
parent 3efe26c5bf
commit 08c769f2ec
4 changed files with 93 additions and 39 deletions

118
flake.lock generated
View file

@ -146,6 +146,24 @@
"type": "github"
}
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_5"
},
"locked": {
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -222,11 +240,11 @@
]
},
"locked": {
"lastModified": 1743556466,
"narHash": "sha256-rvU79DJ6rPDxiH0sTp686Vlm+JewwAZPGcwt8OfHJbM=",
"lastModified": 1744400600,
"narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5ee44bc7c2e853f144390a12ebe5174ad7e3b9e0",
"rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3",
"type": "github"
},
"original": {
@ -393,11 +411,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1743420942,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"lastModified": 1744366945,
"narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1",
"type": "github"
},
"original": {
@ -483,13 +501,25 @@
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
}
},
"nixpkgs-lib_5": {
"locked": {
"lastModified": 1717284937,
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1743564986,
"narHash": "sha256-1Iw5F3/WF8Cai6nqzJyuQChppKG0bJoTUTow7c4Cyak=",
"lastModified": 1744427317,
"narHash": "sha256-quy0WwmYByovvoATunSrItduluPgdydjQsDBqPJryuw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "73568195d9be8a300a9ca17b6bfb7d1d65aed1ae",
"rev": "9663c3e85ab9798d4655d67b3306cbdb6f643373",
"type": "github"
},
"original": {
@ -501,11 +531,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1743501102,
"narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=",
"lastModified": 1744309437,
"narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4",
"rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
"type": "github"
},
"original": {
@ -517,11 +547,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1743448293,
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
"lastModified": 1744232761,
"narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
"rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
"type": "github"
},
"original": {
@ -565,11 +595,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1743448293,
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
"lastModified": 1744232761,
"narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
"rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
"type": "github"
},
"original": {
@ -581,11 +611,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1743441817,
"narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=",
"lastModified": 1743689281,
"narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e",
"rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
"type": "github"
},
"original": {
@ -603,11 +633,11 @@
]
},
"locked": {
"lastModified": 1736141144,
"narHash": "sha256-B8+ufizwKxcsiim1JwGMWuBV0mzT21YTOWGJ8vB++Cg=",
"lastModified": 1744430215,
"narHash": "sha256-TJ+qDke9oB6PvMboWYdLM2zHAsqSFHXNN8tnqmQUJQs=",
"ref": "refs/heads/main",
"rev": "05677857384453abcccc4ea2a3b5273753673a4e",
"revCount": 99,
"rev": "0599972821936ef4bfd5b1fd876de5dd4fb0c852",
"revCount": 100,
"type": "git",
"url": "https://git.sapphic.engineer/noe/noe.sh"
},
@ -660,6 +690,27 @@
"type": "github"
}
},
"ps2live": {
"inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1744142874,
"narHash": "sha256-5mlwHMWeuyL0pRQ1jebK2r4nFqYwDbzHypFolUR2AhY=",
"ref": "refs/heads/main",
"rev": "99dac60e1c262236937897f454f7a40904c1aa94",
"revCount": 8,
"type": "git",
"url": "https://git.sapphic.engineer/ps2.live/ps2.live"
},
"original": {
"type": "git",
"url": "https://git.sapphic.engineer/ps2.live/ps2.live"
}
},
"root": {
"inputs": {
"doll-repair": "doll-repair",
@ -680,6 +731,7 @@
"noe-sh": "noe-sh",
"plapkit": "plapkit",
"plasma-manager": "plasma-manager",
"ps2live": "ps2live",
"saerro": "saerro",
"sops-nix": "sops-nix",
"tachikoma": "tachikoma"
@ -708,17 +760,17 @@
},
"saerro": {
"inputs": {
"flake-parts": "flake-parts_4",
"flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1743566083,
"narHash": "sha256-yCmrP/FPIDYp8GMk2T0KiZ5LXcW8paLaJZoqhR93Io8=",
"lastModified": 1743604925,
"narHash": "sha256-ABguvW27jr3Vg6BmDwQe/Exqx512K0vS+rJNGImZO+c=",
"ref": "refs/heads/main",
"rev": "630c958642cac6c843d0a3ac418a5234ef0c220c",
"revCount": 13,
"rev": "d097c638ad35cdc196172dba795e5795381d5453",
"revCount": 14,
"type": "git",
"url": "https://git.sapphic.engineer/ps2.live/saerro-go"
},
@ -732,11 +784,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1743502316,
"narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=",
"lastModified": 1744103455,
"narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8",
"rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba",
"type": "github"
},
"original": {

View file

@ -54,7 +54,7 @@ in rec {
# "3d.noe.sh" = static { src = flakePackage "3d-noe-sh"; aliases = [ "art.mekanoe.com" ]; };
"doll.repair" = static { src = flakePackage "doll-repair"; };
"blood.pet" = static { src = flakePackage "blood-pet"; };
# "blood.pet" = static { src = flakePackage "blood-pet"; };
"foxxolay.com" = static {
url = "https://github.com/foxxolay/foxxolay.com.git";

View file

@ -38,7 +38,7 @@ in {
};
systemd.timers.restart-upgrade-aggmeta = {
wantedBy = [ "timers.target" ];
wantedBy = [ "timers.target" "podman-metagame.service" ];
timerConfig = {
Unit = "restart-upgrade-aggmeta.service";
OnUnitActiveSec = "360m";
@ -48,12 +48,13 @@ in {
systemd.services.start-aggpop-if-stopped = {
serviceConfig.Type = "oneshot";
script = ''
systemctl start podman-aggpop
curl --connect-timeout 3 -sSL localhost:${port 0} || \
systemctl restart podman-aggpop
'';
};
systemd.timers.start-aggpop-if-stopped = {
wantedBy = [ "timers.target" ];
wantedBy = [ "timers.target" "podman-aggpop.service" ];
timerConfig = {
Unit = "start-aggpop-if-stopped.service";
OnUnitActiveSec = "15m";

View file

@ -70,7 +70,7 @@ in {
};
systemd.timers.restart-upgrade-saerro = {
wantedBy = [ "timers.target" ];
wantedBy = [ "timers.target" "podman-saerro_api.service" ];
timerConfig = {
Unit = "restart-upgrade-saerro.service";
OnUnitActiveSec = "420m";
@ -81,11 +81,12 @@ in {
serviceConfig.Type = "oneshot";
script = ''
systemctl start podman-saerro_ws
systemctl start podman-saerro_pruner
'';
};
systemd.timers.start-saerro-if-stopped = {
wantedBy = [ "timers.target" ];
wantedBy = [ "timers.target" "podman-saerro_ws.service" "podman-saerro_pruner.service" ];
timerConfig = {
Unit = "start-saerro-if-stopped.service";
OnUnitActiveSec = "15m";