dotfiles

commit 10ccf648247e4a1d0939b70cc173b7d5f88d4597
parent c88d26b2f3f12c931e943376873a091a9f0a1541
Author: Daniel Moch <daniel@danielmoch.com>
Date:   Mon, 15 Jan 2018 10:40:28 +0000

Merge branch 'master' of github.com:djmoch/dotfiles

Diffstat:
M
.Xresources
 | 
29
+++++++++++++++++------------
M
.bashrc
 | 
9
++++++++-
A
.config/terminfo/tmux-from-screen.terminfo
 | 
7
+++++++
M
.config/terminfo/tmux.terminfo
 | 
4
++--
A
.local/bin/my-init
 | 
15
+++++++++++++++
M
.tmux.conf
 | 
3
+++

6 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/.Xresources b/.Xresources
@@ -27,17 +27,22 @@
 *color15:    #FFFFFF
 
 ! Xterm
-xterm.termName: xterm-256color
-xterm*font: -bitstream-meslo lg m dz-medium-r-normal--11-*-*-*-*-*-*-*
-xterm*renderFont: true
-xterm*faceName: -bitstream-meslo lg m dz-medium-r-normal--11-*-*-*-*-*-*-*
-xterm*faceSize: 10.0
+XTerm.termName: xterm-256color
+XTerm*font: -bitstream-meslo lg m dz-medium-r-normal--11-*-*-*-*-*-*-*
+XTerm*renderFont: true
+XTerm*faceName: -bitstream-meslo lg m dz-medium-r-normal--11-*-*-*-*-*-*-*
+XTerm*faceSize: 10.0
+XTerm*visualBell: true
+XTerm*highlightColorMode: true
+XTerm*highlightReverse: false
+XTerm*highlightColor: #8FAFD7
+XTerm*bellIsUrgent: true
 
 ! Xdvi
-xdvi.background: #BCBCBC
-xdvi.foreground: #262626
-xdvi.editor: gvim --servername xdvi --remote +%l %f
-xdvi.wwwBrowser: my-open
-xdvi.expertMode: 31
-xdvi.shrinkFactor: 7
-xdvi.altFont: -monotype-noto sans-medium-r-normal--11-*-*-*-*-*-*-*
+XDvi.background: #BCBCBC
+XDvi.foreground: #262626
+XDvi.editor: gvim --servername XDvi --remote +%l %f
+XDvi.wwwBrowser: my-open
+XDvi.expertMode: 31
+XDvi.shrinkFactor: 7
+XDvi.altFont: -monotype-noto sans-medium-r-normal--11-*-*-*-*-*-*-*
diff --git a/.bashrc b/.bashrc
@@ -14,7 +14,14 @@ GIT_PS1_SHOWUNTRACKEDFILES=1
 source "$HOME/.config/bash/git-prompt.sh"
 
 # Customize the prompt
-export PS1='\[\033[34m\]\u\[\033[m\]@\[\033[32m\]\h:\[\033[m\]\W\[\033[31m\]$(__git_ps1 " (%s)")\[\033[m\]\$ '
+if [ x$TERM == xlinux ]
+then
+    usercolor='\[\033[01;34m\]'
+else
+    usercolor='\[\033[34m\]'
+fi
+
+export PS1=$usercolor'\u\[\033[m\]@\[\033[32m\]\h:\[\033[m\]\W\[\033[31m\]$(__git_ps1 " (%s)")\[\033[m\]\$ '
 
 # Configure Homebrew
 if command -v brew > /dev/null 2>&1
diff --git a/.config/terminfo/tmux-from-screen.terminfo b/.config/terminfo/tmux-from-screen.terminfo
@@ -0,0 +1,7 @@
+xterm-256color|xterm with italics support,
+    ritm=\E[23m, sitm=\E[3m,
+    use=xterm-256color,
+
+tmux-256color|tmux with 256 colors,
+    ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, flash=^G,
+    use=screen-256color,
diff --git a/.config/terminfo/tmux.terminfo b/.config/terminfo/tmux.terminfo
@@ -3,5 +3,5 @@ xterm-256color|xterm with italics support,
     use=xterm-256color,
 
 tmux-256color|tmux with 256 colors,
-    ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m,
-    use=screen-256color,
+    ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, flash=^G,
+    use=tmux-256color,
diff --git a/.local/bin/my-init b/.local/bin/my-init
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# ~/.local/bin/my-init
+#
+# A place to dump run-once type initializations
+
+if [ ! -d "$HOME/.terminfo" ]
+then
+    if infocmp tmux-256color > /dev/null 2>&1
+    then
+        tic "$HOME/.config/terminfo/tmux.terminfo"
+    else
+        tic "$HOME/.config/terminfo/tmux-from-screen.terminfo"
+    fi
+fi
diff --git a/.tmux.conf b/.tmux.conf
@@ -20,7 +20,10 @@ bind C-a send-prefix
 
 # Activity Monitoring
 setw -g monitor-activity off
+setw -g monitor-bell on
 set -g visual-activity off
+set -g bell-action any
+set -g visual-bell on
 
 # Rather than constraining window size to the maximum size of any client
 # connected to the *session*, constrain window size to the maximum size of any