From 383c41bd3a80d01dd49466f29750556f448ff5d4 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 30 Dec 2021 05:28:09 +0100
Subject: [PATCH] Cleanup apollo config

---
 nixos/machines/apollo/configuration.nix | 49 ++++++++++++-------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/nixos/machines/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix
index a3a023ae..7d4b06c6 100644
--- a/nixos/machines/apollo/configuration.nix
+++ b/nixos/machines/apollo/configuration.nix
@@ -24,15 +24,15 @@ in
   networking = {
     hostName = "apollo";
     domain = "m-0.eu";
-    firewall.allowedTCPPorts = [
-      4713
-      8123 # Weiterleitung von stream.maralorn.de
-      64738
-    ];
-    firewall.allowedUDPPorts = [
-      4713
-      64738
-    ];
+    networkmanager.enable = true;
+    firewall = {
+      allowedTCPPorts = [
+        4713 # pulseaudio
+      ];
+      allowedUDPPorts = [
+        4713 # pulseaudio
+      ];
+    };
     wireguard.interfaces = {
       m0wire = {
         allowedIPsAsRoutes = false;
@@ -143,26 +143,25 @@ in
   };
 
   boot.kernel.sysctl."fs.inotify.max_user_watches" = 204800;
-  networking = { networkmanager.enable = true; };
   console.keyMap = "neo";
 
   sound.enable = true;
-  hardware = {
-    opengl = {
-      enable = true;
-      driSupport32Bit = true; # for gw2
-    };
-    pulseaudio = {
-      enable = true;
-      support32Bit = true;
-      tcp = {
-        enable = true;
-        anonymousClients.allowedIpRanges = [ "127.0.0.1" "::1" "192.168.178.0/24" ];
-      };
-    };
-  };
+  #hardware = {
+  #opengl = {
+  #enable = true;
+  #driSupport32Bit = true; # for gw2
+  #};
+  #pulseaudio = {
+  #enable = true;
+  #support32Bit = true;
+  #tcp = {
+  #enable = true;
+  #anonymousClients.allowedIpRanges = [ "127.0.0.1" "::1" "192.168.178.0/24" ];
+  #};
+  #};
+  #};
 
-  virtualisation.docker.enable = true;
+  # virtualisation.docker.enable = true;
 
   system.stateVersion = "19.09";
 }