Merge branch 'master' of git.ianonavy.com:ianonavy/dotfiles

Conflicts:
	i3/i3.dotfile/config

dwb/dwb.configdir/userscripts/lastpass.js

@@ -1,11 +1,10 @@
 //!javascript
 
 Signal.connect("documentLoaded", function(wv, frame) {
-    autofillForm();
+    autofillForm(frame.document);
 });
 
-function fillUsername(name, username) {
-    var doc = tabs.current.focusedFrame.document;
+function fillUsername(doc, name, username) {
     var box = doc.querySelector('input[name="' + name + '"]');
     if (!box) {
         box = doc.querySelector("input[name*=user]");
@@ -24,8 +23,7 @@ function fillUsername(name, username) {
     }
 }
 
-function fillPassword(name, password) {
-    var doc = tabs.current.focusedFrame.document;
+function fillPassword(doc, name, password) {
     var box = doc.querySelector('input[name="' + name + '"]');
     if (!box) {
         box = doc.querySelector("input[type=password]");
@@ -51,23 +49,23 @@ function lastPassFind(url, callbacks) {
     });
 }
 
-function autofillForm() {
+function autofillForm(doc) {
     var username, password;
     lastPassFind(tabs.current.uri, {
         onGetUsername: function (val) {
             username = val;
-            fillUsername("", val);
+            fillUsername(doc, "", val);
         },
         onGetPassword: function (val) { 
             password = val;
-            fillPassword("", val);
+            fillPassword(doc, "", val);
         },
         onGetFieldName: function (line, name) { 
             if (username && line.indexOf(username) > -1) {
-                fillUsername(name, username);
+                fillUsername(doc, name, username);
             }
             if (password && line.indexOf(password) > -1) {
-                fillPassword(name, password);
+                fillPassword(doc, name, password);
             }
         }
     });

git/gitconfig.dotfile

@@ -33,3 +33,5 @@
 [user]
 	email = ianonavy@gmail.com
 	name = Ian Adam Naval
+[merge]
+	tool = meld

i3/i3.dotfile/config

@@ -121,6 +121,7 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
 # Pulse Audio controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 -- +10% && killall -SIGUSR1 i3status
@@ -159,6 +160,17 @@ mode "resize" {
         bindsym Escape mode "default"
 }
 
+mode "move" {
+	bindsym Up move up 20px
+	bindsym Left move left 20px
+	bindsym Down move down 20px
+	bindsym Right move right 20px
+
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+bindsym $mod+m focus floating; mode "move"
+
 set $quit_msg [c]ancel [l]ock [e]xit [r]estart [s]hutdown; suspend to [d]isk [m]emory [h]ybrid
 
 mode "$quit_msg" {

ssh/ssh.dotfile/config

@@ -100,5 +100,10 @@ Host grover
 
 Host gonzo
     Hostname gonzo.acm.wpi.edu
-    User admin
+    User acm
+    IdentityFile ~/.ssh/id_rsa
+
+Host swedishchef
+    Hostname swedishchef.acm.wpi.edu
+    User acm
     IdentityFile ~/.ssh/id_rsa