updates

diff --git a/cal/.config/khal/khal.conf b/cal/.config/khal/khal.conf
index e945b99..9f3745e 100644 (file)
--- a/cal/.config/khal/khal.conf
+++ b/cal/.config/khal/khal.conf
@@ -31,4 +31,3 @@ firstweekday = 0
 default_command = calendar
 default_calendar = mart
 show_all_days = True
-editor = system

diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index ac95589..2743046 100644 (file)
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -11,7 +11,7 @@ set mask="!^\\.[^.]"
 source ~/.mutt/mailboxes
 
 # Receiving, sending and searching
-set sendmail="msmtp -C /home/mart/.mutt/msmtprc"
+set sendmail="msmtp -C /home/mrl/.mutt/msmtprc"
 set send_charset="us-ascii:utf-8"
 macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"

diff --git a/email/.mutt/notmuch-config b/email/.mutt/notmuch-config
index 051e095..73b20c3 100644 (file)
--- a/email/.mutt/notmuch-config
+++ b/email/.mutt/notmuch-config
@@ -11,7 +11,7 @@
 # configured here named ".notmuch".
 #
 [database]
-path=/home/mart/.mutt/mail
+path=/home/mrl/.mutt/mail
 
 # User configuration
 #

diff --git a/shell/.bashrc b/shell/.bashrc
index 5a93dcc..de7e106 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -15,8 +15,8 @@ export PAGER=less
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
 export NOTMUCH_CONFIG=~/.mutt/notmuch-config
 
-export CLEAN_HOME=~/projects/clean-itasks
-export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin:~/.local/bin
+export CLEAN_HOME=/opt/clean
+export PATH=$PATH:~/.local/bin:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
 
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'

diff --git a/x/.config/i3/config b/x/.config/i3/config
index 1d1485c..f8534f5 100644 (file)
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -14,11 +14,13 @@ set $font DejaVu Sans Mono
 set $fontsize 12
 
 # lock the screen after 10 minutes
-exec xautolock -locker '/home/mart/.local/bin/lock.sh'
-# set a background
-exec ~/.local/bin/bg
-# Start the notification daemon
-exec dunst
+exec xautolock -locker ~/.local/bin/lock.sh &\
+       display -window root /tmp/bg.png &\
+       dunst &\
+       /usr/sbin/wpa_gui -t &\
+       urxvtd -q -o -f &\
+       xrdb -merge ~/.Xresources &\
+       setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
 
 # Printscreen current window
 bindsym Shift+Print exec ~/.local/bin/scr window
@@ -27,7 +29,7 @@ bindsym Print exec ~/.local/bin/scr
 # lock the screen
 bindsym $mod+l exec xautolock -locknow
 # put a password in the clipboard
-bindsym $mod+y exec passmenu
+bindsym $mod+y exec /usr/share/doc/pass/examples/dmenu/passmenu
 bindsym $mod+b exec ~/.local/bin/network
 bindsym $mod+Shift+b exec ~/.local/bin/wifi
 
@@ -54,8 +56,8 @@ bindsym $mod+n focus up
 bindsym $mod+s focus right
 
 # alternatively, you can use the cursor keys:
-bindsym XF86MonBrightnessUp exec xbacklight -inc 5
-bindsym XF86MonBrightnessDown exec xbacklight -dec 5
+bindsym XF86MonBrightnessUp exec xbacklight -inc 10
+bindsym XF86MonBrightnessDown exec xbacklight -dec 10
 bindsym XF86AudioMute exec amixer -c 1 set Master toggle
 bindsym XF86AudioLowerVolume exec amixer -c 1 set Master 5%-
 bindsym XF86AudioRaiseVolume exec amixer -c 1 set Master 5%+
@@ -144,4 +146,6 @@ bar {
        status_command i3status
        modifier $mod
        font pango:$font $fontsize
+       mode hide
+       bindsym button1 exec killall -USR1 i3status
 }

diff --git a/x/.xinitrc b/x/.xinitrc
index 6c2f666..08f1db1 100644 (file)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,5 +1,4 @@
-xrdb -merge ~/.Xresources
-urxvtd -q -o -f
+fbgrab /tmp/bg.png
 
 envfile="$HOME/.gnupg/gpg-agent.env"
 if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null
@@ -11,5 +10,4 @@ fi
 export GPG_AGENT_INFO
 export SSH_AUTH_SOCK
 
-setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
 exec i3