background and removed a lot of nonsense

diff --git a/.Xresources b/.Xresources
index 9fe9f70..7a2ba1b 100644 (file)
--- a/.Xresources
+++ b/.Xresources
@@ -1,8 +1,6 @@
-URxvt.visualBell: true
-URxvt.depth: 32
-URxvt.background: black
+URxvt.background: rgba:0000/0000/0200/c800
 URxvt.saveLines: 10000
-URxvt.foreground: white
+URxvt.foreground: grey80
 URxvt.scrollBar: false
 URxvt.color0: rgb:00/00/00
 URxvt.color1: rgb:a8/00/00

diff --git a/.bashrc b/.bashrc
index b401423..9074f96 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -6,8 +6,8 @@ shopt -s histappend
 set -o vi
 . /etc/bash_completion
 
-#Variables
-export BROWSER=lynx
+##Variables
+export BROWSER=chromium
 export EDITOR=vim
 export TERMINAL=urxvt
 export TERM=screen
@@ -15,25 +15,26 @@ export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
 export COLORFGBG="default:default"
 export PYTHONDONTWRITEBYTECODE
 export NOTMUCH_CONFIG=~/.mutt/.notmuch-config
-
-#Colors yeeeyyyy
+export TEXMFHOME=~/.texmf
+#
+##Colors yeeeyyyy
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
-alias mutt='~/downloads/mutt-n/mutt'
 
-#Watch youtube videos in the terminal
-function ytview {
-       if [ "$#" -ne "1" ]; then
-               echo "usage $0 yturl"
-       else
-               get_flash_videos -q -f - $1 | cvlc -A alsa -V aa -
-       fi
+function getpass {
+       gpg -d -q --use-agent ~/passwd.gpg | grep "^$1" | awk '{print $3}'
+}
+
+function getuser {
+       gpg -d -q --use-agent ~/passwd.gpg | grep "^$1" | awk '{print $2}'
 }
 
-#Mount cloud file storage and start daemon if necessary
-if ! mountpoint -q ~/copy; then
-       encfs ~/.copy.encr ~/copy
-fi
-if ! pidof CopyConsole >> /dev/null; then
-       ~/bin/copy/x86_64/CopyConsole -daemon 2>&1 1>/dev/null
-fi
+function addaccount {
+       gpg -d -o ~/passwd -q --use-agent ~/passwd.gpg
+       echo -n "user? "
+       read user
+       echo -n "pass? "
+       read pass
+       echo "$1        $user   $pass" >> ~/passwd
+       shred -u -v -z ~/passwd
+}

diff --git a/.xinitrc b/.xinitrc
deleted file mode 100644 (file)
index ba0c6ef..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1 +0,0 @@
-exec i3

diff --git a/i3/bar b/i3/bar
index 24b05f3..867821a 100755 (executable)
--- a/i3/bar
+++ b/i3/bar
@@ -1,12 +1,12 @@
 #!/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 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 | "
+       grep -q "$1" /run/network/ifstate && echo "$2 | "
 }
 
 function volume {
@@ -30,6 +30,6 @@ function battery {
 }
 
 while [ 1 ]; do
-       echo "$(music)$(volume)$(net wlan0 W)$(net eth0 E)$(net usb0 U)$(temp)$(battery)$(date +%y-%m-%d\ %H:%M)"
+       echo "$(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
index 53df13a..5b3d129 100644 (file)
--- a/i3/config
+++ b/i3/config
@@ -8,12 +8,8 @@
 # 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'
+exec xautolock -time 15 -locker 'i3lock -i <(import -window root - | convert - -scale 40% -scale 250% png:-)'
+exec xrdb ~/.Xresources
 
 set $mod Mod4
 
@@ -29,7 +25,7 @@ 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
+#bindsym Print exec scrot
 
 # volume controls
 bindsym XF86AudioRaiseVolume exec amixer set Master 5+ >> /dev/null
@@ -43,6 +39,7 @@ bindsym $mod+Shift+quotedbl kill
 
 # start dmenu (a program launcher)
 bindsym $mod+e exec dmenu_run
+bindsym $mod+Shift+E exec convert -background black -fill white -size 1600x900 -font /usr/share/fonts/truetype/unifont/unifont.ttf label:"$(gcalcli --nc calw)" png:- | display -window root
 
 # change focus
 bindsym $mod+h focus left

diff --git a/i3/lock b/i3/lock
deleted file mode 100755 (executable)
index eacfa85..0000000
--- a/i3/lock
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-i3lock -i <(import -window root - | convert - -scale 40% -scale 250% png:-)