dotfiles

commit c3305b6a6ce1409e5fdda9f4a6e4eddc1157d0d1
parent 7e2cba350bbfdcc2962bad4a9a4fa10aeb44ab38
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Fri, 11 Oct 2019 14:11:40 +0200

Merge branch 'master' of src.adamsgaard.dk:src/dotfiles

Diffstat:
M
.config/mutt/muttrc
 | 
25
++++++++++++++++++++++++-
M
.config/vis/plugins/snippets.lua
 | 
10
+++++-----
D
.gitmodules
 | 
18
------------------
M
.tmux.conf
 | 
7
++++---

4 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
@@ -84,7 +84,30 @@ set sort_alias = alias  # sort alias list when displayed in mutt
 set reverse_alias = yes # sort in reverse order
 source ~/.config/mutt/aliases  # Load in my aliases.
 
-source ~/.sec/gpg.rc   # Use GPG
+# from `gpg --list-keys anders@adamsgaard.dk`
+set pgp_default_key=0x5C959DF243CE4DD17A5B2610B790F4AD1BF858FE
+set crypt_autosign=no
+set crypt_replysign=yes
+set crypt_replyencrypt=yes
+set crypt_replysignencrypted=yes
+set postpone_encrypt=no
+
+## gpg setup from doc/mutt/samples/gpg.rc
+set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
+set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
+set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
+set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+set pgp_import_command="gpg --no-verbose --import %f"
+set pgp_export_command="gpg --no-verbose --export --armor %r"
+set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r"
+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r"
+set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
+set pgp_check_gpg_decrypt_status_fd
+
 source ~/.config/mutt/colors  # Define colours.
 
 auto_view text/html
diff --git a/.config/vis/plugins/snippets.lua b/.config/vis/plugins/snippets.lua
@@ -1,8 +1,8 @@
 -- vis-snippets: Insert predefined text snippets
 --
 -- Usage from INSERT mode:
--- Press the snipleader (default @@) and a key specified in the snippets 
--- table. This will insert the corresponding value string. Optionally, a 
+-- Press the snipleader (default @@) and a key specified in the snippets
+-- table. This will insert the corresponding value string. Optionally, a
 -- cursor position can be specified with '<1>'.
 --
 -- Author: Anders Damsgaard <anders@adamsgaard.dk>, adc on #vis-editor
@@ -19,9 +19,9 @@ local snippets = {
 	l = '\\label{<1>}',
 	r = '\\ref{<1>}',
 	sig = '<1>\n-- \n' ..
-	'Anders Damsgaard\n' ..
-	'Academia:    https://adamsgaard.dk\n' ..
-	'Code:        https://src.adamsgaard.dk\n' ..
+	'Anders Damsgaard\n\n' ..
+	'Academia: https://adamsgaard.dk\n' ..
+	'Code: https://src.adamsgaard.dk\n' ..
 	'Photography: https://andersdamsgaard.com'
 	}
 
diff --git a/.gitmodules b/.gitmodules
@@ -1,18 +0,0 @@
-[submodule ".local/lib/dwm"]
-	path = .local/lib/dwm
-	url = git://src.adamsgaard.dk/dwm
-[submodule ".local/lib/st"]
-	path = .local/lib/st
-	url = git://src.adamsgaard.dk/st
-[submodule ".local/lib/surf"]
-	path = .local/lib/surf
-	url = git://src.adamsgaard.dk/surf
-[submodule ".local/lib/tabbed"]
-	path = .local/lib/tabbed
-	url = git://src.adamsgaard.dk/tabbed
-[submodule ".local/lib/fffs"]
-	path = .local/lib/fffs
-	url = git://src.adamsgaard.dk/fffs
-[submodule ".local/lib/ve"]
-	path = .local/lib/ve
-	url = git://src.adamsgaard.dk/ve
diff --git a/.tmux.conf b/.tmux.conf
@@ -1,4 +1,5 @@
-### GENERAL
+
+## GENERAL
 
 set-option -g prefix C-a                   # Set prefix to <C-a>
 bind a send-prefix                         # Send <C-a> with <C-a>a
@@ -96,7 +97,7 @@ bind -r N swap-window -t +1                # Swap window right
 
 #### CLIPBOARD
 
-# enable reattach-to-user-namespace which fixes pasteboard access and launchctl 
+# enable reattach-to-user-namespace which fixes pasteboard access and launchctl
 bind Space copy-mode                       # enter copy mode with <C-a><Space>
 bind -T copy-mode-vi v send -X begin-selection  # start "visual" with v
 
@@ -137,4 +138,4 @@ bind -Tmpd b display "#(mpc prev | tr '\n' ' ')"
 bind -Tmpd r display "#(mpc clear && mpc ls | mpc add && mpc random on && mpc play | tr '\n' ' ')"
 
 # Change to the previous pane, repeat the last command, change back
-bind -n M-r last-pane \; send-keys "fc -s" C-m \; last-pane
+bind ! last-pane \; send-keys "fc -s" C-m \; last-pane