Add website

flake.lock

@@ -16,6 +16,21 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -57,7 +72,8 @@
         "dotfiles": "dotfiles",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "secrets": "secrets"
+        "secrets": "secrets",
+        "website": "website"
       }
     },
     "secrets": {
@@ -67,11 +83,8 @@
         ]
       },
       "locked": {
-        "lastModified": 1647943275,
+        "lastModified": 1647911882,
-        "narHash": "sha256-uSrGOtugLzyoyOtE1Bzv0HdlO1OJIl+rzoAZbxKP43c=",
+        "narHash": "sha256-4bwjEIgkbF9/G0MP69iV03OLU3V+GzKGKcKvzhdg8Jk=",
-        "ref": "main",
-        "rev": "c76aa71028beca7f8c44adc6e6881b88843b4bb9",
-        "revCount": 20,
         "type": "git",
         "url": "file:///home/h7x4/git/nix-secrets"
       },
@@ -79,6 +92,28 @@
         "type": "git",
         "url": "file:///home/h7x4/git/nix-secrets"
       }
+    },
+    "website": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1647647976,
+        "narHash": "sha256-rFEloIIRTB43w4/ox9/6H+zpXu0zEEW7Ri3pmx/o35A=",
+        "ref": "main",
+        "rev": "1030977dfd0c861e186b3b142cbb161feaa0c32e",
+        "revCount": 51,
+        "type": "git",
+        "url": "https://git.nani.wtf/h7x4/nani.wtf"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://git.nani.wtf/h7x4/nani.wtf"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -14,6 +14,12 @@
       flake = false;
     };
 
+    website = {
+      url = "git+https://git.nani.wtf/h7x4/nani.wtf?ref=main";
+      # url = "path:/home/h7x4/git/nani.wtf";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Nix expressions and keys (TODO: move keys to another solution like agenix)
     # which should be kept from the main repo for privacy reasons.
     #
@@ -25,7 +31,15 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, secrets, dotfiles, ... }: let
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    secrets,
+    dotfiles,
+    website,
+    ...
+  }: let
     system = "x86_64-linux";
 
     pkgs = import nixpkgs {
@@ -43,9 +57,10 @@
       secrets = secrets.outputs.default;
       colorTheme = import ./common/colors.nix;
       inputs = {
-        home-manager = home-manager;
+        inherit home-manager;
-        secrets = secrets;
+        inherit dotfiles;
-        dotfiles = dotfiles;
+        inherit website;
+        inherit secrets;
       };
     };
 

hosts/tsuki/services/nginx.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, secrets, ... }:
+{ pkgs, config, secrets, inputs, ... }:
   let
     # TODO: fix lib
     lib = pkgs.lib;
@@ -82,7 +82,7 @@
     in (listToAttrs [
       # (makeACMEProxy ["gitlab"] "http://unix:/run/gitlab/gitlab-workhorse.socket" {})
       (makeACMEProxy ["plex"] "http://localhost:${s ports.plex}" {})
-      (makeACMEHost ["www"] { root = "/data/www"; })
+      (makeACMEHost ["www"] { root = "${inputs.website.defaultPackage.${pkgs.system}}/"; })
       (makeACMEProxy ["matrix"] "http://localhost:${s ports.matrix.listener}" {})
       (makeACMEProxy ["git"] "http://localhost:${s ports.gitea}" {})
       (makeClientCertHost ["cache"] { root = "/var/lib/nix-cache"; })