reorganize some depo nix files

3 files changed, 12 insertions, 7 deletions

diff --git a/depo/nutin-madaj/default.nix b/depo/nutin-madaj/default.nix
index fdfb32e..4fae1e3 100644
--- a/depo/nutin-madaj/default.nix
+++ b/depo/nutin-madaj/default.nix
@@ -48,8 +48,6 @@ import "${nixpkgs}/nixos" {
       (import ../../pack/overlay.nix)
     ];
 
-    networking.firewall.allowedTCPPorts = [ 22 80 443 ];
-
     programs.mosh = {
       enable = true;
       withUtempter = true;
@@ -85,8 +83,6 @@ import "${nixpkgs}/nixos" {
     };
 
     boot.cleanTmpDir = true;
-    networking.hostName = "simatime";
-    networking.firewall.allowPing = true;
     services.openssh.enable = true;
   };
 }
diff --git a/depo/nutin-madaj/mail.nix b/depo/nutin-madaj/mail.nix
index 39ed456..81bddc2 100644
--- a/depo/nutin-madaj/mail.nix
+++ b/depo/nutin-madaj/mail.nix
@@ -4,7 +4,7 @@
   mailserver = {
     enable = true;
     monitoring = {
-      enable = true;
+      enable = false;
       alertAddress = "bsima@me.com";
     };
     fqdn = "simatime.com";
@@ -16,6 +16,7 @@
     enablePop3Ssl = true;
     enableManageSieve = true;
     virusScanning = false; # ur on ur own
+    localDnsResolver = true;
 
     loginAccounts = {
       "ben@simatime.com" = {
diff --git a/depo/nutin-madaj/networking.nix b/depo/nutin-madaj/networking.nix
index 6c55005..4cfd73d 100644
--- a/depo/nutin-madaj/networking.nix
+++ b/depo/nutin-madaj/networking.nix
@@ -1,7 +1,15 @@
 { lib, ... }: {
-  # This file was populated at runtime with the networking
-  # details gathered from the active system.
   networking = {
+
+    hostName = "simatime";
+
+    firewall = {
+      allowedTCPPorts = [ 22 80 443 ];
+      allowPing = true;
+    };
+
+    # This following was populated at runtime with the networking details
+    # gathered from the active system.
     nameservers = [
       "67.207.67.2"
       "67.207.67.3"