commit d5c5befbacab7eea2fe575578db7eed912cf05d5
parent aea5260950f3cd7905a2ec9cfaf84ed3d3aeabda
Author: Chris Bracken <chris@bracken.jp>
Date: Thu, 12 Oct 2023 10:17:07 -0700
Consolidate .gitignore files
Consolidate all .gitignore files into a single top-level .gitignore.
One might be tempted to consolidate into .config and .local
directory-specifc .gitignore files rather than a single top-level
.gitignore, since we symlink these under $HOME and so it seems useful to
have local .gitignore for each of these, since they're almost always
used outside of their main repo. However... git turns out to be quite
good at resolving symlinks and figures this out on its own.
Diffstat:
5 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/.config/.gitignore b/.config/.gitignore
@@ -1,25 +0,0 @@
-# Ignore files that contain one or more of the following types of data:
-# - machine-specific configuration
-# - local cached data that belongs in XDG_CACHE_HOME (e.g. last window size)
-
-Signal
-chromium
-
-# gitk viewer (cached data)
-git/gitk
-
-# Linux/GTK look and feel (machine-specific)
-dconf
-glib-2.0
-gtk-3.0
-pulse
-
-# IME-related (machine-specific, cached data)
-fcitx
-fcitx5/conf/cached_layouts
-ibus
-mozc
-
-# Flutter SDK (machine-specific)
-flutter
-tool_state
diff --git a/.config/git/.gitignore b/.config/git/.gitignore
@@ -1 +0,0 @@
-local_config
diff --git a/.config/zsh/.gitignore b/.config/zsh/.gitignore
@@ -1,3 +0,0 @@
-.zcompdump
-.zsh_history
-.zsh_sessions/
diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,42 @@
# Ignore GTK 2.0 theme information
.gtk-2.0
-# Ignore .local dir other than .local/bin and what's manually checked in.
-.local/*
-!.local/bin/
+# ========================================
+# .config
+# ========================================
+
+# Ignore files that contain one or more of the following types of data:
+# - machine-specific configuration
+# - local cached data that belongs in XDG_CACHE_HOME (e.g. last window size)
+.config/Signal
+.config/chromium
+
+# gitk viewer (cached data)
+.config/git/gitk
+
+# Symlink to wire up additional git config for the local machine.
+.config/git/local_config
+
+# Linux/GTK look and feel (machine-specific)
+.config/dconf
+.config/glib-2.0
+.config/gtk-3.0
+.config/pulse
+
+# IME-related (machine-specific, cached data)
+.config/fcitx
+.config/fcitx5/conf/cached_layouts
+.config/ibus
+.config/mozc
+
+# Flutter SDK (machine-specific)
+.config/flutter
+.config/tool_state
+
+# zsh cached data
+.config/zsh/.zcompdump
+.config/zsh/.zsh_history
+.config/zsh/.zsh_sessions/
# Ignore frequently-changing irrelevant files
.config/sublime-text/Packages/User/Package Control.last-run
@@ -15,3 +48,12 @@
.config/sublime-text/Packages/User/Package Control.system-ca-bundle
.config/sublime-text/Packages/User/Package Control.cache/
.config/sublime-text/Packages/User/Package Control.ca-certs/
+
+# ========================================
+# .local
+# ========================================
+
+# Ignore .local dir other than .local/bin and what's manually checked in.
+.local/*
+.local/!bin/
+.local/bin/gn
diff --git a/.local/bin/.gitignore b/.local/bin/.gitignore
@@ -1,2 +0,0 @@
-# Binary files we don't want to check in.
-gn
