urxvt block cursor + root term; zsh, dunst changes

diff --git a/base/.Xresources b/base/.Xresources
index 6c2b039b390bf0a7eac17b251451c42db31d392b..e418ba9f4280daabecf19e820990eb33f01c34ed 100644 (file)
--- a/base/.Xresources
+++ b/base/.Xresources
@@ -62,7 +62,6 @@ URxvt.perl-ext:
 URxvt.perl-ext-common:
 
 URxvt.cursorBlink:       on
 URxvt.perl-ext-common:
 
 URxvt.cursorBlink:       on

-URxvt.cursorUnderline:   on

 URxvt.scrollstyle:       plain
 URxvt.scrollBar_right:   true
 URxvt.urgentOnBell:      true
 URxvt.scrollstyle:       plain
 URxvt.scrollBar_right:   true
 URxvt.urgentOnBell:      true

diff --git a/base/.xinitrc b/base/.xinitrc
index c0d5993eb3563413ceb7e98e53516c189e843fbb..8edca6caf35c53997e2fa575e9ed3e23d0f1670a 100755 (executable)
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -18,17 +18,20 @@ if [ -f "$usermodmap" ]; then
        xmodmap "$usermodmap"
 fi
 
        xmodmap "$usermodmap"
 fi
 

-# root image, redshift
+# redshift, root image

 redon &
 "$HOME/.fehbg"
 
 # Xorg settings
 xset r rate 290 26 &
 xset m 1/1 0 &
 redon &
 "$HOME/.fehbg"
 
 # Xorg settings
 xset r rate 290 26 &
 xset m 1/1 0 &

+xset s off
+xset dpms 0 0 600

 
 # root terminal
 
 # root terminal

-#urxvt -name URxvtRoot -override-redirect -geometry x26+0-0 -e glances &
-#xdotool search --limit 1 --sync --classname URxvtRoot windowsize 100% y
+urxvt -name URxvtRoot -override-redirect -geometry x5+0-0 \
+      -e tail -f /var/log/messages &
+xdotool search --limit 1 --sync --classname URxvtRoot windowsize 100% y

 
 # tray icons
 #"$HOME/src/phwmon/phwmon.py" --mem --mem_percent --net --io --bg \#0000 &
 
 # tray icons
 #"$HOME/src/phwmon/phwmon.py" --mem --mem_percent --net --io --bg \#0000 &


@@ -42,8 +45,8 @@ eval `ssh-agent`
 
 if [ -x /usr/local/bin/urxvtd ]; then
        for i in 1 2; do
 
 if [ -x /usr/local/bin/urxvtd ]; then
        for i in 1 2; do

-               # try to start client twice, once before checking for daemon and
-               # another after trying to start it
+               # try to start client twice, once before checking for daemon
+               # and another after trying to start it

                urxvtc -e exit
                if [ $? -eq 2 ]; then
                        # daemon not started, attempt to start once
                urxvtc -e exit
                if [ $? -eq 2 ]; then
                        # daemon not started, attempt to start once


@@ -61,7 +64,8 @@ fi
 
 # try to wait for session to start
 (sleep 0.1 && tint2) &
 
 # try to wait for session to start
 (sleep 0.1 && tint2) &

-(sleep 0.1 && [ -x "$HOME/bin/acpi_ac" ] && "$HOME/bin/acpi_ac" "0x0`sysctl -n hw.acpi.acline`") &
+(sleep 0.1 && [ -x "$HOME/bin/acpi_ac" ] && \
+       "$HOME/bin/acpi_ac" "0x0`sysctl -n hw.acpi.acline`") &

 (sleep 1.5 && [ -x /usr/local/bin/conky ] && conky -c "$HOME/.conkyrc.d/dock") &
 
 # load any global scripts
 (sleep 1.5 && [ -x /usr/local/bin/conky ] && conky -c "$HOME/.conkyrc.d/dock") &
 
 # load any global scripts


@@ -72,6 +76,7 @@ if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
        unset f
 fi
 
        unset f
 fi
 

