# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1429659018 25200
# Node ID 9056a39ef016623cc8a9144e882e4bca142119c4
# Parent  875857ed800453572642c409381c62d471afb063
Move `pentadactylrc` to a subfolder, update install scripts.

diff -r 875857ed8004 -r 9056a39ef016 install.cmd
--- a/install.cmd	Mon Apr 20 09:36:49 2015 -0700
+++ b/install.cmd	Tue Apr 21 16:30:18 2015 -0700
@@ -47,7 +47,8 @@
     set /P confirm=Will delete existing "%userprofile%\_pentadactylrc". OK with that? Press CTRL-C to abort.
     del /Q "%userprofile%\_pentadactylrc"
 )
-echo source %CWD:\=/%pentadactylrc > "%userprofile%\_pentadactylrc"
+echo set runtimepath=~/.pentadactyl,%CWD:\=/%pentadactyl > "%userprofile%\_pentadactylrc"
+echo source %CWD:\=/%pentadactyl/pentadactylrc >> "%userprofile%\_pentadactylrc"
 
 :: Console 2
 if exist "%appdata%\Console\console.xml" (
diff -r 875857ed8004 -r 9056a39ef016 install.sh
--- a/install.sh	Mon Apr 20 09:36:49 2015 -0700
+++ b/install.sh	Tue Apr 21 16:30:18 2015 -0700
@@ -38,7 +38,8 @@
 
 # WEB BROWSER
 # -----------
-ln -s "$CWD/pentadactylrc" "$HOME/.pentadactylrc"
+echo set runtimepath=~/.pentadactyl,$CWD/pentadactyl > "$HOME/.pentadactylrc"
+echo source "$CWD/pentadactyl/pentadactylrc" >> "$HOME/.pentadactylrc"
 
 # TMUX
 # ----
diff -r 875857ed8004 -r 9056a39ef016 pentadactyl/pentadactylrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pentadactyl/pentadactylrc	Tue Apr 21 16:30:18 2015 -0700
@@ -0,0 +1,103 @@
+" Config for Pentadactyl
+
+" Scroll faster
+nmap -builtin h 3h
+nmap -builtin j 3j
+nmap -builtin k 3k
+nmap -builtin l 3l
+
+" Scroll easier
+nmap -builtin d <C-d>
+nmap -builtin e <C-u>
+
+" Close tab with `x` since `d` is for scrolling down now
+nmap -builtin x :bd<cr>
+
+" Don't close the window with the last tab.
+set! browser.tabs.closeWindowWithLastTab=false
+
+" Change tabs without awkward `CTRL` combinations
+nmap -builtin J :tabprevious<cr>
+nmap -builtin K :tabnext<cr>
+
+" Reorder tabs
+nmap -builtin > :tabmove! +1<cr>
+nmap -builtin < :tabmove! -1<cr>
+
+"New tab using the old classic way
+nmap -builtin <C-t> :tabnew<cr>
+
+" Use `i` to get into pass-through mode,
+" `I` for temporary pass-through mode,
+" and `c` for the 'caret' mode.
+nmap -builtin i <C-z>
+nmap -builtin I <C-v>
+nmap -builtin c i
+
+" Shortcuts for common extensions
+nmap -builtin ,f i<D-\>
+nmap -builtin ,p <S-Esc><A-D-\>
+nmap -builtin ,b I<A-b>
+
+" Use and quickly hide search highlighting
+set hlfind
+nmap -builtin ,<Space> :noh<cr>
+
+" Aw come on, copy/pasting is ridiculous by default.
+map -builtin -modes=i,c,v <C-c> <C-v><C-c>
+map -builtin -modes=i,c   <C-x> <C-v><C-x>
+map -builtin -modes=i,c   <C-v> <C-v><C-v>
+
+" Quickly open some dialogs
+nmap -builtin ,b :downloads<cr>
+
+" On keyboards like the Leopold FC660C, for some obscure reason, the
+" <Insert> key sends the <Help> ID. WTF.
+noremap <Help> <Insert>
+
+" DDG FTW
+set defsearch=duckduckgo
+
+" Super minimal UI
+"set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs
+
+" Websites with useful keyboard shortcuts already
+set passkeys+=fastmail.com:jkomxeyga#.rupn,/,<S-g>m,<S-g>c,<S-g>a
+set passkeys+=feedly.com:jkgvnpm
+set passkeys+=feedbin.com:hjklesmvVFcf123456789rgAa?<Space><Esc>,/
+set passkeys+=groups.google.com:jkuonp
+
+" Plugins
+loadplugins '\.(js|penta)$'
+set pintaboardToken="ludovicchabant:04A05605C553E70CDA2A"
+
+javascript <<EOF
+function saveToPocket(){var%20e=function(t,n,r,i,s){var%20o=[5581053,5370545,3939863,5030563,6022735,2412811,4059305,6072550,4240340,2597059];var%20i=i||0,u=0,n=n||[],r=r||0,s=s||0;var%20a={'a':97,'b':98,'c':99,'d':100,'e':101,'f':102,'g':103,'h':104,'i':105,'j':106,'k':107,'l':108,'m':109,'n':110,'o':111,'p':112,'q':113,'r':114,'s':115,'t':116,'u':117,'v':118,'w':119,'x':120,'y':121,'z':122,'A':65,'B':66,'C':67,'D':68,'E':69,'F':70,'G':71,'H':72,'I':73,'J':74,'K':75,'L':76,'M':77,'N':78,'O':79,'P':80,'Q':81,'R':82,'S':83,'T':84,'U':85,'V':86,'W':87,'X':88,'Y':89,'Z':90,'0':48,'1':49,'2':50,'3':51,'4':52,'5':53,'6':54,'7':55,'8':56,'9':57,'\/':47,':':58,'?':63,'=':61,'-':45,'_':95,'&':38,'$':36,'!':33,'.':46};if(!s||s==0){t=o[0]+t}for(var%20f=0;f<t.length;f++){var%20l=function(e,t){return%20a[e[t]]?a[e[t]]:e.charCodeAt(t)}(t,f);if(!l*1)l=3;var%20c=l*(o[i]+l*o[u%o.length]);n[r]=(n[r]?n[r]+c:c)+s+u;var%20p=c%(50*1);if(n[p]){var%20d=n[r];n[r]=n[p];n[p]=d}u+=c;r=r==50?0:r+1;i=i==o.length-1?0:i+1}if(s==318){var%20v='';for(var%20f=0;f<n.length;f++){v+=String.fromCharCode(n[f]%(25*1)+97)}o=function(){};return%20v+'2018d4349a'}else{return%20e(u+'',n,r,i,s+1)}};var%20t=document,n=t.location.href,r=t.title;var%20i=e(n);var%20s=t.createElement('script');s.type='text/javascript';s.src='https://getpocket.com/b/r4.js?h='+i+'&u='+encodeURIComponent(n)+'&t='+encodeURIComponent(r);e=i=function(){};var%20o=t.getElementsByTagName('head')[0]||t.documentElement;o.appendChild(s)}
+EOF
+command -js pocket saveToPocket()
+
+" Website-specific groups
+" Feedbin
+group! feedbin -loc feedbin.com
+javascript <<EOF
+function feedbinScrollUp() {
+    el = content.document.getElementsByClassName('entries');
+    if (el != undefined && el.length > 0) {
+        el[0].scrollTop -= el[0].clientHeight/2;
+    } else {
+        content.console.error("Can't find the entries list. Got: ", el);
+    }
+}
+function feedbinScrollDown() {
+    el = content.document.getElementsByClassName('entries');
+    if (el != undefined && el.length > 0) {
+        el[0].scrollTop += el[0].clientHeight/2;
+    } else {
+        content.console.error("Can't find the entries list. Got: ", el);
+    }
+}
+EOF
+nmap -builtin -js <PageUp> feedbinScrollUp()
+nmap -builtin -js <PageDown> feedbinScrollDown()
+
+" vim: ft=vim
diff -r 875857ed8004 -r 9056a39ef016 pentadactylrc
--- a/pentadactylrc	Mon Apr 20 09:36:49 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-" Config for Pentadactyl
-
-" Scroll faster
-nmap -builtin h 3h
-nmap -builtin j 3j
-nmap -builtin k 3k
-nmap -builtin l 3l
-
-" Scroll easier
-nmap -builtin d <C-d>
-nmap -builtin e <C-u>
-
-" Close tab with `x` since `d` is for scrolling down now
-nmap -builtin x :bd<cr>
-
-" Don't close the window with the last tab.
-set! browser.tabs.closeWindowWithLastTab=false
-
-" Change tabs without awkward `CTRL` combinations
-nmap -builtin J :tabprevious<cr>
-nmap -builtin K :tabnext<cr>
-
-" Reorder tabs
-nmap -builtin > :tabmove! +1<cr>
-nmap -builtin < :tabmove! -1<cr>
-
-"New tab using the old classic way
-nmap -builtin <C-t> :tabnew<cr>
-
-" Use `i` to get into pass-through mode,
-" `I` for temporary pass-through mode,
-" and `c` for the 'caret' mode.
-nmap -builtin i <C-z>
-nmap -builtin I <C-v>
-nmap -builtin c i
-
-" Shortcuts for common extensions
-nmap -builtin ,f i<D-\>
-nmap -builtin ,p <S-Esc><A-D-\>
-nmap -builtin ,b I<A-b>
-
-" Use and quickly hide search highlighting
-set hlfind
-nmap -builtin ,<Space> :noh<cr>
-
-" Aw come on, copy/pasting is ridiculous by default.
-map -builtin -modes=i,c,v <C-c> <C-v><C-c>
-map -builtin -modes=i,c   <C-x> <C-v><C-x>
-map -builtin -modes=i,c   <C-v> <C-v><C-v>
-
-" Quickly open some dialogs
-nmap -builtin ,b :downloads<cr>
-
-" On keyboards like the Leopold FC660C, for some obscure reason, the
-" <Insert> key sends the <Help> ID. WTF.
-noremap <Help> <Insert>
-
-" DDG FTW
-set defsearch=duckduckgo
-
-" Super minimal UI
-"set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs
-
-" Websites with useful keyboard shortcuts already
-set passkeys+=fastmail.com:jkomxeyga#.rupn,/,<S-g>m,<S-g>c,<S-g>a
-set passkeys+=feedly.com:jkgvnpm
-set passkeys+=feedbin.com:hjklesmvVFcf123456789rgAa?<Space><Esc>,/
-set passkeys+=groups.google.com:jkuonp
-
-" Website-specific groups
-" Feedbin
-group! feedbin -loc feedbin.com
-javascript <<EOF
-function feedbinScrollUp() {
-    el = content.document.getElementsByClassName('entries');
-    if (el != undefined && el.length > 0) {
-        el[0].scrollTop -= el[0].clientHeight/2;
-    } else {
-        content.console.error("Can't find the entries list. Got: ", el);
-    }
-}
-function feedbinScrollDown() {
-    el = content.document.getElementsByClassName('entries');
-    if (el != undefined && el.length > 0) {
-        el[0].scrollTop += el[0].clientHeight/2;
-    } else {
-        content.console.error("Can't find the entries list. Got: ", el);
-    }
-}
-EOF
-nmap -builtin -js <PageUp> feedbinScrollUp()
-nmap -builtin -js <PageDown> feedbinScrollDown()
-
-" vim: ft=vim