Merge branch 'option_refactor' of https://git.jsw.tf/jsw/niksos into option_refactor

hosts/lapserv/hardware-configuration.nix

@@ -1,39 +1,44 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
+  imports =
-  lib,
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot = {
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "sd_mod" ];
-    initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod"];
+  boot.initrd.kernelModules = [ ];
-    initrd.kernelModules = [];
+  boot.kernelModules = [ "kvm-intel" ];
-    kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [ ];
-    extraModulePackages = [];
-  };
 
-  fileSystems = {
+  # fileSystems."/" =
-    "/" = {
+  #   { device = "/dev/disk/by-uuid/33b7e681-d92a-40db-a172-b797591a1e2e";
-      device = "/dev/disk/by-uuid/33b7e681-d92a-40db-a172-b797591a1e2e";
+  #     fsType = "ext4";
+  #   };
+  #
+  # fileSystems."/boot" =
+  #   { device = "/dev/disk/by-uuid/0BEA-7525";
+  #     fsType = "vfat";
+  #     options = [ "fmask=0022" "dmask=0022" ];
+  #   };
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/2ce4b2b1-0083-43b2-bd8d-0e8cd21b1ef6";
       fsType = "ext4";
     };
 
-    "/boot" = {
+  fileSystems."/boot" =
-      device = "/dev/disk/by-uuid/0BEA-7525";
+    { device = "/dev/disk/by-uuid/AE71-FD70";
       fsType = "vfat";
-      options = ["fmask=0022" "dmask=0022"];
+      options = [ "fmask=0022" "dmask=0022" ];
     };
-  };
-  swapDevices = [];
 
-  networking.useDHCP = lib.mkDefault true;
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/f5af06e8-e285-4565-abc3-fdd0ddde4736"; }
+    ];
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

system/server/jsw-bot.nix

@@ -13,7 +13,7 @@
 
   bash = getExe pkgs.bash;
 
-  mainDir = "/var/lib/dcbot/";
+  mainDir = "/var/lib/${name}/";
   programDir = mainDir + "program";
   dataDir = mainDir + "data";
   denoDir = mainDir + "deno";
@@ -71,12 +71,12 @@ in {
       };
     };
 
-    users.groups."dcbot" = {
+    users.groups.${name} = {
       members = optional nextcloud.enable "nextcloud"; #TODO: if config.niksos.server.nextcloud
       #NOTE: for nextcloud mounted folder
     };
-    users.users."dcbot" = {
+    users.users.${name} = {
-      group = "dcbot";
+      group = name;
       isSystemUser = true;
     };
   };

system/server/lib/extractWebOptions.nix

@@ -11,8 +11,8 @@
     then ""
     else "${cfg.subDomain}.";
 in
+  cfg // 
   {
-    domain = "${subDomain}.${baseDomain}";
+    domain = "${subDomain}${baseDomain}";
-    inherit baseDomain;
+    inherit baseDomain subDomain;
   }
-  // cfg