updated ps1 without newline, vimrc for bashrc and xresources and better color scheme

diff --git a/.Xresources b/.Xresources
index 5cfd8e5..15283ca 100644 (file)
--- a/.Xresources
+++ b/.Xresources
@@ -7,23 +7,22 @@ Xft.dpi: 96
 
 URxvt.background: rgb:00/00/00
 URxvt.foreground: rgb:a8/a8/a8
-Urxvt.color0: rgb:00/00/00
-Urxvt.color1: rgb:a8/00/00
-Urxvt.color2: rgb:00/a8/00
-Urxvt.color3: rgb:a8/54/00
-Urxvt.color4: rgb:00/00/a8
-Urxvt.color5: rgb:a8/00/a8
-Urxvt.color6: rgb:00/a8/a8
-Urxvt.color7: rgb:a8/a8/a8
-Urxvt.color8: rgb:54/54/54
-Urxvt.color9: rgb:fc/54/54
-Urxvt.color10: rgb:54/fc/54
-Urxvt.color11: rgb:fc/fc/54
-Urxvt.color12: rgb:54/54/fc
-Urxvt.color13: rgb:fc/54/fc
-Urxvt.color14: rgb:54/fc/fc
-Urxvt.color15: rgb:fc/fc/fc
-Urxvt.colorBD: rgb:fc/fc/fc
+URxvt.color0:  #2E3436
+URxvt.color1:  #a40000
+URxvt.color2:  #4E9A06
+URxvt.color3:  #C4A000
+URxvt.color4:  #3465A4
+URxvt.color5:  #75507B
+URxvt.color6:  #ce5c00
+URxvt.color7:  #babdb9
+URxvt.color8:  #555753
+URxvt.color9:  #EF2929
+URxvt.color10: #8AE234
+URxvt.color11: #FCE94F
+URxvt.color12: #729FCF
+URxvt.color13: #AD7FA8
+URxvt.color14: #fcaf3e
+URxvt.color15: #EEEEEC
 URxvt.fading: 25
 URxvt.font: xft:DejaVu Sans Mono:style=Book:pixelsize=12
 URxvt.boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=12
@@ -41,7 +40,6 @@ URxvt.pastableTabs: 1
 URxvt.cursorBlink: 0
 URxvt.perl-lib: /home/mart/.urxvt/ext
 URxvt.perl-ext-common: font-size
-URxvt.perl-ext: string
 URxvt.keysym.C-Up: perl:font-size:increase
 URxvt.keysym.C-Down: perl:font-size:decrease
 URxvt.keysym.C-Left: perl:font-size:reset

diff --git a/.bashrc b/.bashrc
index 8502398..c048415 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -15,13 +15,10 @@ export HISTCONTROL=ignoreboth
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 
-#[ ! -s ~/.config/mpd/pid ] && mpd
-
-source /usr/share/git/completion/git-prompt.sh
 set_prompt(){
        last_c=$?
        PS1='\u@\h'
        [[ $last_c -ge 1 ]] && PS1="($last_c) $PS1"
-       PS1="$PS1\w$(__git_ps1)\n\$ "
+       PS1="$PS1\w\$ "
 }
 PROMPT_COMMAND='set_prompt'

diff --git a/.vimrc b/.vimrc
index 5b1c832..44c3fb1 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -3,6 +3,8 @@ syntax enable
 filetype indent plugin on
 
 autocmd! bufwritepost .vimrc source %
+autocmd! bufwritepost .bashrc !source %
+autocmd! bufwritepost .Xresources !xrdb -merge %
 
 set encoding=utf-8
 set history=1000

diff --git a/i3/bar b/i3/bar
index fe35e72..615a111 100755 (executable)
--- a/i3/bar
+++ b/i3/bar
@@ -11,8 +11,15 @@ battery(){
        echo -n "$now$charge"
 }
 
+volume(){
+       mixer=$(amixer | head -5 | tail -1)
+       echo $mixer | grep "\[on\]" && mute="(M)"
+       volume=$(echo $mixer | grep -Po "(?<=\[)[0-9]{1,3}%")
+       echo -n "vol: $volume$mute"
+}
+
 while true;
 do
-       echo "$(battery) | $(date +%x\ %X)"
+       echo "$(volume) | $(battery) | $(date +%x\ %X)"
        sleep 1
 done

diff --git a/i3/config b/i3/config
index e30d661..b62ce5b 100644 (file)
--- a/i3/config
+++ b/i3/config
@@ -12,7 +12,12 @@
 set $mod Mod4
 
 exec setxkbmap dvorak
-exec xautolock -locker i3lock -time 5
+exec xautolock -locker 'i3lock -c 000000'
+exec convert -size 1600x900 gradient:grey15-black png:- | display -window root
+
+bindsym XF86AudioLowerVolume exec amixer set Master 5-
+bindsym XF86AudioRaiseVolume exec amixer set Master 5+
+bindsym XF86AudioMute exec amixer set Master toggle
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.

diff --git a/user-dirs.dirs b/user-dirs.dirs
new file mode 100644 (file)
index 0000000..9056b79
--- /dev/null
+++ b/user-dirs.dirs
@@ -0,0 +1,6 @@
+XDG_DESKTOP_DIR="$HOME/downloads"
+XDG_DOCUMENTS_DIR="$HOME/downloads"
+XDG_DOWNLOAD_DIR="$HOME/downloads"
+XDG_MUSIC_DIR="$HOME/music"
+XDG_PICTURES_DIR="$HOME/downloads"
+XDG_VIDEOS_DIR="$HOME/downloads"