commit a533f2c5aa131290a845fb861dbbe7987c814a03
parent 33a66767bf027cb34e3b2714208e3d1eac3fe48a
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sun, 18 Oct 2015 18:26:56 +0200
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Xdefaults b/Xdefaults
@@ -21,7 +21,9 @@ URxvt.perl-ext-common: default,url-picker
#urxvt*urlLauncher: sensible-browser
urxvt*matcher.button: 1
URxvt*url-picker*order: descending
-URxvt.keysym.C-y: perl:url-picker
+# changed because this is not configurable in weechat
+#URxvt.keysym.C-y: perl:url-picker
+URxvt.keysym.C-t: perl:url-picker
URxvt.keysym.M-y: perl:keyboard-select:activate
#URxvt.keysym.C-y: perl:url-select:select_next
#URxvt.underlineURLs:true
@@ -44,4 +46,11 @@ URxvt.print-pipe: cat > ~/temp/urxvt.dmp
URxvt.keysym.M-c: perl:clipboard:copy
URxvt.keysym.M-v: perl:clipboard:paste
URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
+rofi.width: 100
+rofi.location: 2
+rofi.fg: white
+rofi.bg: black
+rofi.font: "Terminus 8"
+rofi.hlbg: green
+rofi.hlfg: black
URxvt*iso14755: False
diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
@@ -1,3 +1,3 @@
-# needs sudo apt-get install pinentry-curses
-pinentry-program /usr/bin/pinentry-curses
+# wrapper script to choose which pinentry to use
+pinentry-program /home/a3nm/bin/my-pinentry
default-cache-ttl 86400
diff --git a/vim/vimrc b/vim/vimrc
@@ -77,7 +77,10 @@ map ZE :exe "silent !my_evince_forward_search " . expand("%:p") . " " . line("."
set nojoinspaces
set showcmd
-set matchpairs+=<:>
+
+" makes vim very slow on emails
+" http://vi.stackexchange.com/q/5128/4819
+"set matchpairs+=<:>
set nomodeline