diff --git a/home/.chezmoiexternal.toml b/home/.chezmoiexternal.toml index 2f19577d..8227441b 100644 --- a/home/.chezmoiexternal.toml +++ b/home/.chezmoiexternal.toml @@ -114,10 +114,10 @@ pull.args = ["--ff-only"] ### Git Template -[".config/git/template/_/husky.sh"] - type = "file" - url = "https://github.com/typicode/husky/raw/main/husky.sh" - refreshPeriod = "{{ $refreshPeriod }}" +# [".config/git/template/_/husky.sh"] +# type = "file" +# url = "https://github.com/typicode/husky/raw/main/husky.sh" +# refreshPeriod = "{{ $refreshPeriod }}" ### GPG [".gnupg/gpg.conf"] diff --git a/home/.chezmoiscripts/universal/run_onchange_after_08-git-hooks.tmpl b/home/.chezmoiscripts/disabled/run_onchange_after_08-git-hooks.tmpl similarity index 68% rename from home/.chezmoiscripts/universal/run_onchange_after_08-git-hooks.tmpl rename to home/.chezmoiscripts/disabled/run_onchange_after_08-git-hooks.tmpl index 3e7f4108..9889917f 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_08-git-hooks.tmpl +++ b/home/.chezmoiscripts/disabled/run_onchange_after_08-git-hooks.tmpl @@ -1,5 +1,13 @@ -{{- if (eq .host.distro.family "linux") -}} +{{- if false -}} #!/usr/bin/env bash +### This script is `if false` blocked out! ### +# This script is disabled until we figure out sensible git hooks for linters / auto-fixers +# that are not too aggressive. Megabyte Labs projects can install git hooks by running +# `bash start.sh`. +# +# To re-enable, add the missing files to the ~/.config/git/template folder, uncomment the templatedir line +# in ~/.config/git/config, and uncomment the Husky script in .chezmoiexternal.toml. Then, move this file to +# the universal folder. {{ includeTemplate "universal/profile" }} {{ includeTemplate "universal/logg" }} diff --git a/home/dot_config/git/config.tmpl b/home/dot_config/git/config.tmpl index d8d17fb7..5d57ea65 100644 --- a/home/dot_config/git/config.tmpl +++ b/home/dot_config/git/config.tmpl @@ -124,7 +124,7 @@ autocorrect = 20 [init] defaultBranch = master - templatedir = ~/.config/git/template + # templatedir = ~/.config/git/template [interactive] diffFilter = delta --color-only --features=interactive [merge] diff --git a/home/dot_config/git/template/branches/remove_dot_gitkeep b/home/dot_config/git/template/branches/remove_dot_gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/home/dot_config/git/template/description b/home/dot_config/git/template/description deleted file mode 100644 index 536df306..00000000 --- a/home/dot_config/git/template/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. \ No newline at end of file diff --git a/home/dot_config/git/template/info/exclude b/home/dot_config/git/template/info/exclude deleted file mode 100644 index 43fd24f0..00000000 --- a/home/dot_config/git/template/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ \ No newline at end of file diff --git a/home/dot_config/npm/npmrc.tmpl b/home/dot_config/npm/npmrc.tmpl index 08f61f22..3e74306a 100644 --- a/home/dot_config/npm/npmrc.tmpl +++ b/home/dot_config/npm/npmrc.tmpl @@ -1,6 +1,7 @@ cache={{ .host.home }}/.cache/npm -init.license=MIT -init.version=0.0.1 +init-author-name "{{ .user.name }} <{{ .user.email }}> ({{ .user.domain }})" +init-license=MIT +init-version=0.0.1 init-module={{ .host.home }}/.config/npm/config/npm-init.js prefix={{ .host.home }}/.local/share/npm store-dir={{ .host.home }}/.local/share/pnpm-store