+# start session

 if [ ! -n "$1" ]; then
        session=i3
 else
 if [ ! -n "$1" ]; then
        session=i3
 else


@@ -81,4 +86,5 @@ fi
 exec $session "$@"
 
 # cleanup
 exec $session "$@"
 
 # cleanup

+#TODO: trap this

 ssh-agent -k
 ssh-agent -k

diff --git a/base/.zshenv b/base/.zshenv
index 7ef4681c0ee61e0aa54fca7d8bc6beff2ed74c3a..8297e11cb1f2477739e95802eeccde66ec3646da 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,4 +1,6 @@
 export EDITOR=vim
 export EDITOR=vim

+export XDG_CONFIG_HOME="$HOME/etc"
+export XDG_CONFIG_DIRS="$HOME/.config:/etc/xdg"

 export XDG_DATA_HOME="$HOME/share"
 export XDG_DATA_DIRS="$HOME/.local/share:/usr/local/share/:/usr/share/"
 export XDG_CACHE_HOME="$HOME/tmp"
 export XDG_DATA_HOME="$HOME/share"
 export XDG_DATA_DIRS="$HOME/.local/share:/usr/local/share/:/usr/share/"
 export XDG_CACHE_HOME="$HOME/tmp"

diff --git a/base/.zshrc b/base/.zshrc
index 9f13b6da6d828b732702267d3dd015fdb700747b..51fcf1e4557612dfd003ca767aa9a068e89b9d14 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -5,22 +5,56 @@ zstyle ':vcs_info:*' get-revision true
 zstyle ':vcs_info:git*' formats "(%F{green}%r/%b%f) %m%u%c "
 
 function precmd {
 zstyle ':vcs_info:git*' formats "(%F{green}%r/%b%f) %m%u%c "
 
 function precmd {

-    print -Pn "\e]0;${SSH_CLIENT+$USER@$HOST}%#%(1j,:%j,):%~\a"
+    print -Pn "\e]0;%(1j,%j,)%#${SSH_CLIENT+$USER@$HOST}:%~\a"

     vcs_info
     if ((SECONDS - _exectime >= 5)) {
     vcs_info
     if ((SECONDS - _exectime >= 5)) {

-        # bell after long exec
+        # bell if exec takes 5s

         print "\a"
     }
 }
 function preexec {
         print "\a"
     }
 }
 function preexec {

-    printf "\033]0;%s\a" "$1"
+    # change Xorg title
+    print -Pnf "\033]0;%s\a" "%#$1"
+    # save last exec time

     _exectime=$SECONDS
 }
 
     _exectime=$SECONDS
 }
 

