Formatting

This commit is contained in:
Malte Tammena 2021-12-21 17:09:08 +01:00
parent 8e6eb554cc
commit 001440e32b
4 changed files with 16 additions and 14 deletions

View file

@ -11,8 +11,7 @@
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
[{ device = "/dev/disk/by-label/swap"; }];
hardware.cpu.amd.updateMicrocode = hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware; lib.mkDefault config.hardware.enableRedistributableFirmware;

View file

@ -105,7 +105,7 @@ in {
vlc vlc
xdg_utils xdg_utils
xournalpp xournalpp
yt-dlp #youtube-dl alternative that doesn't suck yt-dlp # youtube-dl alternative that doesn't suck
wev wev
wl-clipboard wl-clipboard
]; ];

View file

@ -8,11 +8,12 @@ let
fetchTime = "*-*-* 03:00:00"; fetchTime = "*-*-* 03:00:00";
clearTime = "Mon *-*-* 04:00:00"; clearTime = "Mon *-*-* 04:00:00";
insertResetNoteCmd = with pkgs; pkgs.writeScriptBin "insert-reset-note" '' insertResetNoteCmd = with pkgs;
#!${stdenv.shell} pkgs.writeScriptBin "insert-reset-note" ''
DATE=$(${coreutils}/bin/date +backup_%Y-%m-%d_%H:%M:%S%z.reset) #!${stdenv.shell}
touch ./''${DATE} DATE=$(${coreutils}/bin/date +backup_%Y-%m-%d_%H:%M:%S%z.reset)
''; touch ./''${DATE}
'';
in { in {
systemd.services = { systemd.services = {
@ -46,8 +47,7 @@ in {
WorkingDirectory = "/srv/hnd/ccqcraft-backups"; WorkingDirectory = "/srv/hnd/ccqcraft-backups";
ExecStart = ExecStart =
[ ''${pkgs.openssh}/bin/ssh "${user}@${host}" rm ${path}/*'' ]; [ ''${pkgs.openssh}/bin/ssh "${user}@${host}" rm ${path}/*'' ];
ExecStartPost = ExecStartPost = [ "${insertResetNoteCmd}/bin/insert-reset-note" ];
[ "${insertResetNoteCmd}/bin/insert-reset-note" ];
}; };
}; };
}; };

View file

@ -18,12 +18,15 @@ in {
"$6$D69mzkGZAitfCQOL$oL/7SmSqGwRhZgyiOEgp6N5NkZ/NpdzggomtPFa4XB33Kb3aZMBiLWQS3VSHZhRo2y9mPgXy3mFPSvtvCzoKz/"; "$6$D69mzkGZAitfCQOL$oL/7SmSqGwRhZgyiOEgp6N5NkZ/NpdzggomtPFa4XB33Kb3aZMBiLWQS3VSHZhRo2y9mPgXy3mFPSvtvCzoKz/";
}; };
environment.systemPackages = with pkgs; [ git docker-compose megatools unzip ]; environment.systemPackages = with pkgs; [
git
docker-compose
megatools
unzip
];
networking.firewall = { networking.firewall = {
allowedTCPPorts = [ allowedTCPPorts = [ ports.minecraft ports.rcon ];
ports.minecraft ports.rcon
];
allowedUDPPorts = [ allowedUDPPorts = [
# Port used for Voicechat plugin # Port used for Voicechat plugin
ports.voicechat ports.voicechat