From 3f000661adb33a2a3ff6e28cdd3a12984cc55df3 Mon Sep 17 00:00:00 2001
From: FredzyW <fredrik@wastring.com>
Date: Fri, 14 Jun 2024 20:59:25 +0200
Subject: [PATCH] nginx and added overlays to desktop

---
 flake.lock               | 12 ++++++------
 flake.nix                |  6 +++++-
 moduler/common/nginx.nix | 18 +++++++++---------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index e4d69ed..9e24919 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717952948,
-        "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=",
+        "lastModified": 1718208800,
+        "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7",
+        "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1717974879,
-        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
+        "lastModified": 1718318537,
+        "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
+        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 81fbca8..436b4c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,7 +93,11 @@
 			myhostname = "desktop";
 		};
         # > Our main home-manager configuration file <
-        modules = [./config/home.nix];
+        modules = [
+			./config/home.nix
+			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; })
+		];
       };
       "fw@jobb" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
diff --git a/moduler/common/nginx.nix b/moduler/common/nginx.nix
index bd06e2a..d0b16a3 100644
--- a/moduler/common/nginx.nix
+++ b/moduler/common/nginx.nix
@@ -24,15 +24,15 @@ networking.firewall = {
           proxyWebsockets = true;
         };
       };
-      #   "git.wastring.com" = {
-      #           sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
-      #           sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
-      #   forceSSL = true;
-      #   locations."/" = {
-      #     proxyPass = "http://172.17.0.1:3009";
-      #     proxyWebsockets = true;
-      #   };
-      # };
+        "git.wastring.com" = {
+                sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
+                sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
+        forceSSL = true;
+        locations."/" = {
+          proxyPass = "http://192.168.16.1:3000";
+          proxyWebsockets = true;
+        };
+      };
         "cal.wastring.com" = {
                 sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
                 sslCertificate = "/certs/.lego/certificates/wastring.com.crt";