From 44c88cc645ac0451802151e55237d7d2eff68be2 Mon Sep 17 00:00:00 2001
From: Jared Tobin <jared@tlon.io>
Date: Sat, 29 Feb 2020 17:23:55 +0400
Subject: [PATCH] gitignore: tweaks [ci skip]

Removes the herb .gitignore previously removed in 7fab8be0dc, replacing
its contents with a cross-project ignore of Nix's 'result' symlink
artifact in the root .gitignore.

Moves some entries from the Vere .gitignore into the root file, as it
seems they can safely be assumed to be undesirable everywhere.

Also cleans up the root .gitignore, removing duplicate entries,
superfluous patterns, etc.
---
 .gitignore           | 57 ++++++++++++++++++++++++++++++--------------
 pkg/herb/.gitignore  |  1 -
 pkg/urbit/.gitignore | 10 --------
 3 files changed, 39 insertions(+), 29 deletions(-)
 delete mode 100644 pkg/herb/.gitignore

diff --git a/.gitignore b/.gitignore
index a048b7ed4a..cc5e0f0997 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 c4a847d907..0000000000
--- a/pkg/herb/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/result
diff --git a/pkg/urbit/.gitignore b/pkg/urbit/.gitignore
index 4bd49beef9..fc91e91c25 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