From c329cc16fd870c88bfd6b5fe338b19f11c3e13d7 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Sat, 4 Dec 2021 14:12:36 +0100
Subject: [PATCH] Corrected use of nginx module

---
 flake.lock                       | 23 +++--------------------
 flake.nix                        |  4 +---
 modules/jackett/default.nix      |  1 +
 modules/jellyfin/default.nix     |  1 +
 modules/mediaserver/default.nix  |  2 --
 modules/nginx/default.nix        |  1 +
 modules/radarr/default.nix       |  1 +
 modules/sonarr/default.nix       |  1 +
 modules/transmission/default.nix |  1 +
 9 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index 43288b8..acdf96b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,22 +92,6 @@
         "type": "github"
       }
     },
-    "nixos": {
-      "locked": {
-        "lastModified": 1638371214,
-        "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1638376152,
@@ -158,11 +142,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1638605839,
-        "narHash": "sha256-f/REgJDMli9MLdvUSU4doYPnKyC8LrAPcj35fwdM5s8=",
+        "lastModified": 1638622311,
+        "narHash": "sha256-Jcn+xvme8X57vmB1THosjYHMhUqMmKiQeLbAI9rtuEA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "3d7aba159607fb9de8f148e86afbaf585bcfa07e",
+        "rev": "3d283655b37acadb5485768bfb89d68e5263458e",
         "type": "github"
       },
       "original": {
@@ -174,7 +158,6 @@
       "inputs": {
         "home-manager": "home-manager",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
-        "nixos": "nixos",
         "nixpkgs": "nixpkgs_3",
         "nur": "nur"
       }
diff --git a/flake.nix b/flake.nix
index ac51696..7903e18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
    description = "A flake for my personnal configurations";
    inputs = {
    nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
-   nixos.url = "github:NixOS/nixpkgs/nixos-21.11";
    home-manager = {
             url = "github:nix-community/home-manager";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -14,9 +13,8 @@
 
 };
 
-outputs = { self, nixos, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs :
+outputs = { self, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs :
 {
-
   nixosModules = builtins.listToAttrs (map (x: {
         name = x;
         value = import (./modules + "/${x}");
diff --git a/modules/jackett/default.nix b/modules/jackett/default.nix
index d2697ba..6fa4ca6 100644
--- a/modules/jackett/default.nix
+++ b/modules/jackett/default.nix
@@ -22,6 +22,7 @@ in {
   } 
 
     (mkIf cfg.nginx.enable {
+      luj.nginx.enable = true;
       services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
         enableACME = true;
         forceSSL = true;
diff --git a/modules/jellyfin/default.nix b/modules/jellyfin/default.nix
index 635c0d0..772b024 100644
--- a/modules/jellyfin/default.nix
+++ b/modules/jellyfin/default.nix
@@ -24,6 +24,7 @@ in {
   } 
 
     (mkIf cfg.nginx.enable {
+      luj.nginx.enable = true;
       services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
         enableACME = true;
         forceSSL = true;
diff --git a/modules/mediaserver/default.nix b/modules/mediaserver/default.nix
index 54f9873..2e01a00 100644
--- a/modules/mediaserver/default.nix
+++ b/modules/mediaserver/default.nix
@@ -9,8 +9,6 @@ in {
 
   config = mkIf cfg.enable {
 
-    luj.nginx.enable = true;
-    luj.nginx.email = "julien.malka@me.com";
 
     luj.sonarr = {
       enable = true;
diff --git a/modules/nginx/default.nix b/modules/nginx/default.nix
index 8bb49d8..e2f27e1 100644
--- a/modules/nginx/default.nix
+++ b/modules/nginx/default.nix
@@ -7,6 +7,7 @@ in {
     enable = mkEnableOption "activate nginx service";
     email = mkOption {
       type = types.str;
+      default = "julien.malka@me.com";
     };
   };
 
diff --git a/modules/radarr/default.nix b/modules/radarr/default.nix
index 5b5d6e2..da3a332 100644
--- a/modules/radarr/default.nix
+++ b/modules/radarr/default.nix
@@ -26,6 +26,7 @@ in {
   } 
 
     (mkIf cfg.nginx.enable {
+      luj.nginx.enable = true;
       services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
         enableACME = true;
         forceSSL = true;
diff --git a/modules/sonarr/default.nix b/modules/sonarr/default.nix
index b79e570..e0aa25a 100644
--- a/modules/sonarr/default.nix
+++ b/modules/sonarr/default.nix
@@ -26,6 +26,7 @@ in {
   } 
 
     (mkIf cfg.nginx.enable {
+      luj.nginx.enable = true;
       services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
         enableACME = true;
         forceSSL = true;
diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix
index 1e793f7..5116291 100644
--- a/modules/transmission/default.nix
+++ b/modules/transmission/default.nix
@@ -31,6 +31,7 @@ in {
   } 
 
     (mkIf cfg.nginx.enable {
+      luj.nginx.enable = true;
       services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
         enableACME = true;
         forceSSL = true;