aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-06-13 21:13:56 +1200
committerTom Ryder <tom@sanctum.geek.nz>2017-06-13 21:13:56 +1200
commit9aa820e885ad639f1518914db298455d6fec3177 (patch)
treecd614c66c912c1a28bcc64ce0f49033f8c3897ac
parent6d3f615be93e68e892f5c3a1576d8a6d191ba6ee (diff)
downloaddotfiles-9aa820e885ad639f1518914db298455d6fec3177.tar.gz
dotfiles-9aa820e885ad639f1518914db298455d6fec3177.zip
Refactor m4 macro names
mi5(1df) means I can simplify these quite a bit now
-rw-r--r--Makefile16
-rw-r--r--git/gitconfig.mi58
-rw-r--r--gnupg/gpg.conf.mi54
-rw-r--r--tmux/tmux.conf.mi56
4 files changed, 19 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index d782cd2b..32a61ef0 100644
--- a/Makefile
+++ b/Makefile
@@ -286,16 +286,18 @@ bin/urlc.sh: bin/urlc.m4 include/mktd.m4
git/gitconfig: git/gitconfig.m4
m4 \
- -D DF_NAME=$(NAME) \
- -D DF_EMAIL=$(EMAIL) \
- -D DF_KEY=$(KEY) \
- -D DF_SENDMAIL=$(SENDMAIL) \
+ -D NAME=$(NAME) \
+ -D EMAIL=$(EMAIL) \
+ -D KEY=$(KEY) \
+ -D SENDMAIL=$(SENDMAIL) \
git/gitconfig.m4 > $@
KEYSERVER = hkps://hkps.pool.sks-keyservers.net
gnupg/gpg.conf: gnupg/gpg.conf.m4
- m4 -D DF_HOME=$(HOME) -D DF_KEYSERVER=$(KEYSERVER) \
+ m4 \
+ -D HOME=$(HOME) \
+ -D KEYSERVER=$(KEYSERVER) \
gnupg/gpg.conf.m4 > $@
man/man7/dotfiles.7df: README.markdown man/man7/dotfiles.7df.header
@@ -308,7 +310,9 @@ TMUX_BG = colour237
TMUX_FG = colour248
tmux/tmux.conf: tmux/tmux.conf.m4
- m4 -D DF_TMUX_BG=$(TMUX_BG) -D DF_TMUX_FG=$(TMUX_FG) \
+ m4 \
+ -D BG=$(TMUX_BG) \
+ -D FG=$(TMUX_FG) \
tmux/tmux.conf.m4 > $@
install: install-bin \
diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index bce64d6c..5a50c13c 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -52,13 +52,13 @@
[sendemail]
confirm = compose
- smtpServer = <% DF_SENDMAIL %>
+ smtpServer = <% SENDMAIL %>
[status]
short = true
showUntrackedFiles = all
[user]
- name = <% DF_NAME %>
- email = <% DF_EMAIL %>
- signingKey = <% DF_KEY %>
+ name = <% NAME %>
+ email = <% EMAIL %>
+ signingKey = <% KEY %>
diff --git a/gnupg/gpg.conf.mi5 b/gnupg/gpg.conf.mi5
index d8f14c09..c6793b64 100644
--- a/gnupg/gpg.conf.mi5
+++ b/gnupg/gpg.conf.mi5
@@ -22,11 +22,11 @@ fixed-list-mode
keyid-format 0xlong
# Use a pool of servers which support HKPS (encrypted key retrieval)
-keyserver DF_KEYSERVER
+keyserver <% KEYSERVER %>
# Retrieve keys automatically; check the keyserver port cert; use whichever
# server is proffered from the pool
-keyserver-options auto-key-retrieve check-cert no-honor-keyserver-url ca-certfile=<% DF_HOME %>/.gnupg/sks-keyservers.net/sks-keyservers.netCA.pem
+keyserver-options auto-key-retrieve check-cert no-honor-keyserver-url ca-certfile=<% HOME %>/.gnupg/sks-keyservers.net/sks-keyservers.netCA.pem
# Include trust/validity for UIDs in listings
list-options show-uid-validity
diff --git a/tmux/tmux.conf.mi5 b/tmux/tmux.conf.mi5
index 76d493c1..8893cd3e 100644
--- a/tmux/tmux.conf.mi5
+++ b/tmux/tmux.conf.mi5
@@ -110,15 +110,15 @@ set-option -g message-style "bg=colour18,fg=colour231"
set-window-option -g mode-style "bg=colour18,fg=colour231"
# Pane borders are always in the background color
-set-option -g pane-border-style "fg=<% DF_TMUX_BG %>"
-set-option -g pane-active-border-style "fg=<% DF_TMUX_BG %>"
+set-option -g pane-border-style "fg=<% BG %>"
+set-option -g pane-active-border-style "fg=<% BG %>"
# Inactive windows have slightly washed-out system colours
set-option -g window-style "bg=colour232,fg=colour248"
set-option -g window-active-style "bg=colour0,fg=colour15"
# The status bar has the defined background and foreground colours
-set-option -g status-style "bg=<% DF_TMUX_BG %>,fg=<% DF_TMUX_FG %>"
+set-option -g status-style "bg=<% BG %>,fg=<% FG %>"
# Titles of windows default to black text with no embellishment
set-window-option -g window-status-style "fg=colour16"