diff --git a/.gitignore b/.gitignore
index a048b7ed4..cc5e0f099 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,44 @@
-/out
-/result
-/result-*
-/work
+# nix symlink artifacts
+#
+result
+result-*
+
+# common dev piers
+#
 /zod
 /bus
-/fakezod*
-tags
-TAGS
+/nec
+/fakezod
+
+# package manager caches
+#
+.stack-work
+node_modules
+
+# build and release artifacts
+#
 cross/
 release/
-.stack-work
-\#*\#
-s/*
-**/.DS_Store
-**/dist
-**/node_modules
-**/urbitrc
-**/*.swp
-**/*.swo
-**/*-min.js
-.stack-work
+dist
+/out
+/work
+
+# landscape dev
+#
+urbitrc
+*-min.js
 pkg/interface/link-webext/web-ext-artifacts
+
+# catchall editor and OS stuff
+#
+.tags
+.etags
+tags
+TAGS
+GPATH
+GRTAGS
+GTAGS
+.DS_Store
+*.swp
+*.swo
+
diff --git a/pkg/herb/.gitignore b/pkg/herb/.gitignore
deleted file mode 100644
index c4a847d90..000000000
--- a/pkg/herb/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/result
diff --git a/pkg/urbit/.gitignore b/pkg/urbit/.gitignore
index 4bd49beef..fc91e91c2 100644
--- a/pkg/urbit/.gitignore
+++ b/pkg/urbit/.gitignore
@@ -8,17 +8,7 @@ include/config.h
 #
 *.o
 /build/*
-/tags
 #
 # Editor Bullshit
 #
-.tags
-TAGS
 cscope.*
-.DS_Store
-/.etags
-GPATH
-GRTAGS
-GTAGS
-*.swo
-*.swp