From 401c5b35c787419feb3167d4daad5ecdcdac2a3b Mon Sep 17 00:00:00 2001
From: cy <hi@cything.io>
Date: Sun, 15 Dec 2024 17:34:27 -0500
Subject: [PATCH] Revert "server down migrate website"

about time

This reverts commit 8e187e6b3a7cb1d45d5502b520f67c39401330e1.
---
 flake.lock              | 23 ++++++++++++++++++++---
 flake.nix               |  1 +
 home/yt/ytnix.nix       |  3 ++-
 hosts/ytnix/Caddyfile   |  8 --------
 hosts/ytnix/default.nix | 36 ++++++++++++++----------------------
 5 files changed, 37 insertions(+), 34 deletions(-)
 delete mode 100644 hosts/ytnix/Caddyfile

diff --git a/flake.lock b/flake.lock
index 844d159..fc197f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "chromium": {
+      "locked": {
+        "lastModified": 1734083684,
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -22,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "lastModified": 1733940404,
+        "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
         "type": "github"
       },
       "original": {
@@ -38,6 +54,7 @@
     },
     "root": {
       "inputs": {
+        "chromium": "chromium",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix"
diff --git a/flake.nix b/flake.nix
index e7ef1b0..a54c872 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    chromium.url = "github:NixOS/nixpkgs/314e12ba369ccdb9b352a4db26ff419f7c49fa84";
   };
 
   outputs = {
diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix
index 7e349f3..f15bf6f 100644
--- a/home/yt/ytnix.nix
+++ b/home/yt/ytnix.nix
@@ -57,7 +57,8 @@
 
   home.packages = with pkgs; [
     firefox
-    ungoogled-chromium
+    inputs.chromium.legacyPackages.${system}.ungoogled-chromium
+    # ungoogled-chromium
     librewolf
     bitwarden-desktop
     bitwarden-cli
diff --git a/hosts/ytnix/Caddyfile b/hosts/ytnix/Caddyfile
deleted file mode 100644
index 8eb34bc..0000000
--- a/hosts/ytnix/Caddyfile
+++ /dev/null
@@ -1,8 +0,0 @@
-cything.io {
-  uri strip_prefix /blog
-  reverse_proxy localhost:8084
-}
-
-www.cything.io {
-  redir https://cything.io{uri} permanent
-}
diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix
index 1deba3a..f9a5df6 100644
--- a/hosts/ytnix/default.nix
+++ b/hosts/ytnix/default.nix
@@ -51,12 +51,10 @@
       dns = "none";
       wifi.backend = "iwd";
     };
-    # nameservers = ["31.59.129.225" "2a0f:85c1:840:2bfb::1"];
-    nameservers = ["1.1.1.1"];
+    nameservers = ["31.59.129.225" "2a0f:85c1:840:2bfb::1"];
     resolvconf.enable = true;
     firewall = {
-      allowedUDPPorts = [51820 443]; # for wireguard
-      allowedTCPPorts = [80 443];
+      allowedUDPPorts = [51820]; # for wireguard
       trustedInterfaces = ["wg0"];
     };
   };
@@ -267,23 +265,17 @@
   services.ollama.enable = true;
 
   # wireguard setup
-  # networking.wg-quick.interfaces.wg0 = {
-  #   address = ["10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64"];
-  #   privateKeyFile = "/run/secrets/wireguard/private";
-  #   peers = [
-  #     {
-  #       publicKey = "a16/F/wP7HQIUtFywebqPSXQAktPsLgsMLH9ZfevMy0=";
-  #       allowedIPs = ["0.0.0.0/0" "::/0"];
-  #       endpoint = "31.59.129.225:51820";
-  #       persistentKeepalive = 25;
-  #       presharedKeyFile = "/run/secrets/wireguard/psk";
-  #     }
-  #   ];
-  # };
-
-  services.caddy = {
-    enable = true;
-    configFile = ./Caddyfile;
-    logFormat = lib.mkForce "level INFO";
+  networking.wg-quick.interfaces.wg0 = {
+    address = ["10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64"];
+    privateKeyFile = "/run/secrets/wireguard/private";
+    peers = [
+      {
+        publicKey = "a16/F/wP7HQIUtFywebqPSXQAktPsLgsMLH9ZfevMy0=";
+        allowedIPs = ["0.0.0.0/0" "::/0"];
+        endpoint = "31.59.129.225:51820";
+        persistentKeepalive = 25;
+        presharedKeyFile = "/run/secrets/wireguard/psk";
+      }
+    ];
   };
 }