From 3ccb3b740ae26e7b8f6516d5798353fe59714a96 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Fri, 14 Jun 2024 20:55:11 +1200
Subject: [PATCH] refactor(nixos:nixarr): move nixarr module to
 ooksmedia/modules

---
 hosts/ooksmedia/default.nix                                  | 1 +
 hosts/ooksmedia/modules/default.nix                          | 5 +++++
 .../modules/services => hosts/ooksmedia/modules}/nixarr.nix  | 5 +++--
 nixos/modules/services/default.nix                           | 1 -
 outputs/nixos.nix                                            | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 hosts/ooksmedia/modules/default.nix
 rename {nixos/modules/services => hosts/ooksmedia/modules}/nixarr.nix (86%)

diff --git a/hosts/ooksmedia/default.nix b/hosts/ooksmedia/default.nix
index af64a90..9580255 100644
--- a/hosts/ooksmedia/default.nix
+++ b/hosts/ooksmedia/default.nix
@@ -7,6 +7,7 @@ in
 {
 	imports = [
 		./hardware-configuration.nix
+		./modules
 	];
 
 	ooknet.host = {
diff --git a/hosts/ooksmedia/modules/default.nix b/hosts/ooksmedia/modules/default.nix
new file mode 100644
index 0000000..17f57b8
--- /dev/null
+++ b/hosts/ooksmedia/modules/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./nixarr.nix
+  ];
+}
diff --git a/nixos/modules/services/nixarr.nix b/hosts/ooksmedia/modules/nixarr.nix
similarity index 86%
rename from nixos/modules/services/nixarr.nix
rename to hosts/ooksmedia/modules/nixarr.nix
index 6e50f97..7490fda 100644
--- a/nixos/modules/services/nixarr.nix
+++ b/hosts/ooksmedia/modules/nixarr.nix
@@ -1,4 +1,4 @@
-{ config, inputs, lib, ... }:
+{ config, lib, ... }:
 
 let
   inherit (lib) mkIf;
@@ -7,9 +7,10 @@ let
 in
   
 {
-  imports = [ inputs.nixarr.nixosModules.default ];
   config = mkIf cfg.enable {
     nixarr = {
+      vpn.enable = false;
+      openssh.expose.vpn.enable = false;
       enable = true;
       mediaDir = "/jellyfin";
       stateDir = "/var/lib/nixarr";
diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
index a743cb2..1572d1f 100644
--- a/nixos/modules/services/default.nix
+++ b/nixos/modules/services/default.nix
@@ -4,7 +4,6 @@
     ./dbus.nix
     ./gnome.nix
     ./gvfs.nix
-    # ./nixarr.nix
     ./flatpak.nix
   ];
 }
diff --git a/outputs/nixos.nix b/outputs/nixos.nix
index 7b7f2c1..3ab1d5c 100644
--- a/outputs/nixos.nix
+++ b/outputs/nixos.nix
@@ -4,6 +4,7 @@ let
   inherit (inputs.nixpkgs.lib) nixosSystem;
 
   hm = inputs.home-manager.nixosModules.home-manager;
+  nixarr = inputs.nixarr.nixosModules.default;
 
   nixosModules = "${self}/nixos";
   hosts = "${self}/hosts";
@@ -38,6 +39,7 @@ in
         "${hosts}/ooksmedia"
         hm
         nixosModules
+        nixarr
       ];
     };
     ooksmicro = nixosSystem {