11 files changed, 42 insertions, 39 deletions
diff --git a/users/wpcarro/tools/monzo_ynab/.skip-subtree b/users/wpcarro/tools/monzo_ynab/.skip-subtree
new file mode 100644
index 000000000000..8db1f814f653
--- /dev/null
+++ b/users/wpcarro/tools/monzo_ynab/.skip-subtree
@@ -0,0 +1,2 @@
+Subdirectories of this folder should not be imported since they are
+internal to buildGo.nix and incompatible with readTree.
diff --git a/users/wpcarro/tools/monzo_ynab/job.nix b/users/wpcarro/tools/monzo_ynab/job.nix
index 1e10751012e2..c2c8baab3b45 100644
--- a/users/wpcarro/tools/monzo_ynab/job.nix
+++ b/users/wpcarro/tools/monzo_ynab/job.nix
@@ -1,11 +1,13 @@
-{ depot, briefcase, ... }:
+{ depot, ... }:
 
-depot.buildGo.program {
+let
+  inherit (depot.users.wpcarro) gopkgs;
+in depot.nix.buildGo.program {
   name = "job";
   srcs = [
     ./main.go
   ];
-  deps = with briefcase.gopkgs; [
+  deps = with gopkgs; [
     kv
     utils
   ];
diff --git a/users/wpcarro/tools/monzo_ynab/main.go b/users/wpcarro/tools/monzo_ynab/main.go
index 06f1944eab70..f40c70ce27d1 100644
--- a/users/wpcarro/tools/monzo_ynab/main.go
+++ b/users/wpcarro/tools/monzo_ynab/main.go
@@ -10,7 +10,8 @@
 package main
 
 import (
-	"fmt"
+	"os"
+	"monzoSerde"
 )
 
 var (
@@ -34,7 +35,7 @@ func toYnab(tx monzoSerde.Transaction) ynabSerde.Transaction {
 
 func main() {
 	txs := monzo.TransactionsLast24Hours()
-	var ynabTxs []ynabSerde.Transaction{}
+	var ynabTxs []ynabSerde.Transaction
 	for tx := range txs {
 		append(ynabTxs, toYnab(tx))
 	}
diff --git a/users/wpcarro/tools/monzo_ynab/shell.nix b/users/wpcarro/tools/monzo_ynab/shell.nix
index 910d7c1829e2..f777c13fefae 100644
--- a/users/wpcarro/tools/monzo_ynab/shell.nix
+++ b/users/wpcarro/tools/monzo_ynab/shell.nix
@@ -1,10 +1,9 @@
-let
-  briefcase = import <briefcase> {};
-  pkgs = briefcase.third_party.pkgs;
-in pkgs.mkShell {
-  buildInputs = [
-    pkgs.go
-    pkgs.goimports
-    pkgs.godef
+{ pkgs, ... }:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    go
+    goimports
+    godef
   ];
 }
diff --git a/users/wpcarro/tools/monzo_ynab/tokens.nix b/users/wpcarro/tools/monzo_ynab/tokens.nix
index 97de09d741e9..b58c272bde02 100644
--- a/users/wpcarro/tools/monzo_ynab/tokens.nix
+++ b/users/wpcarro/tools/monzo_ynab/tokens.nix
@@ -1,21 +1,23 @@
-{ depot, briefcase, ... }:
+{ depot, ... }:
 
 let
-  auth = depot.buildGo.package {
+  inherit (depot.users.wpcarro) gopkgs;
+
+  auth = depot.nix.buildGo.package {
     name = "auth";
     srcs = [
       ./auth.go
     ];
-    deps = with briefcase.gopkgs; [
+    deps = with gopkgs; [
       utils
     ];
   };
-in depot.buildGo.program {
+in depot.nix.buildGo.program {
   name = "token-server";
   srcs = [
     ./tokens.go
   ];
-  deps = with briefcase.gopkgs; [
+  deps = with gopkgs; [
     kv
     utils
     auth
diff --git a/users/wpcarro/tools/rfcToKindle/default.nix b/users/wpcarro/tools/rfcToKindle/default.nix
index 8fb93c3bb5b8..4ea271943950 100644
--- a/users/wpcarro/tools/rfcToKindle/default.nix
+++ b/users/wpcarro/tools/rfcToKindle/default.nix
@@ -2,7 +2,7 @@
 
 # TODO: This doesn't depend on `sendgmr` at the moment, but it should. As such,
 # it's an imcomplete packaging.
-depot.buildGo.program {
+depot.nix.buildGo.program {
   name = "rfcToKindle";
   srcs = [
     ./main.go
diff --git a/users/wpcarro/tools/run/default.nix b/users/wpcarro/tools/run/default.nix
index 7d772c3f9079..807a75c28450 100644
--- a/users/wpcarro/tools/run/default.nix
+++ b/users/wpcarro/tools/run/default.nix
@@ -1,11 +1,11 @@
-{ pkgs, depot, briefcase, ... }:
+{ pkgs, depot, ... }:
 
-depot.buildGo.program {
+depot.nix.buildGo.program {
   name = "run";
   srcs = [
     ./main.go
   ];
-  deps = with briefcase.gopkgs; [
+  deps = with depot.users.wpcarro.gopkgs; [
     utils
   ];
 }
diff --git a/users/wpcarro/tools/run/shell.nix b/users/wpcarro/tools/run/shell.nix
index e14bffae487c..f777c13fefae 100644
--- a/users/wpcarro/tools/run/shell.nix
+++ b/users/wpcarro/tools/run/shell.nix
@@ -1,7 +1,6 @@
-let
-  briefcase = import <briefcase> {};
-  pkgs = briefcase.third_party.pkgs;
-in pkgs.mkShell {
+{ pkgs, ... }:
+
+pkgs.mkShell {
   buildInputs = with pkgs; [
     go
     goimports
diff --git a/users/wpcarro/tools/simple_vim/default.nix b/users/wpcarro/tools/simple_vim/default.nix
index f8f965f2c024..6631fdfff5da 100644
--- a/users/wpcarro/tools/simple_vim/default.nix
+++ b/users/wpcarro/tools/simple_vim/default.nix
@@ -6,10 +6,6 @@ let
     name = "config.vim";
   };
 
-  script = pkgs.writeShellScriptBin "simple_vim" ''
-    ${pkgs.vim}/bin/vim -u ${configVim}
-  '';
-in pkgs.stdenv.mkDerivation {
-  name = "simple_vim";
-  buildInputs = [ script ];
-}
+in pkgs.writeShellScriptBin "simple_vim" ''
+  ${pkgs.vim}/bin/vim -u ${configVim}
+''
diff --git a/users/wpcarro/tools/symlinkManager/default.nix b/users/wpcarro/tools/symlinkManager/default.nix
index 16bb26bb3c2e..4e261d730932 100644
--- a/users/wpcarro/tools/symlinkManager/default.nix
+++ b/users/wpcarro/tools/symlinkManager/default.nix
@@ -1,11 +1,13 @@
-{ depot, briefcase, ... }:
+{ depot, ... }:
 
-depot.buildGo.program {
+let
+  inherit (depot.users.wpcarro) gopkgs;
+in depot.nix.buildGo.program {
   name = "symlink-mgr";
   srcs = [
     ./main.go
   ];
-  deps = with briefcase.gopkgs; [
+  deps = with gopkgs; [
     utils
   ];
 }
diff --git a/users/wpcarro/tools/url-blocker/shell.nix b/users/wpcarro/tools/url-blocker/shell.nix
index 1adc566c0121..aa5c906edc90 100644
--- a/users/wpcarro/tools/url-blocker/shell.nix
+++ b/users/wpcarro/tools/url-blocker/shell.nix
@@ -1,6 +1,6 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.buildHaskell.shell {
+{ depot, ... }:
+
+depot.users.wpcarro.buildHaskell.shell {
   deps = hpkgs: with hpkgs; [
     time
     aeson