From 47a8bf4dd2cb1f6778b38bc2f4990ba72366d5a9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 30 Dec 2020 18:30:53 +0100
Subject: machines/profpatsch/base-server: convert module to toml definition

This is a working PoC of specifying module configs as toml
configuration with simple to understand semantics.

Both the option definitions and the actual config values can be
specified via the toml DSL.

This is extremely happy-path for now, so errors are gonna be horrible.
---
 machines/profpatsch/base-server.nix | 51 +++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 22 deletions(-)

(limited to 'machines/profpatsch/base-server.nix')

diff --git a/machines/profpatsch/base-server.nix b/machines/profpatsch/base-server.nix
index 921e5d8d..7b0a714a 100644
--- a/machines/profpatsch/base-server.nix
+++ b/machines/profpatsch/base-server.nix
@@ -1,36 +1,43 @@
 { config, pkgs, lib, ... }:
 
 let
-  cfg = config.vuizvui.user.profpatsch.server;
+  cfgImports = (import ../../pkgs/profpatsch/nixos-toml-modules.nix { inherit lib; }).readAnyToml ./base-server.toml
+    config;
 
 in
 {
-  imports = [
-    ./base.nix
-  ];
+  inherit (cfgImports) imports;
 
-  options.vuizvui.user.profpatsch.server.sshPort = lib.mkOption {
-    description = "ssh port";
-    # TODO: replace with types.intBetween https://github.com/NixOS/nixpkgs/pull/27239
-    type = with lib.types; addCheck int (x: x >= 0 && x <= 65535);
-    default = 6879;
-  };
+  # TODO: cannot read options from pkgs because it would lead to an infinite recursion
+  # in the module system, since the pkgs passed into this module already requires all options.
+  options = ((import ../../pkgs/profpatsch/nixos-toml-modules.nix { inherit lib; }).readAnyToml ./base-server-options.toml).options
+    ;
 
-  config = {
+  config = cfgImports.config;
 
-    programs.mosh.enable = true;
 
-    services.openssh = {
-      enable = true;
-      listenAddresses = [ { addr = "0.0.0.0"; port = cfg.sshPort; } ];
-    };
+  # options.vuizvui.user.profpatsch.server.sshPort = lib.traceValSeqN 3 (lib.mkOption {
+  #   description = "ssh port";
+  #   # TODO: replace with types.intBetween https://github.com/NixOS/nixpkgs/pull/27239
+  #   type = with lib.types; addCheck int (x: x >= 0 && x <= 65535);
+  #   default = 6879;
+  # });
 
-    networking.firewall = {
-      enable = true;
-      allowPing = true;
-      allowedTCPPorts = [ cfg.sshPort ];
-    };
+  # config = {
 
-  };
+  #   programs.mosh.enable = true;
+
+  #   services.openssh = {
+  #     enable = true;
+  #     listenAddresses = [ { addr = "0.0.0.0"; port = cfg.sshPort; } ];
+  #   };
+
+  #   networking.firewall = {
+  #     enable = true;
+  #     allowPing = true;
+  #     allowedTCPPorts = [ cfg.sshPort ];
+  #   };
+
+  # };
 
 }
-- 
cgit 1.4.1