From b35e358eb5841b62caa8408ce2dbee105bf8d9c8 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Fri, 2 Apr 2021 12:18:50 +0000
Subject: refactor(ops/nixos): migrate to depot module arg

Previously the depot argument was provided as config.depot, but the "new
way" of doing things (which is more like the args list provided in the
rest of the depot) is to provide this as the "depot" NixOS module
argument instead.

Change-Id: Ib48b1c7c1bdff9c1eb0618c6cbacc22b651f5f98
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2763
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: glittershark <grfn@gws.fyi>
---
 ops/nixos/www/code.tvl.fyi.nix   | 4 ++--
 ops/nixos/www/tazj.in.nix        | 5 ++---
 ops/nixos/www/todo.tvl.fyi.nix   | 4 ++--
 ops/nixos/www/tvl.fyi.nix        | 4 ++--
 ops/nixos/www/wigglydonke.rs.nix | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'ops/nixos/www')

diff --git a/ops/nixos/www/code.tvl.fyi.nix b/ops/nixos/www/code.tvl.fyi.nix
index 18962be6bb59..c8a4b27b1b52 100644
--- a/ops/nixos/www/code.tvl.fyi.nix
+++ b/ops/nixos/www/code.tvl.fyi.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ depot, ... }:
 
 {
   imports = [
@@ -17,7 +17,7 @@
         #
         # TODO(tazjin): Implement a way of serving this dynamically
         location = /about/tvix/docs/component-flow.svg {
-            alias ${config.depot.tvix.docs.svg}/component-flow.svg;
+            alias ${depot.tvix.docs.svg}/component-flow.svg;
         }
 
         # Static assets must always hit the root.
diff --git a/ops/nixos/www/tazj.in.nix b/ops/nixos/www/tazj.in.nix
index c33c9560deac..8ed3585cdb52 100644
--- a/ops/nixos/www/tazj.in.nix
+++ b/ops/nixos/www/tazj.in.nix
@@ -1,8 +1,7 @@
 # serve tazjin's website & blog
-{ config, lib, pkgs, ... }:
+{ depot, config, lib, pkgs, ... }:
 
-let depot = config.depot;
-in {
+{
   imports = [
     ./base.nix
   ];
diff --git a/ops/nixos/www/todo.tvl.fyi.nix b/ops/nixos/www/todo.tvl.fyi.nix
index 5e1f158e6bba..b53f5437e7ab 100644
--- a/ops/nixos/www/todo.tvl.fyi.nix
+++ b/ops/nixos/www/todo.tvl.fyi.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ depot, ... }:
 
 {
   imports = [
@@ -9,7 +9,7 @@
     services.nginx.virtualHosts."todo.tvl.fyi" = {
       serverName = "todo.tvl.fyi";
       serverAliases = [ "todo.tvl.su" ];
-      root = config.depot.web.todolist;
+      root = depot.web.todolist;
       enableACME = true;
       forceSSL = true;
 
diff --git a/ops/nixos/www/tvl.fyi.nix b/ops/nixos/www/tvl.fyi.nix
index 9c2bf0274f23..45fd35803de7 100644
--- a/ops/nixos/www/tvl.fyi.nix
+++ b/ops/nixos/www/tvl.fyi.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ depot, ... }:
 
 {
   imports = [
@@ -8,7 +8,7 @@
   config = {
     services.nginx.virtualHosts."tvl.fyi" = {
       serverName = "tvl.fyi";
-      root = config.depot.web.tvl;
+      root = depot.web.tvl;
       enableACME = true;
       forceSSL = true;
 
diff --git a/ops/nixos/www/wigglydonke.rs.nix b/ops/nixos/www/wigglydonke.rs.nix
index 0774eaea7c70..0bc67898c633 100644
--- a/ops/nixos/www/wigglydonke.rs.nix
+++ b/ops/nixos/www/wigglydonke.rs.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ depot, lib, pkgs, ... }:
 
 {
   imports = [
@@ -9,7 +9,7 @@
     services.nginx.virtualHosts."wigglydonke.rs" = {
       enableACME = true;
       forceSSL = true;
-      root = "${config.depot.depotPath}/users/glittershark/wigglydonke.rs";
+      root = "${depot.depotPath}/users/glittershark/wigglydonke.rs";
     };
   };
 }
-- 
cgit 1.4.1