aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-06-02 20:45:22 +1200
committerTom Ryder <tom@sanctum.geek.nz>2017-06-02 20:45:22 +1200
commitbae8dea461ddbceb4f345d2f230460e7234af76d (patch)
tree13630acbc7049b682ffb5085382ae7353d9a337b
parentcde3c255ff7024181a54b19e5ec1dac3ab892836 (diff)
downloaddotfiles-bae8dea461ddbceb4f345d2f230460e7234af76d.tar.gz
dotfiles-bae8dea461ddbceb4f345d2f230460e7234af76d.zip
Move existing .m4 to .m4.mi5
Along with accompanying Makefile rules and .gitignorances
-rw-r--r--.gitignore3
-rw-r--r--Makefile8
-rw-r--r--git/gitconfig.m4.mi5 (renamed from git/gitconfig.m4)8
-rw-r--r--gnupg/gpg.conf.m4.mi5 (renamed from gnupg/gpg.conf.m4)2
-rw-r--r--tmux/tmux.conf.m4.mi5 (renamed from tmux/tmux.conf.m4)6
5 files changed, 18 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 68ac0a0a..873b60a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,7 +137,10 @@ games/strik
games/xyzzy
games/zs
git/gitconfig
+git/gitconfig.m4
gnupg/gpg.conf
+gnupg/gpg.conf.m4
man/man7/dotfiles.7df
tmux/tmux.conf
+tmux/tmux.conf.m4
urxvt/ext/select
diff --git a/Makefile b/Makefile
index a562b0b1..11bcf6f0 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@
lint-xinit
.SUFFIXES:
-.SUFFIXES: .awk .bash .pl .sed .sh
+.SUFFIXES: .awk .bash .mi5 .pl .sed .sh
NAME = 'Tom Ryder'
EMAIL = tom@sanctum.geek.nz
@@ -218,9 +218,12 @@ clean distclean:
$(BINS) \
$(GAMES) \
git/gitconfig \
+ git/gitconfig.m4 \
gnupg/gpg.conf \
+ gnupg/gpg.conf.m4 \
man/man8/dotfiles.7df \
tmux/tmux.conf \
+ tmux/tmux.conf.m4 \
urxvt/ext/select
git/gitconfig: git/gitconfig.m4
@@ -270,6 +273,9 @@ tmux/tmux.conf: tmux/tmux.conf.m4
sh bin/shb.sh sh < $< > $@
chmod +x ./$@
+.mi5:
+ awk -f bin/mi5.awk < $< > $@
+
install: install-bin \
install-curl \
install-ex \
diff --git a/git/gitconfig.m4 b/git/gitconfig.m4.mi5
index f533f02f..bce64d6c 100644
--- a/git/gitconfig.m4
+++ b/git/gitconfig.m4.mi5
@@ -52,13 +52,13 @@
[sendemail]
confirm = compose
- smtpServer = DF_SENDMAIL
+ smtpServer = <% DF_SENDMAIL %>
[status]
short = true
showUntrackedFiles = all
[user]
- name = DF_NAME
- email = DF_EMAIL
- signingKey = DF_KEY
+ name = <% DF_NAME %>
+ email = <% DF_EMAIL %>
+ signingKey = <% DF_KEY %>
diff --git a/gnupg/gpg.conf.m4 b/gnupg/gpg.conf.m4.mi5
index 29534991..d8f14c09 100644
--- a/gnupg/gpg.conf.m4
+++ b/gnupg/gpg.conf.m4.mi5
@@ -26,7 +26,7 @@ keyserver DF_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=<% DF_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.m4 b/tmux/tmux.conf.m4.mi5
index 3a1d2425..76d493c1 100644
--- a/tmux/tmux.conf.m4
+++ b/tmux/tmux.conf.m4.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=<% DF_TMUX_BG %>"
+set-option -g pane-active-border-style "fg=<% DF_TMUX_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=<% DF_TMUX_BG %>,fg=<% DF_TMUX_FG %>"
# Titles of windows default to black text with no embellishment
set-window-option -g window-status-style "fg=colour16"