about summary refs log tree commit diff
path: root/users/wpcarro/nixos/socrates/default.nix
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2021-12-14T03·51-0800
committerclbot <clbot@tvl.fyi>2021-12-15T15·49+0000
commitb6d143e5d225e6aa293c23512336b7136ac58dcf (patch)
tree5cb070270342957f39415ab396a1d5f18a8a1fee /users/wpcarro/nixos/socrates/default.nix
parent38ec27e834b3d177b846d35064bba58fd70f41df (diff)
fix(wpcarro/nix): Remove <briefcase> references r/3249
Angle-bracketed references are a Nix anti-pattern, and thankfully this
repository enforces this as a standard.

TL;DR:
- Drop angle-bracketed references
- Change `briefcase` -> `users.wpcarro`
- Fix any resulting regressions
- Fix //users/wpcarro/tools/simple_vim
- Mark //users/wpcarro/boilerplate/typescript and related projects
  as broken
- drop .skip-subtree file, enabling depot CI

Change-Id: I7153cbabafa617bfd6b199370cbec65cb75441f6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4325
Tested-by: BuildkiteCI
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: wpcarro <wpcarro@gmail.com>
Diffstat (limited to 'users/wpcarro/nixos/socrates/default.nix')
-rw-r--r--users/wpcarro/nixos/socrates/default.nix19
1 files changed, 9 insertions, 10 deletions
diff --git a/users/wpcarro/nixos/socrates/default.nix b/users/wpcarro/nixos/socrates/default.nix
index 8b762a56de5f..6284977af69f 100644
--- a/users/wpcarro/nixos/socrates/default.nix
+++ b/users/wpcarro/nixos/socrates/default.nix
@@ -1,7 +1,6 @@
-let
-  briefcase = import <briefcase> {};
-  pkgs = briefcase.third_party.pkgs;
-in {
+{ pkgs, depot, ... }:
+
+{
   imports = [ ./hardware.nix ];
 
   # Use the systemd-boot EFI boot loader.
@@ -117,7 +116,7 @@ in {
   systemd.services.zoo = {
     enable = true;
     description = "Run my monoserver";
-    script = "${briefcase.zoo}/zoo";
+    script = "${depot.users.wpcarro.zoo}/zoo";
     environment = {};
     serviceConfig = {
       Restart = "always";
@@ -175,12 +174,12 @@ in {
       "wpcarro.dev" = {
         addSSL = true;
         enableACME = true;
-        root = briefcase.website;
+        root = depot.users.wpcarro.website;
       };
       "learn.wpcarro.dev" = {
         addSSL = true;
         enableACME = true;
-        root = briefcase.website.learn;
+        root = depot.users.wpcarro.website.learn;
       };
       "git.wpcarro.dev" = {
         addSSL = true;
@@ -192,17 +191,17 @@ in {
       "blog.wpcarro.dev" = {
         addSSL = true;
         enableACME = true;
-        root = briefcase.website.blog;
+        root = depot.users.wpcarro.website.blog;
       };
       # "sandbox.wpcarro.dev" = {
       #   addSSL = true;
       #   enableACME = true;
-      #   root = briefcase.website.sandbox;
+      #   root = depot.users.wpcarro.website.sandbox;
       # };
       # "learnpianochords.app" = {
       #   addSSL = true;
       #   enableACME = true;
-      #   root = briefcase.website.sandbox.learnpianochords;
+      #   root = depot.users.wpcarro.website.sandbox.learnpianochords;
       # };
       "zoo.wpcarro.dev" = {
         addSSL = true;