+# options
+setopt autocd extendedglob
+unsetopt beep
+
+# history
+setopt appendhistory
+HISTFILE=~/.histfile
+HISTSIZE=100
+SAVEHIST=100
+
+# keys
+bindkey -v
+# xorg
+bindkey    "^[[7~" beginning-of-line #Home
+bindkey -a "^[[7~" beginning-of-line
+bindkey    "^[[8~" end-of-line       #End
+bindkey -a "^[[8~" end-of-line
+bindkey    "^[[3~" delete-char       #Del
+bindkey -a "^[[3~" delete-char
+# bsd vt
+bindkey    "^[[H" beginning-of-line #Home
+bindkey -a "^[[H" beginning-of-line
+bindkey    "^[[F" end-of-line       #End
+bindkey -a "^[[F" end-of-line
+
+autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search
+[[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
+[[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
+

 # prompt
 setopt prompt_subst
 PROMPT='%F{$VICOL}%n%f@%F{$VICOL}%m%f%(?../%F{red}$?%f)%# '
 RPROMPT='${vcs_info_msg_0_}%F{yellow}%~%f %T'
 # prompt
 setopt prompt_subst
 PROMPT='%F{$VICOL}%n%f@%F{$VICOL}%m%f%(?../%F{red}$?%f)%# '
 RPROMPT='${vcs_info_msg_0_}%F{yellow}%~%f %T'

+KEYTIMEOUT=1

 
 function zle-line-init zle-keymap-select {
     VICOL="${${KEYMAP:/vicmd/red}:/(main|viins)/green}"
 
 function zle-line-init zle-keymap-select {
     VICOL="${${KEYMAP:/vicmd/red}:/(main|viins)/green}"


@@ -32,11 +66,12 @@ zle -N zle-keymap-select
 # common aliases
 alias h="history -25"
 alias j="jobs -l"
 # common aliases
 alias h="history -25"
 alias j="jobs -l"

-alias la="ls -aF"
-alias lf="ls -AF"
-alias ll="ls -lhAF"
+alias la="ls -AF"
+alias lf="ls -Fdf .* [A-Z]* [^A-Z]*"
+alias ll="ls -AFlho"
+alias LL="ls -Flhodf .* [A-Z]* [^A-Z]*"

 alias pa="sudo ps -Sudax"
 alias pa="sudo ps -Sudax"

-function s { sysctl hw.snd.default_unit=$1 }
+function s { sysctl hw.snd.default_unit${1:+=$1} }

 
 # be paranoid
 alias cp='cp -ip'
 
 # be paranoid
 alias cp='cp -ip'


@@ -54,23 +89,10 @@ function portpkg {
             echo "Usage: \`portpkg <build|run>' in a port directory"
             return 1;;
     }
             echo "Usage: \`portpkg <build|run>' in a port directory"
             return 1;;
     }

-    sudo pkg install -AU $(make ${1}-depends-list | sed 's_/usr/ports/_ _' | tr -d '\n')
+    sudo pkg install -AU $(make ${1}-depends-list |
+                           sed 's_/usr/ports/_ _' | tr -d '\n')

 }
 
 }
 

-# keys
-bindkey "^[[7~" beginning-of-line #Home
-bindkey "^[[8~" end-of-line       #End
-bindkey "^[[3~" delete-char       #Del
-# vt keys
-bindkey "^[[H" beginning-of-line #Home
-bindkey "^[[F" end-of-line       #End
-
-autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-[[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
-[[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
-

 # The following lines were added by compinstall
 zstyle ':completion:*' auto-description 'specify: %d'
 zstyle ':completion:*' expand suffix
 # The following lines were added by compinstall
 zstyle ':completion:*' auto-description 'specify: %d'
 zstyle ':completion:*' expand suffix


@@ -92,13 +114,4 @@ autoload -Uz compinit
 compinit
 # End of lines added by compinstall
 
 compinit
 # End of lines added by compinstall
 

-# Lines configured by zsh-newuser-install
-HISTFILE=~/.histfile
-HISTSIZE=100
-SAVEHIST=100
-setopt appendhistory autocd extendedglob
-unsetopt beep
-bindkey -v
-# End of lines configured by zsh-newuser-install
-

 # vim: ts=8:sts=4:sw=4:et:tw=79
 # vim: ts=8:sts=4:sw=4:et:tw=79

diff --git a/xdg/dunst/dunstrc b/xdg/dunst/dunstrc
index 32891c830c284e1378ae7b1340a26c47f0bcb233..9c6b7d7fdd71399a5c533e1c3c76ee4eded58f32 100644 (file)
--- a/xdg/dunst/dunstrc
+++ b/xdg/dunst/dunstrc
@@ -20,10 +20,10 @@ dmenu = "/home/ds6/bin/dmenu -p dunst:"
 browser = /usr/local/bin/luakit
 
 [shortcuts]
 browser = /usr/local/bin/luakit
 
 [shortcuts]

-#close = mod4+mod1+q
-#close_all = mod4+mod1+shift+q
+close = mod4+shift+grave
+#close_all = mod4+mod2+grave

 history = mod4+grave
 history = mod4+grave

-context = mod4+shift+grave
+context = mod4+ctrl+grave

 
 [urgency_low]
 background = "#110800"
 
 [urgency_low]
 background = "#110800"