From a6c9acf85edef1e6024eb0f52d4e101036a1cbad Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Sat, 29 Oct 2016 12:26:38 +0200
Subject: [PATCH] Move webjumps to separate file

---
 conkeror/.conkerorrc/.gitignore   |  3 +--
 conkeror/.conkerorrc/GNUmakefile  |  2 +-
 conkeror/.conkerorrc/init.org     | 24 ------------------------
 conkeror/.conkerorrc/webjumps.org | 30 ++++++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 27 deletions(-)
 create mode 100644 conkeror/.conkerorrc/webjumps.org

diff --git a/conkeror/.conkerorrc/.gitignore b/conkeror/.conkerorrc/.gitignore
index ee15bbb..a6c7c28 100644
--- a/conkeror/.conkerorrc/.gitignore
+++ b/conkeror/.conkerorrc/.gitignore
@@ -1,2 +1 @@
-init.js
-private.js
+*.js
diff --git a/conkeror/.conkerorrc/GNUmakefile b/conkeror/.conkerorrc/GNUmakefile
index 82e5b9b..6a09cd6 100644
--- a/conkeror/.conkerorrc/GNUmakefile
+++ b/conkeror/.conkerorrc/GNUmakefile
@@ -1,6 +1,6 @@
 include ../../dotfiles.mk
 
-all: init.js
+all: init.js webjumps.js
 
 %.js: %.org
 	$(call tangle,js)
diff --git a/conkeror/.conkerorrc/init.org b/conkeror/.conkerorrc/init.org
index 012b02e..40fb299 100644
--- a/conkeror/.conkerorrc/init.org
+++ b/conkeror/.conkerorrc/init.org
@@ -52,30 +52,6 @@ Add the ~search-engines/~ directory to the opensearch load path.
   add_to_opensearch_load_path('search-engines');
 #+END_SRC
 
-Add a Mozilla Developer Network webjump. This uses their OpenSearch
-description.
-
-#+BEGIN_SRC js
-  define_opensearch_webjump("mdn", "mozilla-developer-network.xml");
-#+END_SRC
-
-Add a Duck Duck Go webjump. This uses the OpenSearch
-description. Conkeror has a =duckduck= webjump, but I prefer the
-shorter ddg.
-
-#+BEGIN_SRC js
-  define_opensearch_webjump("ddg", "duckduckgo.xml");
-#+END_SRC
-
-Add a [[https://wpackagist.org/][WordPress Packagist]] webjump.
-
-#+BEGIN_SRC js
-  define_webjump("wpackagist",
-                 "https://wpackagist.org/search?q=%s&type=any",
-                 $alternative="https://wpackagist.org/",
-                 $doc="Search WordPress packagist for plugins and themes.");
-#+END_SRC
-
 Add the ~site-js/~ directory to the load path.
 
 #+BEGIN_SRC js
diff --git a/conkeror/.conkerorrc/webjumps.org b/conkeror/.conkerorrc/webjumps.org
new file mode 100644
index 0000000..afb5a57
--- /dev/null
+++ b/conkeror/.conkerorrc/webjumps.org
@@ -0,0 +1,30 @@
+#+TITLE: Conkeror Webjumps
+
+* Opensearch webjumps
+
+  Add a Mozilla Developer Network webjump. This uses their OpenSearch
+  description.
+
+  #+BEGIN_SRC js
+    define_opensearch_webjump("mdn", "mozilla-developer-network.xml");
+  #+END_SRC
+
+  Add a Duck Duck Go webjump. This uses the OpenSearch
+  description. Conkeror has a =duckduckgo= webjump, but I prefer the
+  shorter ddg. I define a new open search webjump because if I alias
+  the webjump it'll still show up as =duckduckgo=.
+
+  #+BEGIN_SRC js
+    define_opensearch_webjump("ddg", "duckduckgo.xml");
+  #+END_SRC
+
+* Regular webjumps
+
+  Add a [[https://wpackagist.org/][WordPress Packagist]] webjump.
+
+  #+BEGIN_SRC js
+    define_webjump("wpackagist",
+                   "https://wpackagist.org/search?q=%s&type=any",
+                   $alternative="https://wpackagist.org/",
+                   $doc="Search WordPress packagist for plugins and themes.");
+  #+END_SRC