diff --git a/.envrc b/.envrc index 3550a30..d208603 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,2 @@ use flake +watch_file parts/dev.nix diff --git a/flake.nix b/flake.nix index b3593f8..2f80cc1 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ perSystem = { pkgs, system, - self', ... }: { apps = (nixinate.nixinate.${system} self).nixinate; @@ -26,10 +25,9 @@ devShells.default = with pkgs; mkShellNoCC { packages = [ - agenix.packages.${system}.default just - self'.formatter statix + agenix.packages.${system}.default ]; }; diff --git a/global/utils.nix b/global/utils.nix index ed75352..c0eda93 100644 --- a/global/utils.nix +++ b/global/utils.nix @@ -61,6 +61,6 @@ } ]; - systemd.services."${backend}-mc-${name}".serviceConfig.TimeoutSec = "300"; + systemd.services."${backend}-${name}".serviceConfig.TimeoutSec = "300"; }; } diff --git a/secrets/etna/upsdUserPass.age b/secrets/etna/upsdUserPass.age index aed6689..b33f108 100644 --- a/secrets/etna/upsdUserPass.age +++ b/secrets/etna/upsdUserPass.age @@ -1,13 +1,13 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlYWtiKzZIZnk2S1NzWmZL -UHBWZ0tMYXE2N0trck1DTGNJSjlXeVczODNRCndmMHY5TTZiSDl4TUlBYlcrRTBP -RUd1bzBWUi9MQmppVmlmTUpxcmxEWHcKLT4gWDI1NTE5IDB1ek14Ujhjc0tRcit3 -TnZxT1BjcTErV2dSTVg2OG9YUWJvVHEzR25DMncKcVJhbVlPSVVOZko0RktteWpm -WmhtZjludE02bm4zUjlnRVR6UnFpUCthYwotPiBYMjU1MTkgNXFPRjFzUVZYSmNJ -QVc3anpqdlBLVUNSb0QyWUYwalM5aTk5UTJQcnhpbwphOUZLeTJKei9oeWQvQ0Qw -MEJONjBNMys4ZUdDN3NDdjF3VUFZam9lbjMwCi0+IFgyNTUxOSBnL1dhU1J5OWd1 -ekdIWFA5aHFzcUQwSDVVRGtvNm5xb0NHbGx1dTVvUlFzCjlFaFA0MVlsc01FNUgz -RXFlNms4czMwY2NtNnJDSklNMTFXR1g4d2xQRzAKLS0tIFF0ZWQ1T0VoZkxwTnp3 -QXNNenh1OXhYaFhKZXVWRURVcFU2MFhFa0FlNmMKGA3EotEX/dbJi1wvdytAAJGN -tH255TE5qwgA7nzOGJXsw0+x01gcjkUxCkm2h/6SjBL89Q7o9IU2oj/oNw== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiaFE3Nm5oOVFHTXhPU2lL +TUFFMW1DeE5nVVlzYmZTQVhvY3VYMDM4TUNNCnpkZVRzRHB5aFpZalVXU3g0OXRU +d3hCQ0I3d2JwaTZkUUZWbmlsR1Q5cGcKLT4gWDI1NTE5IElzZCtzdHRtb2xiTlg5 +WjVEb2NvVXovaTlmcm5RU1hac3dkYnBMekZsQnMKKzBPcnRnSzl4RzVnT2RPZW9k +WXdiQkxjamRsaFBiYzMyUlM1Z0lLL2hTVQotPiBYMjU1MTkgcEVLcFFqTHNjZzAw +VDI4Nk1XWnE1dFJqZE5MOEhwb0VQV0hpbGErZWdSRQpJTWlTdzVaYnk4d0xuNkc0 +YXlHOUFJbFQ2Ty9YZUFzVlozWHI2WFpJaXBvCi0+IFgyNTUxOSA1THM4L1NoNjJj +QkhMeGdRcGhmdG82dWZSUEtYSXJEblZFeDZMMWpkdUc0Cjc0TjR5RXQyMkdCdGZq +SmRhUnd1WXZ6MGNBeUNTY2JtbHVTbjZwYm91UTgKLS0tIGR6MXU0NSsxdWptK2tj +ZENTU0JlSlZGTDRIN29WSDFTaCtOSDJBUEpyRDAKqviriYjN2oOLIh6Rk5YTpCoC +zlEp6FM9q4csg3niPkgovpIyYBTa/QkG -----END AGE ENCRYPTED FILE----- diff --git a/systems/etna/minecraft.nix b/systems/etna/minecraft.nix index b684192..8a0c797 100644 --- a/systems/etna/minecraft.nix +++ b/systems/etna/minecraft.nix @@ -60,13 +60,14 @@ in { systemd.services.restart-minecraft-servers = { wantedBy = ["multi-user.target"]; startAt = "*-*-* 05:00:00"; - restartIfChanged = false; - script = "${lib.getExe' pkgs.systemd "systemctl"} restart ${backend}-mc-*.service"; + script = '' + ${lib.getExe' pkgs.systemd "systemctl"} restart ${backend}-mc-*.service + ''; serviceConfig = { Type = "oneshot"; - RemainAfterExit = true; + DynamicUser = true; }; }; }