summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2018-01-01 19:41:36 +0100
committerPatrick Simianer <p@simianer.de>2018-01-01 19:41:36 +0100
commitfe0063deaaefe81798842376f468a79b9b76889e (patch)
tree843bc78fd17ce9a9e3ed661562de7e3c8ca1252e
parent41c442d346ab4b2fac63543fb7724f37adfb38eb (diff)
parent087c3cc66842919c2d067fae3e979c6e9dd89dda (diff)
Merge branch 'master' of github.com:pks/dotfiles
-rw-r--r--by_os/Linux/X/.Xdefaults2
-rw-r--r--by_os/Linux/mutt/.mutt/ui.rc7
-rw-r--r--mutt/.mutt/muttrc3
-rw-r--r--zsh/.zshrc11
4 files changed, 17 insertions, 6 deletions
diff --git a/by_os/Linux/X/.Xdefaults b/by_os/Linux/X/.Xdefaults
index 5ae8534..7572abd 100644
--- a/by_os/Linux/X/.Xdefaults
+++ b/by_os/Linux/X/.Xdefaults
@@ -17,6 +17,8 @@ URxvt*borderLess: false
URxvt.cursorBlink: true
URxvt*internalBorder: 0
+URxvt.geometry: 80x42
+
/* fonts */
Xft.dpi: 96
Xft.antialias: true
diff --git a/by_os/Linux/mutt/.mutt/ui.rc b/by_os/Linux/mutt/.mutt/ui.rc
index 670145b..1f33b8f 100644
--- a/by_os/Linux/mutt/.mutt/ui.rc
+++ b/by_os/Linux/mutt/.mutt/ui.rc
@@ -5,12 +5,13 @@ set status_format = "――――― %f ――%r%m messages %>― "
set sidebar_divider_char = '|'
# colors
+color message color231 magenta
color normal color0 color231
color error brightcolor15 color196
color indicator color201 color231
color status color243 color231
color hdrdefault color245 color231
-color header color231 color0 "^(Subject): "
+color header color0 color231 "*"
color signature color243 color231
color body color21 color231 "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+"
color body color21 color231 "((https?|ftp)://|www)+[\-\.\;@,/%~_:?&=\#a-zA-Z0-9+]+"
@@ -27,6 +28,10 @@ color index color243 color231 "~P"
color index brightcolor221 color231 "~F"
color index brightcolor39 color231 "~T"
color index color196 color231 "~D"
+color search color0 color231
+color underline color0 color231
+color bold color0 color231
+color markers color0 color231
color sidebar_new color0 color231
color sidebar_flagged color0 color231
diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index c66b1b5..454f5b0 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -16,6 +16,9 @@ set read_inc = 1
set sleep_time = 0
auto_view text/html
+# bindings
+bind index F "flag-message"
+
# macros
set wait_key = no
macro index,pager G "<shell-escape>imapfilter -c ~/.imapfilter/personal.lua &>/dev/null && mbsync personal && notmuch new 2>/dev/null<enter>"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7592a2e..0bd880e 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -70,7 +70,7 @@ case $_HOST_TYPE in
esac
# get a white background in mutt
-COLORFGBG="default;default"
+#COLORFGBG="White;Black"
# #############################################################################
# terminal
@@ -164,7 +164,7 @@ esac
# #############################################################################
case `hostname` in
- 2pac|CLuster|node*|gpu*|coltrane|donna|vicious|lemmy)
+ 2pac|CLuster|coltrane|donna|vicious|lemmy)
umask u=rwx,g=rwx,o=rx
alias tmux="tmux -f ~/.tmux.`hostname`.conf"
;;
@@ -260,16 +260,17 @@ diff ()
if [[ -x $(which colordiff 2>/dev/null) ]]; then
colordiff "$@"
else
- diff "$@"
+ command diff "$@"
fi
}
irb ()
{
- if [[ -x $(which pry 2>/dev/null) ]]; then
+ which pry &>/dev/null
+ if [[ $? -eq 0 ]]; then
pry "$@"
else
- irb "$@"
+ command irb "$@"
fi
}