Updated module

mkDocs.nix

@@ -12,7 +12,7 @@
       {
         config._module.check = false;
       }
-      inputs.home-manager.nixosModules.default
+      #inputs.home-manager.nixosModules.default
       ./servarr
     ];
   };

servarr/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.servarr;
+  cfg = config.servarr;
 in {
   imports = [
     ./jellyfin
@@ -14,10 +14,9 @@ in {
     ./sonarr
     ./prowlarr
     ./transmission
-    ../util
   ];
 
-  options.kirk.servarr = {
+  options.servarr = {
     enable = mkEnableOption ''
       My servarr setup. Lets you host the servarr services optionally
       through a VPN. It is possible, BUT NOT RECOMENDED, to have
@@ -113,6 +112,10 @@ in {
   };
 
   config = mkIf cfg.enable {
+    imports = [
+      ../util
+    ];
+
     users.groups = {
       media = {
         members = cfg.mediaUsers;

servarr/jellyfin/default.nix

@@ -4,11 +4,12 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.servarr.jellyfin;
+  cfg = config.servarr.jellyfin;
   defaultPort = 8096;
-  servarr = config.kirk.servarr;
+  servarr = config.servarr;
+  dnsServers = config.lib.vpn.dnsServers;
 in {
-  options.kirk.servarr.jellyfin = {
+  options.servarr.jellyfin = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -96,7 +97,7 @@ in {
         defaults.email = cfg.nginx.acmeMail;
       };
 
-      kirk.vpnnamespace.portMappings = [
+      util.vpnnamespace.portMappings = [
         (
           mkIf cfg.useVpn {
             From = defaultPort;

servarr/lidarr/default.nix

@@ -4,10 +4,11 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.servarr.lidarr;
-  servarr = config.kirk.servarr;
+  cfg = config.servarr.lidarr;
+  dnsServers = config.lib.vpn.dnsServers;
+  servarr = config.servarr;
 in {
-  options.kirk.servarr.lidarr = {
+  options.servarr.lidarr = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -35,7 +36,7 @@ in {
       dataDir = cfg.stateDir;
     };
 
-    kirk.vpnnamespace.portMappings = [
+    util.vpnnamespace.portMappings = [
       (
         mkIf cfg.useVpn {
           From = defaultPort;

servarr/prowlarr/default.nix

@@ -7,11 +7,11 @@
 }:
 with lib; let
   defaultPort = 9696;
-  dnsServers = config.kirk.vpnnamespace.dnsServer;
-  servarr = config.kirk.servarr;
-  cfg = config.kirk.servarr.prowlarr;
+  dnsServers = config.lib.vpn.dnsServers;
+  servarr = config.servarr;
+  cfg = config.servarr.prowlarr;
 in {
-  options.kirk.servarr.prowlarr = {
+  options.servarr.prowlarr = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -39,7 +39,7 @@ in {
       openFirewall = true;
     };
 
-    kirk.vpnnamespace.portMappings = [
+    util.vpnnamespace.portMappings = [
       (
         mkIf cfg.useVpn {
           From = defaultPort;

servarr/radarr/default.nix

@@ -6,12 +6,12 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.servarr.radarr;
+  cfg = config.servarr.radarr;
   defaultPort = 7878;
-  servarr = config.kirk.servarr;
-  dnsServers = config.kirk.vpnnamespace.dnsServers;
+  servarr = config.servarr;
+  dnsServers = config.lib.vpn.dnsServers;
 in {
-  options.kirk.servarr.radarr = {
+  options.servarr.radarr = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -39,7 +39,7 @@ in {
       dataDir = cfg.stateDir;
     };
 
-    kirk.vpnnamespace.portMappings = [
+    util.vpnnamespace.portMappings = [
       (
         mkIf cfg.useVpn {
           From = defaultPort;

servarr/readarr/default.nix

@@ -4,10 +4,11 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.servarr.readarr;
-  servarr = config.kirk.servarr;
+  cfg = config.servarr.readarr;
+  servarr = config.servarr;
+  dnsServers = config.lib.vpn.dnsServers;
 in {
-  options.kirk.servarr.readarr = {
+  options.servarr.readarr = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -35,7 +36,7 @@ in {
       dataDir = cfg.stateDir;
     };
 
-    kirk.vpnnamespace.portMappings = [
+    util.vpnnamespace.portMappings = [
       (
         mkIf cfg.useVpn {
           From = defaultPort;

servarr/sonarr/default.nix

@@ -5,12 +5,12 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.servarr.sonarr;
+  cfg = config.servarr.sonarr;
   defaultPort = 8989;
-  servarr = config.kirk.servarr;
-  dnsServers = config.kirk.vpnnamespace.dnsServers;
+  servarr = config.servarr;
+  dnsServers = config.lib.vpn.dnsServers;
 in {
-  options.kirk.servarr.sonarr = {
+  options.servarr.sonarr = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -38,7 +38,7 @@ in {
       dataDir = cfg.stateDir;
     };
 
-    kirk.vpnnamespace.portMappings = [
+    util.vpnnamespace.portMappings = [
       (mkIf cfg.useVpn {
         From = defaultPort;
         To = defaultPort;

servarr/transmission/default.nix

@@ -6,11 +6,11 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.servarr.transmission;
-  servarr = config.kirk.servarr;
+  cfg = config.servarr.transmission;
+  servarr = config.servarr;
   dnsServers = config.lib.vpn.dnsServers;
 in {
-  options.kirk.servarr.transmission = {
+  options.servarr.transmission = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -100,7 +100,7 @@ in {
         // cfg.extraConfig;
     };
 
-    kirk.vpnnamespace = mkIf cfg.useVpn {
+    util.vpnnamespace = mkIf cfg.useVpn {
       portMappings = [
         {
           From = cfg.uiPort;

util/upnp/default.nix

@@ -6,9 +6,9 @@
   ...
 }:
 with lib; let
-  cfg = config.kirk.upnp;
+  cfg = config.util.upnp;
 in {
-  options.kirk.upnp = {
+  options.util.upnp = {
     enable = mkEnableOption "Enable port forwarding using UPNP.";
 
     openTcpPorts = mkOption {

util/vpnNamespace/default.nix

@@ -10,9 +10,9 @@
 # the namespace should use a vpn or not.
 with builtins;
 with lib; let
-  cfg = config.kirk.vpnnamespace;
+  cfg = config.util.vpnnamespace;
 in {
-  options.kirk.vpnnamespace = {
+  options.util.vpnnamespace = {
     enable =
       mkEnableOption (lib.mdDoc "VPN Namespace")
       // {