26 files changed, 1 insertions, 64 deletions
diff --git a/tools/bin/__dispatch.sh b/bin/__dispatch.sh
index 473342769d..f12d6ed368 100755
--- a/tools/bin/__dispatch.sh
+++ b/bin/__dispatch.sh
@@ -27,7 +27,7 @@ case "${TARGET_TOOL}" in
     TARGET_TOOL="pass"
     ;;
   aoc2019)
-    attr="tools.aoc2019.${1}"
+    attr="fun.aoc2019.${1}"
     ;;
   rink)
     attr="third_party.rink"
diff --git a/tools/bin/aoc2019 b/bin/aoc2019
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/aoc2019
+++ b/bin/aoc2019
diff --git a/tools/bin/blog_cli b/bin/blog_cli
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/blog_cli
+++ b/bin/blog_cli
diff --git a/tools/bin/kms_pass b/bin/kms_pass
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/kms_pass
+++ b/bin/kms_pass
diff --git a/tools/bin/kontemplate b/bin/kontemplate
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/kontemplate
+++ b/bin/kontemplate
diff --git a/tools/bin/rink b/bin/rink
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/rink
+++ b/bin/rink
diff --git a/tools/bin/stern b/bin/stern
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/stern
+++ b/bin/stern
diff --git a/tools/bin/terraform b/bin/terraform
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/terraform
+++ b/bin/terraform
diff --git a/tools/aoc2019/default.nix b/fun/aoc2019/default.nix
index a53586eea9..a53586eea9 100644
--- a/tools/aoc2019/default.nix
+++ b/fun/aoc2019/default.nix
diff --git a/tools/aoc2019/solution-day1.el b/fun/aoc2019/solution-day1.el
index d805c22ec8..d805c22ec8 100644
--- a/tools/aoc2019/solution-day1.el
+++ b/fun/aoc2019/solution-day1.el
diff --git a/tools/aoc2019/solution-day2.el b/fun/aoc2019/solution-day2.el
index 6ecac1e201..6ecac1e201 100644
--- a/tools/aoc2019/solution-day2.el
+++ b/fun/aoc2019/solution-day2.el
diff --git a/tools/aoc2019/solution-day3.el b/fun/aoc2019/solution-day3.el
index b7dfdd245f..b7dfdd245f 100644
--- a/tools/aoc2019/solution-day3.el
+++ b/fun/aoc2019/solution-day3.el
diff --git a/tools/aoc2019/solution-day4.el b/fun/aoc2019/solution-day4.el
index 2805f3f4e9..2805f3f4e9 100644
--- a/tools/aoc2019/solution-day4.el
+++ b/fun/aoc2019/solution-day4.el
diff --git a/tools/journaldriver/.gitignore b/ops/journaldriver/.gitignore
index 29e65519ba..29e65519ba 100644
--- a/tools/journaldriver/.gitignore
+++ b/ops/journaldriver/.gitignore
diff --git a/tools/journaldriver/Cargo.lock b/ops/journaldriver/Cargo.lock
index 40bdc96280..40bdc96280 100644
--- a/tools/journaldriver/Cargo.lock
+++ b/ops/journaldriver/Cargo.lock
diff --git a/tools/journaldriver/Cargo.toml b/ops/journaldriver/Cargo.toml
index 248b22807f..248b22807f 100644
--- a/tools/journaldriver/Cargo.toml
+++ b/ops/journaldriver/Cargo.toml
diff --git a/tools/journaldriver/README.md b/ops/journaldriver/README.md
index 4dc9de0f61..4dc9de0f61 100644
--- a/tools/journaldriver/README.md
+++ b/ops/journaldriver/README.md
diff --git a/tools/journaldriver/build.rs b/ops/journaldriver/build.rs
index d64c82a88a..d64c82a88a 100644
--- a/tools/journaldriver/build.rs
+++ b/ops/journaldriver/build.rs
diff --git a/tools/journaldriver/default.nix b/ops/journaldriver/default.nix
index 2df5e58fc8..2df5e58fc8 100644
--- a/tools/journaldriver/default.nix
+++ b/ops/journaldriver/default.nix
diff --git a/tools/journaldriver/src/main.rs b/ops/journaldriver/src/main.rs
index a57bb3505d..a57bb3505d 100644
--- a/tools/journaldriver/src/main.rs
+++ b/ops/journaldriver/src/main.rs
diff --git a/tools/journaldriver/src/tests.rs b/ops/journaldriver/src/tests.rs
index 779add7a70..779add7a70 100644
--- a/tools/journaldriver/src/tests.rs
+++ b/ops/journaldriver/src/tests.rs
diff --git a/tools/kms_pass.nix b/ops/kms_pass.nix
index 14989b392d..14989b392d 100644
--- a/tools/kms_pass.nix
+++ b/ops/kms_pass.nix
diff --git a/tools/gotest/default.nix b/tools/gotest/default.nix
deleted file mode 100644
index 168d15748e..0000000000
--- a/tools/gotest/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file demonstrates how to make use of pkgs.buildGo.
-#
-# It introduces libraries and protobuf support, however gRPC support
-# is not yet included.
-#
-# From the root of this repository this example can be built with
-# `nix-build -A tools.gotest`
-{ pkgs, ... }:
-
-let
-  inherit (pkgs) buildGo;
-
-  somelib = buildGo.package {
-    name = "somelib";
-    srcs = [ ./lib.go ];
-  };
-
-  someproto = buildGo.proto {
-    name = "someproto";
-    proto = ./test.proto;
-  };
-
-in buildGo.program {
-  name = "gotest";
-  srcs = [ ./main.go ];
-  deps = [ somelib someproto ];
-} // { meta.enableCI = true; }
diff --git a/tools/gotest/lib.go b/tools/gotest/lib.go
deleted file mode 100644
index 0aeebb2aea..0000000000
--- a/tools/gotest/lib.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package somelib
-
-import "fmt"
-
-func Name() string {
-	return "edef"
-}
-
-func Greet(s string) string {
-	return fmt.Sprintf("Hello %s", s)
-}
diff --git a/tools/gotest/main.go b/tools/gotest/main.go
deleted file mode 100644
index 99218c0776..0000000000
--- a/tools/gotest/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// This program just exists to import some libraries and demonstrate
-// that the build works, it doesn't do anything useful.
-package main
-
-import (
-	"fmt"
-	"somelib"
-	"someproto"
-)
-
-func main() {
-	p := someproto.Person{
-		Name: somelib.Name(),
-	}
-	fmt.Println(somelib.Greet(fmt.Sprintf("%v", p)))
-}
diff --git a/tools/gotest/test.proto b/tools/gotest/test.proto
deleted file mode 100644
index 76af63072b..0000000000
--- a/tools/gotest/test.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-package someproto;
-
-import "google/protobuf/timestamp.proto";
-
-message Person {
-  string name = 1;
-  google.protobuf.Timestamp last_updated = 2;
-}