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

8 files changed, 44 insertions, 274 deletions

diff --git a/modules/dashboard/bacchus-dashboard.service.nix b/modules/dashboard/bacchus-dashboard.service.nix
deleted file mode 100644
index 8b0fcb9..0000000
--- a/modules/dashboard/bacchus-dashboard.service.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-  cfg = config.services.bacchus-dashboard;
-
-  rootHTML = import ./dashboard-template.nix cfg;
-  indexHTMLFile = pkgs.writeText "index.html" rootHTML;
-
-  pageDir = pkgs.stdenv.mkDerivation {
-    pname = "dashboard-page";
-    version = "0.0.0";
-    unpackPhase = "true"; # no source
-    installPhase = ''
-      mkdir -p $out;
-      cp ${indexHTMLFile} $out/index.html;
-    '';
-  };
-in
-{
-  options.services.bacchus-dashboard = {
-    enable = mkEnableOption "Enable dashboard";
-    title = mkOption { type = types.str; default = "Dashboard"; };
-    links = mkOption {
-      type = types.listOf (types.attrs);
-      default = [];
-    };
-    embedLink = mkOption { type = types.str; };
-    openFirewall = mkEnableOption "Open firewall ports";
-    host = mkOption { type = types.str; default = "_"; };
-    port = mkOption { type = types.int; default = 80; };
-  };
-
-  config = {
-    services.nginx = mkIf cfg.enable {
-      enable = true;
-      virtualHosts.${cfg.host} = {
-        listen = [ { addr = toString cfg.port; } ];
-        locations."/" = {
-          root = pageDir;
-          tryFiles = "$uri /index.html";
-        };
-      };
-    };
-
-    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 80 ];
-  };
-}
diff --git a/modules/dashboard/dashboard-template.nix b/modules/dashboard/dashboard-template.nix
deleted file mode 100644
index 9883a1d..0000000
--- a/modules/dashboard/dashboard-template.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{ title, links ? [], embedLink ? null, ... }:
-with builtins;
-let
-  withLinkAttr = link: attr: def: value:
-    if hasAttr attr link then value else def;
-
-  linkHTML = link: ''
-    <a href="${link.url}" class="card" style="${withLinkAttr link "color" "" "--color-card-accent: ${link.color}"}">
-      ${link.title} ${if hasAttr "key" link then "(${link.key})" else ""}
-      <div class="card-link">${link.url}</div>
-      ${if hasAttr "altUrl" link then ''<div class="card-link">(Alt: ${link.altUrl})</div>'' else ""}
-    </a>
-  '';
-
-  script = ''
-    window.addEventListener('keydown', (event) => {
-      const noMod = !event.ctrlKey && !event.altKey;
-      ${concatStringsSep "\n" (map (link:
-        withLinkAttr link "key" "" ''
-          if (event.key.toLowerCase() == ${toJSON link.key} && noMod) {
-            event.preventDefault();
-            if (event.shiftKey)
-              window.open(${toJSON link.url});
-            else
-              window.location.href = ${toJSON link.url};
-            return;
-          }
-        ''
-      ) links)}
-    });
-  '';
-
-  styles = ''
-    :root {
-      font-size: 16px;
-      color: #dbe0f9;
-      font-family: JetBrains Mono, monospace;
-      --color-gray: #1a1824;
-    }
-    html, body {
-      background-color: #0f0c19;
-      padding: 0;
-      margin: 0;
-    }
-    body * { box-sizing: border-box; }
-    header {
-      padding: 1rem 2rem;
-      background-color: #000;
-    }
-    .links-container {
-      display: grid;
-      gap: 1rem;
-      grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
-      padding: 0 1rem;
-      width: 100%;
-      margin: 1rem auto 2rem;
-    }
-    .card {
-      --color-card-accent: #8e7ae3;
-      display: block;
-      padding: 1rem 1.5rem;
-      font-size: 1.2rem;
-      color: var(--color-card-accent);
-      text-decoration: none;
-      border: 2px solid var(--color-gray);
-      position: relative;
-    }
-    .card::before {
-      content: " ";
-      position: absolute;
-      left: 0; top: 0;
-      width: 4px; height: 100%;
-      background-color: var(--color-card-accent);
-    }
-    .card:hover {
-      border-color: var(--color-card-accent);
-      background-color: rgba(255,255,255,0.05);
-    }
-    .card:focus {
-      border-color: var(--color-card-accent);
-      outline: none;
-    }
-    .card-link {
-      font-size: 0.5em;
-      padding-top: 1em;
-      color: gray;
-    }
-    button {
-      background: none;
-      padding: 0;
-      text-decoration: underline;
-      color: gray;
-      margin: 0;
-      border: 0;
-    }
-    .stats-container {
-      padding: 1rem;
-      border-top: 1px solid var(--color-gray);
-    }
-    .stats-container iframe {
-      width: 100%;
-      display: block;
-      min-height: 1100px;
-      height: 100%;
-      border: 2px solid var(--color-gray);
-      border-radius: 5px;
-    }
-  '';
-
-  headerHTML = ''
-    <header>${title}</header>
-  '';
-in
-''
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>${title}</title>
-    <style>${styles}</style>
-  </head>
-  <body>
-    ${headerHTML}
-    <section class="links-container">
-      ${concatStringsSep "" (map linkHTML links)}
-    </section>
-    ${if embedLink == null then "" else ''
-      <section class="stats-container">
-        <iframe src="${embedLink}"></iframe>
-      </section>
-    ''}
-    <script>${script}</script>
-  </body>
-</html>
-''
diff --git a/modules/dashboard/default.nix b/modules/dashboard/default.nix
index 196eab1..c1de246 100644
--- a/modules/dashboard/default.nix
+++ b/modules/dashboard/default.nix
@@ -4,7 +4,7 @@ let
   ports = settings.network.ports;
 in
 {
-  imports = [ ./bacchus-dashboard.service.nix ];
+  imports = [ ../../services/bacchus-dashboard/bacchus-dashboard.service.nix ];
 
   services.bacchus-dashboard = {
     enable = true;
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"; }
+  ];
+}
diff --git a/modules/network/default.nix b/modules/network/default.nix
index 290c291..78fac75 100644
--- a/modules/network/default.nix
+++ b/modules/network/default.nix
@@ -8,9 +8,15 @@ in
   imports = [
     ./wireless.nix
     ./ssh.nix
-    ./service-router.service.nix
+    ../../services/service-router.service.nix
+    ../../services/bacchus-dns.service.nix
   ];
 
