From 265613215802489421606c7ed447a1c930e74d84 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Sat, 8 Jun 2024 02:17:04 +0200
Subject: [PATCH] Update

---
 hosts/laptop/configuration.nix |  2 --
 hosts/server/cloudflared.nix   | 50 ++++++++++++++++++++++++++++------
 hosts/server/nextcloud.nix     | 16 +++++++----
 hosts/server/pihole.nix        |  0
 4 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 hosts/server/pihole.nix

diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 5ba9f3b..50448f5 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -61,8 +61,6 @@ in {
     enable = true;
     loginShellInit = ''
       dbus-update-activation-environment --systemd DISPLAY
-      eval $(gnome-keyring-daemon --start --components=ssh,secrets)
-      eval $(ssh-agent)
     '';
   };
   users.defaultUserShell = pkgs.zsh;
diff --git a/hosts/server/cloudflared.nix b/hosts/server/cloudflared.nix
index aa8eccc..93f4200 100644
--- a/hosts/server/cloudflared.nix
+++ b/hosts/server/cloudflared.nix
@@ -1,12 +1,46 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [ cloudflared ];
-  services.cloudflared = {
+# { pkgs, ... }: {
+#   environment.systemPackages = with pkgs; [ cloudflared ];
+#   services.cloudflared = {
+#     enable = true;
+#     tunnels = {
+#       "55ac0504-4ba0-4ea7-bf38-6d04ca7e45c3" = {
+#         credentialsFile = "/etc/cloudflaredpwd";
+#         default = "http_status:404";
+#         ingress = { };
+#       };
+#     };
+#   };
+# }
+#
+{ config, pkgs, ... }:
+
+{
+  services.nextcloud = {
     enable = true;
-    tunnels = {
-      "55ac0504-4ba0-4ea7-bf38-6d04ca7e45c3" = {
-        credentialsFile = "/etc/cloudflaredpwd";
-        default = "http_status:404";
-        ingress = { };
+    hostName = "localhost";
+    https = false;
+    config = {
+      dbtype = "sqlite";
+      adminuser = "admin";
+      adminpass = "TESTADMINPASSWORD";
+      datadirectory = "/var/lib/nextcloud/data";
+    };
+  };
+
+  services.postgresql.enable = true;
+
+  services.nginx = {
+    virtualHosts."localhost" = {
+      forceSSL = true;
+      enableACME = false;
+      locations."/" = {
+        proxyPass = "http://127.0.0.1:8080";
+        extraConfig = ''
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+        '';
       };
     };
   };
diff --git a/hosts/server/nextcloud.nix b/hosts/server/nextcloud.nix
index a32ce2e..f882df8 100644
--- a/hosts/server/nextcloud.nix
+++ b/hosts/server/nextcloud.nix
@@ -5,14 +5,18 @@
   services.nextcloud = {
     enable = true;
     package = pkgs.nextcloud29;
-    hostName = "localhost";
+    hostName = "cloud.anotherhadi.com";
     config.adminpassFile = "/etc/nextcloudpwd";
   };
 
-  networking.firewall.allowedTCPPorts = [ 80 443 8080 ];
+  networking.firewall.allowedTCPPorts = [ 80 443 8083 ];
 
-  services.nginx.virtualHosts."localhost".listen = [{
-    addr = "127.0.0.1";
-    port = 8080;
-  }];
+  services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
+    forceSSL = true;
+    enableACME = true;
+    listen = [{
+      addr = "localhost";
+      port = 8083;
+    }];
+  };
 }
diff --git a/hosts/server/pihole.nix b/hosts/server/pihole.nix
new file mode 100644
index 0000000..e69de29