diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-12 22:07:00 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-12 22:07:00 +1200 |
commit | 1cbf90a0938ecb184b8abb4f5039ece2afbbaf5a (patch) | |
tree | 981dbf9f1a5c218020b53591c5ffd0621cec8433 | |
parent | Use short hostname in tmux status (diff) | |
download | dotfiles-1cbf90a0938ecb184b8abb4f5039ece2afbbaf5a.tar.gz dotfiles-1cbf90a0938ecb184b8abb4f5039ece2afbbaf5a.zip |
Use XDG basedirs for Git config
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | Makefile | 20 | ||||
-rw-r--r-- | git/config.mi5 (renamed from git/gitconfig.mi5) | 2 | ||||
-rw-r--r-- | vim/filetype.vim | 1 |
4 files changed, 15 insertions, 12 deletions
@@ -176,8 +176,8 @@ /games/uuu /games/xyzzy /games/zs -/git/gitconfig -/git/gitconfig.m4 +/git/config +/git/config.m4 /git/template/hooks/pre-commit /git/template/hooks/prepare-commit-msg /git/template/hooks/post-update @@ -280,7 +280,7 @@ GIT_TEMPLATE_HOOKS = git/template/hooks/post-update \ git/template/hooks/pre-commit \ git/template/hooks/prepare-commit-msg -all: $(BINS) git/gitconfig less/less $(GIT_TEMPLATE_HOOKS) +all: $(BINS) git/config less/less $(GIT_TEMPLATE_HOOKS) clean distclean: rm -f -- \ @@ -291,8 +291,8 @@ clean distclean: $(GIT_TEMPLATE_HOOKS) \ dillo/dillorc \ dillo/dillorc.m4 \ - git/gitconfig \ - git/gitconfig.m4 \ + git/config \ + git/config.m4 \ include/mktd.m4 \ less/less \ urxvt/ext/select \ @@ -341,13 +341,14 @@ dillo/dillorc: dillo/dillorc.m4 -D HOME=$(HOME) \ dillo/dillorc.m4 > $@ -git/gitconfig: git/gitconfig.m4 +git/config: git/config.m4 m4 \ -D NAME=$(NAME) \ -D EMAIL=$(EMAIL) \ -D KEY=$(KEY) \ -D SENDMAIL=$(SENDMAIL) \ - git/gitconfig.m4 > $@ + -D XDG_CONFIG_HOME=$(XDG_CONFIG_HOME) \ + git/config.m4 > $@ less/less: less/lesskey lesskey --output $@ less/lesskey @@ -428,14 +429,15 @@ install-games-man: mkdir -p -- $(XDG_DATA_HOME)/man/man6 cp -p -- man/man6/*.6df $(XDG_DATA_HOME)/man/man6 -install-git: git/gitconfig $(GIT_TEMPLATE_HOOKS) - cp -p -- git/gitconfig $(HOME)/.gitconfig +install-git: git/config $(GIT_TEMPLATE_HOOKS) + mkdir -p -- $(XDG_CONFIG_HOME)/git + cp -p -- git/config $(XDG_CONFIG_HOME)/git/config find git/template \ -type d -exec sh -c 'mkdir -p -- \ - $(HOME)/.git-template"$${1#git/template}"' \ + $(XDG_CONFIG_HOME)/git/template"$${1#git/template}"' \ _ {} \; \ -o ! -name '*.*' -exec sh -c 'cp -p -- "$$1" \ - $(HOME)/.git-template"$${1#git/template}"' \ + $(XDG_CONFIG_HOME)/git/template"$${1#git/template}"' \ _ {} \; install-gnupg: diff --git a/git/gitconfig.mi5 b/git/config.mi5 index 11b815d1..fba79411 100644 --- a/git/gitconfig.mi5 +++ b/git/config.mi5 @@ -8,7 +8,7 @@ output = compact [init] - templateDir = ~/.git-template + templateDir = <% XDG_CONFIG_HOME %>/git/template [log] date = local diff --git a/vim/filetype.vim b/vim/filetype.vim index e1bdf728..1e34f42c 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -107,6 +107,7 @@ augroup filetypedetect \,.gitconfig \,.gitmodules \,gitconfig + \,~/.config/git/config \ setfiletype gitconfig " Git rebase manifests autocmd BufNewFile,BufRead |