refactor(eientei)!: migrate library configuration

spec/eientei/coturn.nix

@@ -54,4 +54,6 @@ in {
       allowedTCPPortRanges = range;
       allowedTCPPorts = [ 3478 5349 ];
   };
+
+  global.fs.zfs.mountpoints."/nix/persist/service/coturn" = "service/coturn";
 }

spec/eientei/default.nix

@@ -1,4 +1,5 @@
 { lib
+, pkgs
 , ... }: {
   global = {
     id = "ff96c05be13e44f681292205370eed1a";
@@ -13,6 +14,7 @@
     fs.cryptsetup.allowDiscards = false;
     fs.cryptsetup.uuids.secret = "c33c9b18-a280-42d7-8740-3f8d3f60dc43";
     boot.lanzaboote = true;
+    acme.enable = true;
   };
 
   services.fstrim.enable = true;
@@ -45,4 +47,7 @@
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
+
+  networking.firewall.allowedTCPPorts = [ 25565 ];
+  environment.systemPackages = with pkgs; [ python3 ];
 }

spec/eientei/forgejo.nix

@@ -0,0 +1,36 @@
+{ pkgs
+, config
+, ...}: let
+  host = "src.514fpv.io";
+in {
+  services.forgejo = {
+    enable = true;
+    lfs.enable = true;
+    stateDir = "/nix/persist/service/forgejo";
+    database.type = "postgres";
+    database.createDatabase = true;
+    settings = {
+      server = {
+        SSH_PORT = 8087;
+        COOKIE_SECURE = true;
+        LANDING_PAGE = "explore";
+        DOMAIN = host;
+        PROTOCOL = "http+unix";
+        ROOT_URL = "https://${host}:2096/";
+      };
+      DEFAULT.APP_NAME = "Forgejo";
+      service.DISABLE_REGISTRATION = true;
+    };
+  };
+
+  users.users.forgejo.uid = 1023;
+  users.groups.forgejo.gid = 1023;
+
+  services.nginx.virtualHosts.${host} = {
+    useACMEHost = ".514fpv.io";
+    addSSL = true;
+    locations."/".proxyPass = "http://unix:/run/forgejo/forgejo.sock";
+  };
+
+  global.fs.zfs.mountpoints."/nix/persist/service/forgejo" = "service/forgejo";
+}

spec/eientei/matrix.nix

@@ -45,4 +45,6 @@ in {
   };
 
   networking.firewall.allowedTCPPorts = [ 8448 ];
+
+  global.fs.zfs.mountpoints."/nix/persist/service/matrix" = "service/matrix";
 }

spec/eientei/nextcloud.nix

@@ -20,8 +20,8 @@ in {
     config.dbtype = "pgsql";
     config.adminuser = "koishi";
     config.adminpassFile = builtins.toString (pkgs.writeText "password" "initial_password");
-    extraOptions.overwriteprotocol = "https";
+    settings.overwriteprotocol = "https";
-    extraOptions.default_phone_region = "US";
+    settings.default_phone_region = "US";
     caching.redis = true;
     phpOptions.upload_max_filesize = "128G";
     phpOptions.post_max_size = "128G";
@@ -37,4 +37,6 @@ in {
     useACMEHost = ".514fpv.io";
     addSSL = true;
   };
+
+  global.fs.zfs.mountpoints."/nix/persist/service/nextcloud" = "service/nextcloud";
 }

spec/eientei/nginx.nix

@@ -11,7 +11,6 @@
     # set a reasonable default
     clientMaxBodySize = "64m";
 
-    # proxy services running on TrueNAS
     virtualHosts = {
       "_" = {
         addSSL = true;
@@ -26,7 +25,7 @@
           proxy_buffering off;
         '';
         locations."/" = {
-          proxyPass = "http://192.168.1.250:8123";
+          proxyPass = "http://127.0.0.1:8123";
           proxyWebsockets = true;
         };
       };

spec/eientei/postgresql.nix

@@ -7,4 +7,6 @@
 
     package = pkgs.postgresql_15;
   };
+
+  global.fs.zfs.mountpoints."/nix/persist/service/postgresql" = "service/postgresql";
 }

spec/library/default.nix

@@ -1,38 +0,0 @@
-{ pkgs
-, lib
-, modulesPath
-, ... }: {
-  global = {
-    id = "bc8036643fc24f04ab150ff6a38dcce7";
-    auth.openssh.enable = true;
-    libvirt.enable = false;
-    fs.esp.uuid = "00A5-929C";
-    fs.type = "xfs";
-    fs.store = "25b9f83f-7f6d-432f-a169-2985e5930401";
-    fs.external.enable = true;
-    fs.external.device = "/dev/disk/by-uuid/ba3d0989-9f81-4ac0-b5a7-124c86835cfa";
-    fs.external.fsType = "ext4";
-    fs.external.options = [ "noatime" ];
-    oci.enable = true;
-    acme.enable = true;
-  };
-
-  networking.proxy = {
-    default = "socks5://192.168.1.253:1080";
-    noProxy = "127.0.0.1,localhost,.localdomain";
-  };
-
-  imports = lib.pipe ./. [
-    builtins.readDir
-    (lib.filterAttrs (n: ty: ty == "regular" && n != "default.nix"))
-    (lib.mapAttrsToList (n: _: ./${n}))
-  ] ++ [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ahci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "console=ttyS0,115200n8" ];
-  networking.firewall.allowedTCPPorts = [ 25565 ];
-  environment.systemPackages = with pkgs; [ python3 ];
-}

spec/library/forgejo.nix

@@ -1,61 +0,0 @@
-{ pkgs
-, config
-, ...}: let
-  host = "src.514fpv.io";
-in {
-  services.forgejo = {
-    enable = true;
-    lfs.enable = true;
-    stateDir = "/nix/persist/service/forgejo";
-    database.type = "postgres";
-    database.createDatabase = true;
-    settings = {
-      server = {
-        SSH_PORT = 8087;
-        COOKIE_SECURE = true;
-        LANDING_PAGE = "explore";
-        DOMAIN = host;
-        PROTOCOL = "http+unix";
-        ROOT_URL = "https://${host}:2096/";
-      };
-      DEFAULT.APP_NAME = "Forgejo";
-      service.DISABLE_REGISTRATION = true;
-    };
-  };
-
-  users.users.forgejo.uid = 1023;
-  users.groups.forgejo.gid = 1023;
-
-  services.nginx.virtualHosts.${host} = {
-    useACMEHost = ".514fpv.io";
-    addSSL = true;
-    locations."/".proxyPass = "http://unix:/run/forgejo/forgejo.sock";
-  };
-
-  services.gitea-actions-runner.instances.local = {
-    enable = true;
-    url = "https://${host}:2096";
-    name = config.networking.hostName;
-    tokenFile = "/nix/persist/secret/gitea-runner";
-    labels = [
-      # provide a debian base with nodejs for actions
-      "debian-latest:docker://node:18-bullseye"
-      # fake the ubuntu name, because node provides no ubuntu builds
-      "ubuntu-latest:docker://node:18-bullseye"
-    ];
-    settings = {
-      runner.envs = let
-        proxy = "socks5://192.168.1.253:1080";
-      in {
-        all_proxy = proxy;
-        ftp_proxy = proxy;
-        http_proxy = proxy;
-        https_proxy = proxy;
-        rsync_proxy = proxy;
-        no_proxy = "127.0.0.1,localhost,.localdomain";
-      };
-    };
-  };
-
-  environment.persistence."/nix/persist/fhs".directories = [ "/var/lib/private/gitea-runner" ];
-}