+  networking = {
+    hostName = "bacchus";
+    firewall.enable = true;
+  };
+
   services.service-router = {
     enable = true;
     routes = {
@@ -23,12 +29,15 @@ in
       "syncthing.local" = { inherit host; port = ports.syncthing; };
       "lidarr.local" = { inherit host; port = ports.lidarr; };
       "ntfy.local" = { inherit host; port = ports.ntfy; };
-      "grafana.local" = { inherit host; port = ports.grafana; extraOptions.recommendedProxySettings = true; };
+      "grafana.local" = { inherit host; port = ports.grafana; extraNginxOptions.recommendedProxySettings = true; };
     };
   };
 
-  networking = {
-    hostName = "bacchus";
-    firewall.enable = true;
+  # Host mappings defined by service-router
+  services.bacchus-dns = {
+    enable = true;
+    port = 53;
+    openFirewall = true;
+    fallback = [ "1.1.1.1" "8.8.8.8" ];
   };
 }
diff --git a/modules/network/service-router.service.nix b/modules/network/service-router.service.nix
deleted file mode 100644
index 14fc1b2..0000000
--- a/modules/network/service-router.service.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ config, lib, dns, ... }:
-with lib;
-let
-  cfg = config.services.service-router;
-  domainAZone = domain: record: {
-    A = [ record ];
-    SOA = {
-      nameServer = "ns.${domain}.";
-      adminEmail = "dont@email.me";
-      serial = 2019030800;
-    };
-    NS = [ "ns.${domain}." ];
-  };
-in {
-  options.services.service-router = {
-    enable = mkEnableOption "enable router";
-    routes = mkOption {
-      type = types.attrsOf (types.submodule { options = {
-        port = mkOption { type = types.int; };
-        host = mkOption { type = types.str; default = "127.0.0.1"; };
-        protocol = mkOption { type = types.str; default = "http"; };
-        basePath = mkOption { type = types.str; default = ""; };
-        nginx = mkOption { type = types.attrs; default = {}; };
-        extraOptions = mkOption { type = types.attrs; default = {}; };
-      }; });
-      default = {};
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.nginx = {
-      enable = true;
-      recommendedOptimisation = true;
-      virtualHosts = lib.mapAttrs (_: val:
-        let
-          opts = if hasAttr "extraOptions" val then val.extraOptions else {};
-        in {
-          locations."/" = if val.nginx == {} then {
-            proxyPass =
-              "${val.protocol}://${val.host}:${toString val.port}${val.basePath}";
-            proxyWebsockets = true;
-          } // opts else val.nginx;
-        }
-      ) cfg.routes;
-    };
-
-    services.nsd = {
-      enable = true;
-      interfaces = [ "0.0.0.0" ];
-      zones = lib.mapAttrs (domain: val: {
-        data = dns.lib.toString domain (domainAZone domain val.host);
-      }) cfg.routes;
-    };
-    networking.firewall.allowedTCPPorts = [ 53 ];
-    networking.firewall.allowedUDPPorts = [ 53 ];
-
-    networking.hosts."127.0.0.1" = lib.mapAttrsToList (name: _: name) cfg.routes;
-  };
-}
diff --git a/modules/users.nix b/modules/users/default.nix
index 223a2f8..7969496 100644
--- a/modules/users.nix
+++ b/modules/users/default.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, ... }:
 let
-  settings = import ../settings.nix { inherit lib; };
+  settings = import ../../settings.nix { inherit lib; };
 in
 {
   users.users.root.password = settings.passwords.root;