Switch to coredns + refactor dns hosts mapping into service + more refactor

2 files changed, 28 insertions, 25 deletions

diff --git a/modules/hardware.nix b/modules/hardware/default.nix
index 7b11ca6..098b3cc 100644
--- a/modules/hardware.nix
+++ b/modules/hardware/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
+    ./fs.nix
   ];
 
   boot.initrd = {
@@ -44,30 +45,5 @@
     efi.canTouchEfiVariables = true;
   };
 
-  # File system
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/nixos";
-      fsType = "ext4";
-    };
-    "/boot" = {
-      device = "/dev/disk/by-label/boot";
-      fsType = "vfat";
-    };
-    "/media" = {
-      device = "/dev/disk/by-label/media";
-      fsType = "ext4";
-      options = [ "rw" "nofail" "x-systemd.automount" "x-systemd.mount-timeout=30s" ];
-    };
-  };
-  swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
-
   networking.useDHCP = lib.mkDefault true;
-
-  systemd.extraConfig = ''DefaultLimitNOFILE=65536'';
-  systemd.user.extraConfig = ''DefaultLimitNOFILE=65536'';
-  boot.kernel.sysctl."fs.inotify.max_user_instances" = 8192;
-  security.pam.loginLimits = [
-    { domain = "*"; type = "-"; item = "nofile"; value = "65536"; }
-  ];
 }
diff --git a/modules/hardware/fs.nix b/modules/hardware/fs.nix
new file mode 100644
index 0000000..aaf67d6
--- /dev/null
+++ b/modules/hardware/fs.nix
@@ -0,0 +1,27 @@
+{ ... }:
+{
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/nixos";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-label/boot";
+      fsType = "vfat";
+    };
+    "/media" = {
+      device = "/dev/disk/by-label/media";
+      fsType = "ext4";
+      options = [ "rw" "nofail" "x-systemd.automount" "x-systemd.mount-timeout=30s" ];
+    };
+  };
+  swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
+
+  # Set high limits for file watching/file handles
+  systemd.extraConfig = ''DefaultLimitNOFILE=65536'';
+  systemd.user.extraConfig = ''DefaultLimitNOFILE=65536'';
+  boot.kernel.sysctl."fs.inotify.max_user_instances" = 8192;
+  security.pam.loginLimits = [
+    { domain = "*"; type = "-"; item = "nofile"; value = "65536"; }
+  ];
+}