disable terraria

2 files changed, 16 insertions, 28 deletions

diff --git a/config/terraria.nix b/config/terraria.nix
deleted file mode 100644
index 536bdf6..0000000
--- a/config/terraria.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  nixpkgs = {
-    config.allowUnfree = true;
-    overlays = [ (import ../overlays/terraria-server.nix) ];
-  };
-  networking.firewall.allowedTCPPorts = [ 7777 ];
-
-  environment.systemPackages = with pkgs; [ terraria-server ];
-}
diff --git a/machines/dragon.nix b/machines/dragon.nix
index 4663082..54bb28a 100644
--- a/machines/dragon.nix
+++ b/machines/dragon.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
-let
-  duid = "00:01:00:01:21:a2:4e:a8:d0:bf:9c:45:a6:ec";
-in
-{
+let duid = "00:01:00:01:21:a2:4e:a8:d0:bf:9c:45:a6:ec";
+in {
   imports = [
     ../config/router.nix
     ../config/mpd.nix
@@ -10,7 +8,6 @@ in
     ../config/dns.nix
     ../config/web-server.nix
     ../config/cgit.nix
-    ../config/terraria.nix
   ];
 
   orbekk.monitoring-server.enable = true;
@@ -27,7 +24,7 @@ in
 
   boot = {
     kernelParams = [ "console=tty0" ''console="ttyS0,115200n8"'' ];
-    
+
     loader.grub.extraConfig = ''
       GRUB_TERMINAL="serial"
       GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
@@ -37,13 +34,11 @@ in
     '';
     loader.grub.enable = true;
     loader.grub.version = 2;
-    loader.grub.devices = ["/dev/sda" "/dev/sdb"];
-  };
-  
-  networking = {
-    hostName = lib.mkForce "dragon";
+    loader.grub.devices = [ "/dev/sda" "/dev/sdb" ];
   };
 
+  networking = { hostName = lib.mkForce "dragon"; };
+
   # Required to enable password authentication for one user.
   security.pam.services.sshd.unixAuth = lib.mkForce true;
   services.openssh = {
@@ -81,20 +76,23 @@ in
   system.stateVersion = lib.mkForce "17.09";
 
   # hardware-configuration.nix
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "uhci_hcd" "xhci_pci" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules =
+    [ "ehci_pci" "ahci" "uhci_hcd" "xhci_pci" "usb_storage" "sd_mod" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3";
-      fsType = "btrfs";
-      options = [ "subvol=system/dragon-nixos,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKHV0LS-part3,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3,degraded" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3";
+    fsType = "btrfs";
+    options = [
+      "subvol=system/dragon-nixos,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKHV0LS-part3,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3,degraded"
+    ];
+  };
 
   swapDevices = [ ];
 
   nix.trustedUsers = [ "builder" ];
   nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = "ondemand";
- hardware.enableRedistributableFirmware = lib.mkDefault true;
+  hardware.enableRedistributableFirmware = lib.mkDefault true;
 }