From: Mart Lubbers <mart@martlubbers.net>
Date: Fri, 18 Sep 2015 12:43:42 +0000 (+0200)
Subject: changed to pass as the password manager
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=61d1f412efa1a69861ab48328300cb7eec2cd305;p=dotfiles.git

changed to pass as the password manager
---

diff --git a/.config/i3/bar b/.config/i3/bar
deleted file mode 100755
index cef8287..0000000
--- a/.config/i3/bar
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-item(){
-	echo "{\"full_text\": \"$1\"}$2"
-}
-
-battery(){
-	path=/sys/class/power_supply
-	now=$(($(cat "$path/BAT0/charge_now")*100/$(cat "$path/BAT0/charge_full")))
-	[ "$(cat "$path/ADP1/online")" -eq "1" ] && charge="(C)"
-	[ "$now" -ge "100" ] && now="FULL"
-	echo -n "$now%$charge"
-}
-
-volume(){
-	mixer=$(amixer 2>&1 | head -5 | tail -1)
-	echo $mixer | grep -q "\[on\]" || mute="(M)"
-	volume=$(echo $mixer | grep -Po "(?<=\[)[0-9]{1,3}%")
-	echo -n "vol: $volume$mute"
-}
-
-while true;
-do
-	echo "$(volume) | $(battery) | $(date +%x\ %X)"
-	sleep 10
-done
diff --git a/.config/i3/config b/.config/i3/config
index fe3844b..823f9bc 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -16,6 +16,10 @@ exec convert -size 1600x900 plasma:fractal -modulate 20,100,10 png:- | display -
 exec xbacklight -set 50
 exec netctltray
 
+# Custom keybindings
+bindsym $mod+l exec xautolock -locknow
+bindsym $mod+p exec passmenu
+
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
@@ -35,8 +39,6 @@ hide_edge_borders none
 # start a terminal
 bindsym $mod+Return exec i3-sensible-terminal
 
-# lock the screen
-bindsym $mod+l exec xautolock -locknow
 
 # kill focused window
 bindsym $mod+Shift+quotedbl kill
@@ -130,30 +132,30 @@ bindsym $mod+Shift+p restart
 bindsym $mod+Shift+period exec i3-msg 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
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right 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"
+#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
+#
+#        # same bindings, but for the arrow keys
+#        bindsym Left resize shrink width 10 px or 10 ppt
+#        bindsym Down resize grow height 10 px or 10 ppt
+#        bindsym Up resize shrink height 10 px or 10 ppt
+#        bindsym Right 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)
diff --git a/.config/i3/gpass.sh b/.config/i3/gpass.sh
deleted file mode 100755
index 6310572..0000000
--- a/.config/i3/gpass.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-gpg --quiet --batch --use-agent -d ~/pw/mail.asc | grep -A999 "$1" | grep -B999 -m1 "}}}" | grep -Po "(?<=pass: ).*"
diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
index 8cd811e..9e5bcfd 100644
--- a/.config/vdirsyncer/config
+++ b/.config/vdirsyncer/config
@@ -1,6 +1,6 @@
 [general]
 status_path = ~/.config/vdirsyncer/status/
-password_command = ~/.config/i3/gpass.sh calendar
+password_command = pass caldav_ygdrassil/mart
 
 [pair calendar]
 a = calendar_local
diff --git a/.mutt/offlineimap.py b/.mutt/offlineimap.py
index 46a4aa8..eac6dd2 100644
--- a/.mutt/offlineimap.py
+++ b/.mutt/offlineimap.py
@@ -4,7 +4,7 @@
 import subprocess
 
 def mailpasswd():
-    args = '/home/mart/.config/i3/gpass.sh mart@martlubbers.net'
+    args = 'pass mail/mart@martlubbers.net'
     try:
         return subprocess.check_output(args, shell='/bin/bash').strip()
     except subprocess.CalledProcessError: