From 174433900709a41b3d6299f0c6e7d37d75b5ef96 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 09:09:22 -0400 Subject: [PATCH 1/7] Make mergetool meld --- git/gitconfig.dotfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git/gitconfig.dotfile b/git/gitconfig.dotfile index d35bdd8..b685a34 100644 --- a/git/gitconfig.dotfile +++ b/git/gitconfig.dotfile @@ -33,3 +33,5 @@ [user] email = ianonavy@gmail.com name = Ian Adam Naval +[merge] + tool = meld From 5713e1398ae1c413386f7be0698c7196e4ed4d6f Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 09:09:32 -0400 Subject: [PATCH 2/7] Add move mode --- i3/i3.dotfile/config | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/i3/i3.dotfile/config b/i3/i3.dotfile/config index 67211ba..7f734bc 100644 --- a/i3/i3.dotfile/config +++ b/i3/i3.dotfile/config @@ -160,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" + bindsym $mod+r mode "resize" new_window normal 0 From d45d49286daeb063671def952bfd09cc2901e988 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 09:09:52 -0400 Subject: [PATCH 3/7] Add swedishchef to ssh config --- ssh/ssh.dotfile/config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ssh/ssh.dotfile/config b/ssh/ssh.dotfile/config index 9f31694..52d063c 100644 --- a/ssh/ssh.dotfile/config +++ b/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 From a55438fba9b0335599e5d819ce6d5359fc276c00 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 16:17:19 -0400 Subject: [PATCH 4/7] Fix lastpass script for latest dwb --- dwb/dwb.configdir/userscripts/lastpass.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dwb/dwb.configdir/userscripts/lastpass.js b/dwb/dwb.configdir/userscripts/lastpass.js index 5f74f1f..d49f691 100644 --- a/dwb/dwb.configdir/userscripts/lastpass.js +++ b/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); } } }); From d160ed000800497d7eff588bdbe684466d6bf21d Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 16:43:53 -0400 Subject: [PATCH 5/7] Update dwb colors to Monokai --- dwb/dwb.configdir/settings | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dwb/dwb.configdir/settings b/dwb/dwb.configdir/settings index 4553eb2..4110173 100644 --- a/dwb/dwb.configdir/settings +++ b/dwb/dwb.configdir/settings @@ -3,7 +3,7 @@ javascript-can-access-clipboard=false hint-offset-top=0 file-sync-interval=120 download-gradient-end=#00aa00 -status-allowed-color=#00ff00 +status-allowed-color=#a6e22e tab-number-color=#7ac5cd enable-default-context-menu=true editable=false @@ -13,7 +13,7 @@ minimum-logical-font-size=5 enable-page-cache=false cache-model=webbrowser sans-serif-font-family=sans-serif -prompt-color=#00ff00 +prompt-color=#a6e22e complete-searchengines=true update-search-delay=200 fantasy-font-family=serif @@ -22,7 +22,7 @@ sync-files=all default-height=600 javascript-api=automatic scrollbars=false -hint-bg-color=#ffffff +hint-bg-color=#f8f8f2 show-single-tab=false private-color=#505050 enable-developer-extras=true @@ -50,7 +50,7 @@ editor=xterm -e vim dwb_uri hsts=false enable-private-browsing=false enable-favicon=true -hint-active-color=#00ff00 +hint-active-color=#a6e22e resizable-text-areas=true javascript-schemes=true load-on-focus=false @@ -60,8 +60,8 @@ hint-normal-color=#ffff99 spell-checking-languages= cookies-accept-policy=always font-nofocus= -status-blocked-color=#ffffff -download-fg-color=#ffffff +status-blocked-color=#f8f8f2 +download-fg-color=#f8f8f2 enable-plugins=true enable-frame-flattening=false ssl-use-system-ca-file=true @@ -69,7 +69,7 @@ cookies-store-policy=persistent bars-padding=0 active-completion-fg-color=#53868b hint-font=bold 10px monospace -progress-bar-full-color=#ffffff +progress-bar-full-color=#f8f8f2 tabbed-browsing=true hint-highlight-links=false active-completion-bg-color=#000000 @@ -99,7 +99,7 @@ javascript-can-open-windows-automatically=false max-visible-completions=11 hint-border=1px solid #000000 widget-packing=dtws -ssl-trusted-color=#00ff00 +ssl-trusted-color=#a6e22e enable-java-applet=true hints-key-lock=250 navigation-history-max=500 @@ -126,7 +126,7 @@ addressbar-dns-lookup=false enable-universal-access-from-file-uris=true background-color=#272822 do-not-track=true -progress-bar-empty-color=#ffffff +progress-bar-empty-color=#f8f8f2 default-width=800 single-instance=true auto-completion=true @@ -139,7 +139,7 @@ adblocker=false download-external-command=xterm -e wget dwb_uri -O dwb_output --load-cookies dwb_cookies user-stylesheet-uri= auto-load-images=true -tab-active-fg-color=#ffffff +tab-active-fg-color=#f8f8f2 tab-width=100 hint-offset-left=0 history-length=500 @@ -154,7 +154,7 @@ enforce-96-dpi=false ssl-strict=true scroll-step=0.00 complete-userscripts=false -foreground-color=#ffffff +foreground-color=#f8f8f2 message-delay=2 scheme-handler= default-font-size=12 From e4cac2b1b770d3fd6d4600ef121aa770c8044f9a Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 16:51:40 -0400 Subject: [PATCH 6/7] Make UI elements for dwb match i3 --- dwb/dwb.configdir/settings | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dwb/dwb.configdir/settings b/dwb/dwb.configdir/settings index 4110173..def3d9a 100644 --- a/dwb/dwb.configdir/settings +++ b/dwb/dwb.configdir/settings @@ -159,6 +159,6 @@ message-delay=2 scheme-handler= default-font-size=12 enable-offline-web-application-cache=true -tabbar-height=0 -statusbar-height=0 -favicon-size=0 +tabbar-height=24 +statusbar-height=24 +favicon-size=16 From 90d74435c4002ee6cf3f1411c666317327277f06 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Thu, 23 Oct 2014 17:06:37 -0400 Subject: [PATCH 7/7] Make downloading match Monokai color scheme. --- dwb/dwb.configdir/settings | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dwb/dwb.configdir/settings b/dwb/dwb.configdir/settings index def3d9a..236bdca 100644 --- a/dwb/dwb.configdir/settings +++ b/dwb/dwb.configdir/settings @@ -2,7 +2,7 @@ javascript-can-access-clipboard=false hint-offset-top=0 file-sync-interval=120 -download-gradient-end=#00aa00 +download-gradient-end=#a6e22e status-allowed-color=#a6e22e tab-number-color=#7ac5cd enable-default-context-menu=true @@ -55,13 +55,13 @@ resizable-text-areas=true javascript-schemes=true load-on-focus=false adblocker-element-hider=true -download-gradient-start=#0000aa +download-gradient-start=#f92672 hint-normal-color=#ffff99 spell-checking-languages= cookies-accept-policy=always font-nofocus= status-blocked-color=#f8f8f2 -download-fg-color=#f8f8f2 +download-fg-color=#252525 enable-plugins=true enable-frame-flattening=false ssl-use-system-ca-file=true @@ -82,8 +82,8 @@ save-session=true enable-ipc=true tabbar-visible=2.00 auto-insert-mode=true -tab-normal-bg-color-2=#272822 -tab-normal-bg-color-1=#272822 +tab-normal-bg-color-2=#272727 +tab-normal-bg-color-1=#272727 serif-font-family=serif accept-language= enable-html5-local-storage=true @@ -134,7 +134,7 @@ minimum-font-size=5 font-completion= enable-spatial-navigation=false block-insecure-content=false -download-directory= +download-directory=~/Downloads adblocker=false download-external-command=xterm -e wget dwb_uri -O dwb_output --load-cookies dwb_cookies user-stylesheet-uri=