From b6d143e5d225e6aa293c23512336b7136ac58dcf Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 13 Dec 2021 19:51:48 -0800 Subject: fix(wpcarro/nix): Remove references 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 Reviewed-by: tazjin Reviewed-by: grfn Autosubmit: wpcarro --- users/wpcarro/nixos/socrates/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'users/wpcarro/nixos/socrates') 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 {}; - 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; -- cgit 1.4.1