From 001440e32bd7244833eeedc0a53d7aaeebf25d65 Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Tue, 21 Dec 2021 17:09:08 +0100 Subject: [PATCH] Formatting --- hardware/netcup-rs-2000-g9.nix | 3 +-- malte/home.nix | 2 +- modules/ccqcraft-backups.nix | 14 +++++++------- modules/ccqcraft.nix | 11 +++++++---- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/hardware/netcup-rs-2000-g9.nix b/hardware/netcup-rs-2000-g9.nix index 39f1e9a..3778ee9 100644 --- a/hardware/netcup-rs-2000-g9.nix +++ b/hardware/netcup-rs-2000-g9.nix @@ -11,8 +11,7 @@ fsType = "ext4"; }; - swapDevices = - [{ device = "/dev/disk/by-label/swap"; }]; + swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/malte/home.nix b/malte/home.nix index d326637..c0feeb5 100644 --- a/malte/home.nix +++ b/malte/home.nix @@ -105,7 +105,7 @@ in { vlc xdg_utils xournalpp - yt-dlp #youtube-dl alternative that doesn't suck + yt-dlp # youtube-dl alternative that doesn't suck wev wl-clipboard ]; diff --git a/modules/ccqcraft-backups.nix b/modules/ccqcraft-backups.nix index d1dd408..4ada351 100644 --- a/modules/ccqcraft-backups.nix +++ b/modules/ccqcraft-backups.nix @@ -8,11 +8,12 @@ let fetchTime = "*-*-* 03:00:00"; clearTime = "Mon *-*-* 04:00:00"; - insertResetNoteCmd = with pkgs; pkgs.writeScriptBin "insert-reset-note" '' - #!${stdenv.shell} - DATE=$(${coreutils}/bin/date +backup_%Y-%m-%d_%H:%M:%S%z.reset) - touch ./''${DATE} - ''; + insertResetNoteCmd = with pkgs; + pkgs.writeScriptBin "insert-reset-note" '' + #!${stdenv.shell} + DATE=$(${coreutils}/bin/date +backup_%Y-%m-%d_%H:%M:%S%z.reset) + touch ./''${DATE} + ''; in { systemd.services = { @@ -46,8 +47,7 @@ in { WorkingDirectory = "/srv/hnd/ccqcraft-backups"; ExecStart = [ ''${pkgs.openssh}/bin/ssh "${user}@${host}" rm ${path}/*'' ]; - ExecStartPost = - [ "${insertResetNoteCmd}/bin/insert-reset-note" ]; + ExecStartPost = [ "${insertResetNoteCmd}/bin/insert-reset-note" ]; }; }; }; diff --git a/modules/ccqcraft.nix b/modules/ccqcraft.nix index 07493ab..cacc594 100644 --- a/modules/ccqcraft.nix +++ b/modules/ccqcraft.nix @@ -18,12 +18,15 @@ in { "$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 = { - allowedTCPPorts = [ - ports.minecraft ports.rcon - ]; + allowedTCPPorts = [ ports.minecraft ports.rcon ]; allowedUDPPorts = [ # Port used for Voicechat plugin ports.voicechat