added load

diff --git a/README.md b/README.md
index dc2e95a..549c6b6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,5 +3,12 @@ Yay dotfiles to share
 
 Also includes a script to install it:)
 
+Containts:
+- vimrc
+- i3 config including custom bar and lock
+- Xresources with nice colorscheme and transparant terminals
+- bashrc
+- muttrc
+
 Todo:
-add mutt, offlineimap, msmtp, Xresources, i3
+add offlineimap, msmtp

diff --git a/i3/bar b/i3/bar
new file mode 100755 (executable)
index 0000000..24b05f3
--- /dev/null
+++ b/i3/bar
@@ -0,0 +1,35 @@
+#!/bin/bash
+function music {
+       song=$([ "$(mpc | wc -l)" = "1" ] && echo "[stopped]" || echo $(mpc | head -1))
+       status=$(mpc | grep -o "\[p.*\]")
+       echo -ne "♪: $song$status | "
+}
+
+function net {
+       cat /run/network/ifstate | grep -q $1 && echo "$2 | "
+}
+
+function volume {
+       volume=$(amixer | grep -A4 Master | grep -o "[0-9]\{1,3\}%\|\[off\]")
+       echo -ne "♬: $volume | "
+}
+
+function temp {
+       temp=$(sensors|grep temp1|head -1|awk '{print $2}')
+       echo -ne "⚠: $temp | "
+}
+
+function battery {
+       pa="/sys/class/power_supply/BAT0"
+       power=$(echo "$(cat $pa/charge_now)*100/$(cat $pa/charge_full)" | bc)
+       charge=""
+       if [ "$(cat $pa/status)" = "Charging" ]; then
+               charge="(C)"
+       fi
+       echo -ne "⚡: $power%$charge | "
+}
+
+while [ 1 ]; do
+       echo "$(music)$(volume)$(net wlan0 W)$(net eth0 E)$(net usb0 U)$(temp)$(battery)$(date +%y-%m-%d\ %H:%M)"
+       sleep 5
+done

diff --git a/i3/config b/i3/config
new file mode 100644 (file)
index 0000000..53df13a
--- /dev/null
+++ b/i3/config
@@ -0,0 +1,142 @@
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout somewhen, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+exec dropbox start
+exec xautolock -time 15 -locker 'lock'
+#exec while [ 1 ]; do offlineimap -c /home/mart/.mutt/offlineimaprc; done
+exec /home/mart/.software/xflux -l 51.8125626 -g 5.8372264
+exec xcompmgr
+exec feh --no-fehbg --bg-scale '/usr/share/slim/themes/default/background.jpg'
+
+set $mod Mod4
+
+# font for window titles. ISO 10646 = Unicode
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# music controls
+bindsym XF86AudioPlay exec mpc toggle >> /dev/null
+bindsym XF86AudioStop exec mpc stop >> /dev/null
+bindsym XF86AudioPrev exec mpc prev >> /dev/null
+bindsym XF86AudioNext exec mpc next >> /dev/null
+
+bindsym Print exec scrot
+
+# volume controls
+bindsym XF86AudioRaiseVolume exec amixer set Master 5+ >> /dev/null
+bindsym XF86AudioLowerVolume exec amixer set Master 5- >> /dev/null
+
+# start a terminal
+bindsym $mod+Return exec urxvt
+
+# kill focused window
+bindsym $mod+Shift+quotedbl kill
+
+# start dmenu (a program launcher)
+bindsym $mod+e exec dmenu_run
+
+# change focus
+bindsym $mod+h focus left
+bindsym $mod+t focus down
+bindsym $mod+n focus up
+bindsym $mod+s focus right
+
+# move focused window
+bindsym $mod+Shift+H move left
+bindsym $mod+Shift+T move down
+bindsym $mod+Shift+N move up
+bindsym $mod+Shift+S move right
+
+# split in horizontal orientation
+bindsym $mod+d split h
+
+# split in vertical orientation
+bindsym $mod+k split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+u fullscreen
+
+# change container layout (stacked, tabbed, default)
+bindsym $mod+o layout stacking
+bindsym $mod+comma layout tabbed
+bindsym $mod+period layout default
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindcode $mod+d focus child
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
+
+# move focused container to workspace
+bindsym $mod+Shift+exclam move container to workspace 1
+bindsym $mod+Shift+at move container to workspace 2
+bindsym $mod+Shift+numbersign move container to workspace 3
+bindsym $mod+Shift+dollar move container to workspace 4
+bindsym $mod+Shift+percent move container to workspace 5
+bindsym $mod+Shift+asciicircum move container to workspace 6
+bindsym $mod+Shift+ampersand move container to workspace 7
+bindsym $mod+Shift+asterisk move container to workspace 8
+bindsym $mod+Shift+parenleft move container to workspace 9
+bindsym $mod+Shift+parenright move container to workspace 10
+
+# reload the configuration file
+bindsym $mod+Shift+J reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+P restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+greater exit
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym h resize shrink width 10 px or 10 ppt
+        bindsym t resize grow height 10 px or 10 ppt
+        bindsym n resize shrink height 10 px or 10 ppt
+        bindsym s resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+p mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command /home/mart/.i3/bar
+               position bottom
+               Font -gnu-unifont-*-*-*-16-160-*-*-*-*-*-*
+}

diff --git a/i3/lock b/i3/lock
new file mode 100755 (executable)
index 0000000..df8941d
--- /dev/null
+++ b/i3/lock
@@ -0,0 +1,4 @@
+#!/bin/bash
+scrot /tmp/screen_locked.png
+convert /tmp/screen_locked.png -scale 40% -scale 250% /tmp/screen_locked2.png
+i3lock -i /tmp/screen_locked2.png

diff --git a/install b/install
index db6246f..cf40057 100755 (executable)
--- a/install
+++ b/install
@@ -3,3 +3,5 @@ cp -if `pwd`/.vimrc ~/.vimrc
 cp -if `pwd`/.bashrc ~/.bashrc
 cp -if `pwd`/.Xresources ~/.Xresources
 cp -if `pwd`/muttrc ~/.mutt/muttrc
+mkdir -p ~/.i3
+cp -if `pwd`/i3/* ~/.i3/

diff --git a/muttrc b/muttrc
index 4c4fe7e..df48b41 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -3,7 +3,15 @@ set realname="Mart Lubbers"
 set from="mart@martlubbers.net"
 set use_from=yes
 set envelope_from=yes
+<<<<<<< HEAD
+<<<<<<< HEAD
+set sendmail="/usr/bin/msmtp --passwordeval -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+=======
 set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+>>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
+=======
+set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+>>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
 set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc"
 
 # Force offlineimap to refresh in the background