Merge remote-tracking branch 'ryuslash/drd' into phoenix

Conflicts:
	.config/herbstluftwm/autostart
	.emacs.d/init.el
	.xinitrc
	.zprofile
	Makefile
	xmonad/xmonad.hs

19 files changed, 476 insertions, 194 deletions

diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js
index 157f125..1d1387c 100644
--- a/.conkerorrc/init.js
+++ b/.conkerorrc/init.js
@@ -1,10 +1,10 @@
 require("content-policy.js");
 require("favicon");
 
-load_paths.push("file:///home/slash/projects/markam/conkeror/");
+load_paths.push("file:///usr/local/clark/share/conkeror/modules/");
 theme_load_paths.push("/home/slash/.conkerorrc/themes/");
 
-require("markam");
+require("clark");
 
 define_browser_object_class(
     "history-url", null,
@@ -159,19 +159,22 @@ define_key(content_buffer_normal_keymap, "C-y", "paste-url-new-buffer");
 define_key(content_buffer_normal_keymap, "H", "find-url-from-history");
 define_key(content_buffer_normal_keymap, "h", "find-url-from-history-new-buffer");
 define_key(default_base_keymap, "C-x f", "follow-new-buffer");
+define_key(content_buffer_normal_keymap, "b", clark_keymap);
 
 add_hook("before_quit_hook", oni_before_quit_func);
 add_hook("content_policy_hook", content_policy_bytype);
-add_hook("mode_line_hook", mode_line_adder(buffer_count_widget, true));
-add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget, true));
+add_hook("mode_line_hook", mode_line_adder(buffer_count_widget));
+add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget), true);
+add_hook("mode_line_hook", mode_line_adder(clark_bookmarked_widget), true);
 add_hook("mode_line_hook", mode_line_adder(downloads_status_widget));
 
 remove_hook("download_added_hook", open_download_buffer_automatically);
 
 hints_minibuffer_annotation_mode(true);
-theme_load("naquadah");
+theme_load("yoshi");
 
-external_content_handlers.set("application/pdf", "xpdf");
+external_content_handlers.set("application/pdf", "zathura");
+external_content_handlers.set("application/vnd.ms-excel", "libreoffice");
 
 var gh_url = "http://github.com/";
 function read_url_github_ad_command_handler(input)
@@ -283,12 +286,12 @@ let (mozrepl_init = get_home_directory()) {
     session_pref('extensions.mozrepl.initUrl', make_uri(mozrepl_init).spec);
 };
 
-if ('@hyperstruct.net/mozlab/mozrepl;1' in Cc) {
-    let mozrepl = Cc['@hyperstruct.net/mozlab/mozrepl;1']
-            .getService(Ci.nsIMozRepl);
-    if (!mozrepl.isActive())
-        mozrepl.start(4242);
-}
+// if ('@hyperstruct.net/mozlab/mozrepl;1' in Cc) {
+//     let mozrepl = Cc['@hyperstruct.net/mozlab/mozrepl;1']
+//             .getService(Ci.nsIMozRepl);
+//     if (!mozrepl.isActive())
+//         mozrepl.start(4242);
+// }
 
 register_user_stylesheet(
     "data:text/css," +
@@ -305,3 +308,4 @@ register_user_stylesheet(
 
 oni_add_sheet("github.css");
 oni_add_sheet("help.css");
+oni_add_sheet("git-scm.css");
diff --git a/.conkerorrc/styles/.gitignore b/.conkerorrc/styles/.gitignore
new file mode 100644
index 0000000..b3a5267
--- /dev/null
+++ b/.conkerorrc/styles/.gitignore
@@ -0,0 +1 @@
+*.css
diff --git a/.conkerorrc/styles/Makefile b/.conkerorrc/styles/Makefile
index fb44500..c75377b 100644
--- a/.conkerorrc/styles/Makefile
+++ b/.conkerorrc/styles/Makefile
@@ -1,4 +1,7 @@
 DESTDIR:=$(DESTDIR)/styles
-objects=github.css help.css
+objects=github.css help.css git-scm.css
 
 include ../../dotfiles.mk
+
+$(objects): %.css: %.less
+	lessc -x $^ > $@
diff --git a/.conkerorrc/styles/base.less b/.conkerorrc/styles/base.less
new file mode 100644
index 0000000..dcb5a5e
--- /dev/null
+++ b/.conkerorrc/styles/base.less
@@ -0,0 +1,4 @@
+@import "tango";
+
+@monospace-font: "Envy Code R";
+@background: #111113;
diff --git a/.conkerorrc/styles/git-scm.less b/.conkerorrc/styles/git-scm.less
new file mode 100644
index 0000000..d69a97d
--- /dev/null
+++ b/.conkerorrc/styles/git-scm.less
@@ -0,0 +1,18 @@
+@import "base";
+
+@-moz-document domain(git-scm.com) {
+    .book#main {
+        background: @background !important;
+        color: @aluminium-1 !important;
+
+        code, pre {
+            background: @aluminium-6 !important;
+            color: @aluminium-2 !important;
+            font-family: @monospace-font !important;
+        }
+
+        &, code, pre {
+            border: none !important;
+        }
+    }
+}
diff --git a/.conkerorrc/styles/github.css b/.conkerorrc/styles/github.css
deleted file mode 100644
index ff3a643..0000000
--- a/.conkerorrc/styles/github.css
+++ /dev/null
@@ -1,161 +0,0 @@
-@-moz-document url(https://github.com/), url(https://github.com/dashboard) {
-    #dashboard .filter-bar {
-        background: #222224 !important;
-        border-bottom: none !important;
-    }
-
-    #dashboard .filter-bar li a.filter_selected {
-        color: #eeeeec !important;
-    }
-
-    #dashboard .repos {
-        border: none !important;
-        background-color: #171719 !important;
-    }
-
-    #dashboard .repos .bottom-bar {
-        background-color: #222224 !important;
-    }
-
-    #dashboard .repos .top-bar {
-        background: #222224 !important;
-        border-bottom: none !important;
-    }
-
-    #dashboard .repos h2 {
-        color: inherit !important;
-    }
-
-    #dashboard ul.repo_list li.private {
-        background: #222224 !important;
-    }
-
-    #dashboard ul.repo_list li a {
-        border-width: 0 !important;
-    }
-
-    #footer {
-        text-shadow: none !important;
-    }
-
-    .button .minibutton {
-        background: #171719 !important;
-    }
-
-    .header {
-        background: #222224 !important;
-        color: #eeeeec !important;
-        border-bottom: none !important;
-        text-shadow: none !important;
-    }
-
-    .header .divider-vertical {
-        background: #222224 !important;
-        border-right: none !important;
-    }
-
-    .header .top-nav a {
-        color: #eeeeec !important;
-    }
-
-    .header .topsearch a#advanced_search {
-        color: #eeeeec !important;
-    }
-
-    .header #user-links a {
-        color: #eeeeec !important;
-    }
-
-    .markdown-body code,
-    .markdown-body tt {
-        background-color: #222224 !important;
-        border: none !important;
-        color: #eeeeec !important;
-        font-family: "Envy Code R" !important;
-    }
-
-    .minibutton.dark-grey {
-        background: #171719 !important;o
-    }
-
-    .news .alert {
-        border-top: none !important;
-    }
-
-    .news .alert .branch-link,
-    .news .alert .pull-info {
-        background: #222224 !important;
-        color: #eeeeec !important;
-    }
-
-    .news .alert .gravatar {
-        background: none !important;
-    }
-
-    .news .alert .simple .title {
-        color: #eeeeec !important;
-    }
-
-    .news .commits li img {
-        background: none !important;
-    }
-
-    .news blockquote {
-        color: #eeeeec !important;
-    }
-
-    .pagehead .container > ul.tabs {
-        background: #171719 !important;
-        border: none !important;
-    }
-
-    .pagehead .container > ul.tabs li a {
-        text-shadow: none !important;
-        border: none !important;
-    }
-
-    .pagehead .container > ul.tabs li a:hover {
-        background: #222224 !important;
-    }
-
-    .pagehead .container > ul.tabs li a.selected {
-        background: #222224 !important;
-    }
-
-    .pagehead-actions a.feed {
-        background: #222224 !important;
-        border: none !important;
-    }
-
-    .pagination {
-        background: #171719 !important;
-        border: none !important;
-    }
-
-    .pagination a {
-        text-shadow: none !important;
-        border-bottom: none !important;
-    }
-
-    .pagination a:hover {
-        background: #222224 !important;
-    }
-
-    a {
-        color: #ffbb56 !important;
-    }
-
-    a:visited {
-        color: #ee82ee !important;
-    }
-
-    a.header-logo-blacktocat,
-    a.header-logo-blacktocat:visited {
-        color: #eeeeec !important;
-    }
-
-    body {
-        background-color: #111113 !important;
-        color: #eeeeec !important;
-    }
-}
diff --git a/.conkerorrc/styles/github.less b/.conkerorrc/styles/github.less
new file mode 100644
index 0000000..e4d3ed0
--- /dev/null
+++ b/.conkerorrc/styles/github.less
@@ -0,0 +1,162 @@
+@import "base";
+
+@-moz-document url("https://github.com/"), url("https://github.com/dashboard") {
+    #dashboard {
+        .filter-bar {
+            background: @aluminium-5 !important;
+            border-bottom: none !important;
+
+            li a.filter_selected {
+                color: @aluminium-1 !important;
+            }
+        }
+
+        .repos {
+            border: none !important;
+            background-color: @aluminium-6 !important;
+
+            .bottom-bar {
+                background-color: @aluminium-5 !important;
+            }
+
+            .top-bar {
+                background: @aluminium-5 !important;
+                border-bottom: none !important;
+            }
+
+            h2 {
+                color: inherit !important;
+            }
+        }
+
+        ul.repo_list li {
+            &.private {
+                background: @aluminium-5 !important;
+            }
+
+            a {
+                border-width: 0 !important;
+            }
+        }
+    }
+
+    #footer {
+        text-shadow: none !important;
+    }
+
+    .button .minibutton {
+        background: @aluminium-6 !important;
+    }
+
+    .header {
+        background: @aluminium-5 !important;
+        color: @aluminium-1 !important;
+        border-bottom: none !important;
+        text-shadow: none !important;
+
+        .divider-vertical {
+            background: @aluminium-5 !important;
+            border-right: none !important;
+        }
+
+        .top-nav a,
+        .topsearch a#advanced_search,
+        #user-links a {
+            color: @aluminium-1 !important;
+        }
+    }
+
+    .markdown-body {
+        code, tt {
+            background-color: @aluminium-5 !important;
+            border: none !important;
+            color: @aluminium-1 !important;
+            font-family: @monospace-font !important;
+        }
+    }
+
+    .minibutton.dark-grey {
+        backgrond: @aluminium-6 !important;
+    }
+
+    .news {
+        .alert {
+            border-top: none !important;
+
+            .branch-info,
+            .pull-info {
+                background: @aluminium-5 !important;
+                color: @aluminium-1 !important;
+            }
+
+            .gravatar {
+                background: none !important;
+            }
+
+            .simple .title {
+                color: @aluminium-1 !important;
+            }
+        }
+
+        .commits li img {
+            background: none !important;
+        }
+
+        blockquote {
+            color: @aluminium-1 !important;
+        }
+    }
+
+    .pagehead .container > ul.tabs {
+        background: @aluminium-6 !important;
+        border: none !important;
+
+        li a {
+            text-shadow: none !important;
+            border: none !important;
+
+            &:hover,
+            &.selected {
+                background: @aluminium-5 !important;
+            }
+        }
+    }
+
+    .pagehead-actions a.feed {
+        background: @aluminium-5 !important;
+        border: none !important;
+    }
+
+    .pagination {
+        background: @aluminium-6 !important;
+        border: none !important;
+
+        a {
+            text-shadow: none !important;
+            border-bottom: none !important;
+
+            &:hover {
+                background: @aluminium-5 !important;
+            }
+        }
+    }
+
+    a {
+        color: @orange-1 !important;
+
+        &:visited {
+            color: @plum-1 !important;
+        }
+
+        &.header-logo-blacktocat {
+            &, &:visited {
+                color: @aluminium-1 !important;
+            }
+        }
+    }
+
+    body {
+        background-color: @background !important;
+        color: @aluminium-1 !important;
+    }
+}
diff --git a/.conkerorrc/styles/help.css b/.conkerorrc/styles/help.css
deleted file mode 100644
index 03888b6..0000000
--- a/.conkerorrc/styles/help.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@-moz-document url(chrome://conkeror-help/content/help.html) {
-    body {
-        background: #111113 !important;
-        color: #eeeeec !important;
-    }
-
-    a {
-        color: #ffbb56 !important;
-    }
-
-    a:visited {
-        color: #ee82ee !important;
-    }
-
-    pre, .key {
-        background: #222224 !important;
-        font-family: "Envy Code R" !important;
-    }
-}
diff --git a/.conkerorrc/styles/help.less b/.conkerorrc/styles/help.less
new file mode 100644
index 0000000..339d7fa
--- /dev/null
+++ b/.conkerorrc/styles/help.less
@@ -0,0 +1,21 @@
+@import "base";
+
+@-moz-document url("chrome://conkeror-help/content/help.html") {
+    body {
+        background: @background !important;
+        color: @aluminium-1 !important;
+    }
+
+    a {
+        color: @orange-1 !important;
+
+        &:visited {
+            color: @plum-1 !important;
+        }
+    }
+
+    pre, .key {
+        background: @aluminium-5 !important;
+        font-family: @monospace-font !important;
+    }
+}
diff --git a/.conkerorrc/styles/tango.less b/.conkerorrc/styles/tango.less
new file mode 100644
index 0000000..ed6858b
--- /dev/null
+++ b/.conkerorrc/styles/tango.less
@@ -0,0 +1,27 @@
+@butter-1: #fce94f;
+@butter-2: #edd400;
+@butter-3: #c4a000;
+@orange-1: #fcaf3e;
+@orange-2: #f57900;
+@orange-3: #ce5c00;
+@chocolate-1: #e9b96e;
+@chocolate-2: #c17d11;
+@chocolate-3: #8f5902;
+@chameleon-1: #8ae234;
+@chameleon-2: #73d216;
+@chameleon-3: #4e9a06;
+@sky-blue-1: #729fcf;
+@sky-blue-2: #3465a4;
+@sky-blue-3: #204a87;
+@plum-1: #ad7fa8;
+@plum-2: #75507b;
+@plum-3: #5c3566;
+@scarlet-red-1: #ef2929;
+@scarlet-red-2: #cc0000;
+@scarlet-red-3: #a40000;
+@aluminium-1: #eeeeec;
+@aluminium-2: #d3d7cf;
+@aluminium-3: #babdb6;
+@aluminium-4: #888a85;
+@aluminium-5: #555753;
+@aluminium-6: #2e3436;
diff --git a/.conkerorrc/themes/Makefile b/.conkerorrc/themes/Makefile
index a88d833..adb917a 100644
--- a/.conkerorrc/themes/Makefile
+++ b/.conkerorrc/themes/Makefile
@@ -1,4 +1,4 @@
 DESTDIR:=$(DESTDIR)/themes
-modules=naquadah
+modules=naquadah yoshi
 
 include ../../dotfiles.mk
diff --git a/.conkerorrc/themes/yoshi/Makefile b/.conkerorrc/themes/yoshi/Makefile
new file mode 100644
index 0000000..158dade
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/Makefile
@@ -0,0 +1,5 @@
+DESTDIR:=$(DESTDIR)/yoshi
+objects=conkeror--scrollbars.css hints--url-panel.css minibuffer.css \
+	mode-line.css new-tabs.css tab-bar.css theme.json
+
+include ../../../dotfiles.mk
diff --git a/.conkerorrc/themes/yoshi/conkeror--scrollbars.css b/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
new file mode 100644
index 0000000..0f70e96
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
@@ -0,0 +1,36 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* The "background" behind the scrolling part of the scrollbar. */
+scrollbar {
+    background-color: #222;
+}
+
+/* corner between horizontal and vertical scrollbars */
+scrollcorner {
+    background-color: black;
+}
+
+/* The scroll up/down buttons. */
+scrollbarbutton {
+    background-color: #666;
+}
+
+/* The actual scrolling part of the scrollbar. */
+thumb {
+    background-color: #666;
+}
+
+thumb, scrollbarbutton {
+    -moz-border-bottom-colors: #000 #333;
+    -moz-border-left-colors: #aaa #888;
+    -moz-border-right-colors: #000 #333;
+    -moz-border-top-colors: #aaa #888;
+}
+
+scrollbarbutton:hover:active, scrollbarbutton[active="true"] {
+    -moz-border-bottom-colors: #aaa #888;
+    -moz-border-left-colors: #000 #333;
+    -moz-border-right-colors: #aaa #888;
+    -moz-border-top-colors: #000 #333;
+}
diff --git a/.conkerorrc/themes/yoshi/hints--url-panel.css b/.conkerorrc/themes/yoshi/hints--url-panel.css
new file mode 100644
index 0000000..143f3c1
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/hints--url-panel.css
@@ -0,0 +1,17 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.panel {
+  border-top: 4px double #333333;
+  color: white;
+  background-color: black;
+}
+
+.panel .panel-row-label {
+  font-weight: bold;
+}
+
+.panel .url-panel-label {
+  font-weight: bold;
+}
+
diff --git a/.conkerorrc/themes/yoshi/minibuffer.css b/.conkerorrc/themes/yoshi/minibuffer.css
new file mode 100644
index 0000000..12ca4e8
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/minibuffer.css
@@ -0,0 +1,49 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#minibuffer {
+    background-color: #111113;
+    border: none;
+    color: #EEEEEC;
+    font: 16px "Envy Code R";
+}
+
+#minibuffer-input, #minibuffer-input * {
+    color: #EEEEEC;
+}
+
+#minibuffer-prompt {
+    color: #EEEEEC;
+}
+
+/* Completions display */
+
+tree.completions treechildren { border: none !important; }
+
+tree.completions treecol { -moz-binding: none !important; }
+tree.completions {
+  -moz-appearance: none !important;
+  border: 0px none !important;
+  background-color: #111113 !important;
+  -moz-border-top-colors: -moz-initial !important;
+  color: #EEEEEC !important;
+  font: 18px "Envy Code R";
+}
+
+tree.completions treechildren::-moz-tree-row {
+  background-color: #111113 !important;
+  border: none;
+}
+
+tree.completions treechildren::-moz-tree-row(current) {
+  background-color: #536580 !important;
+  color: #EEEEEC;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(completion-description) {
+  color: #b8ffa6 !important;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(current) {
+  color: #EEEEEC !important;
+}
diff --git a/.conkerorrc/themes/yoshi/mode-line.css b/.conkerorrc/themes/yoshi/mode-line.css
new file mode 100644
index 0000000..31aabd7
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/mode-line.css
@@ -0,0 +1,11 @@
+.mode-line {
+    font: 16px "Envy Code R";
+    padding: 0px;
+    border: none;
+    color: #EEEEEC;
+    background-color: #222224;
+}
+
+.mode-line label {
+    color: #EEEEEC;
+}
diff --git a/.conkerorrc/themes/yoshi/new-tabs.css b/.conkerorrc/themes/yoshi/new-tabs.css
new file mode 100644
index 0000000..f5d30c0
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/new-tabs.css
@@ -0,0 +1,54 @@
+#tab2-bar {
+    background: #222;
+}
+
+.tab2 {
+    margin: 2px 0px 0px 2px;
+    padding: 0px;
+    height: 22px;
+    border-width: 2px;
+    border-bottom-width: 0;
+    border-style: solid;
+    -moz-border-radius: 3px 3px 0 0;
+    -moz-border-left-colors: #888 #555;
+    -moz-border-right-colors: #000 #171717;
+    -moz-border-top-colors: #888 #555;
+    background: #333;
+    min-width: 200px;
+    max-width: 200px;
+    overflow: hidden; /* Chops end of label */
+}
+
+.tab2[selected=true] {
+    -moz-border-left-colors: #aaa #888;
+    -moz-border-right-colors: #000 #333;
+    -moz-border-top-colors: #aaa #888;
+    background: #666;
+}
+
+.tab2:hover {
+    -moz-border-left-colors: #eee #bbb;
+    -moz-border-right-colors: #333 #666;
+    -moz-border-top-colors: #eee #bbb;
+    background: #999;
+}
+
+.tab2-label {
+    margin-left: 4px;
+    padding-top: 1px;
+    color: #fff;
+    font: 11px Tahoma;
+}
+
+.tab2-icon {
+    margin: 1px !important;
+    padding: 1px;
+    width: 20px;
+    height: 15px;
+    max-height: 15px;
+    -moz-border-radius: 1px;
+    background: black;
+    color: white;
+    font: 900 11px Tahoma;
+    text-align: center;
+}
diff --git a/.conkerorrc/themes/yoshi/tab-bar.css b/.conkerorrc/themes/yoshi/tab-bar.css
new file mode 100644
index 0000000..c451778
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/tab-bar.css
@@ -0,0 +1,41 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* TABS */
+#tab2-bar {
+    background: #000;
+}
+
+#tab2-bar .tab2 {
+    margin: 0;
+    padding: 0;
+    border: none;
+    /*height: 19px;
+    border: 1px solid #666;
+    min-width: 200px;
+    max-width: 200px;*/
+    background: #333;
+    overflow: hidden;
+}
+
+#tab2-bar .tab2-label {
+    margin: 0;
+    color: white;
+    font: 11px Tahoma;
+}
+
+#tab2-bar .tab2-icon {
+    height: 16px;
+    width: 16px;
+    background: #222;
+    color: white;
+    border: 1px solid #999;
+    font: 900 11px Tahoma;
+    text-align: center;
+}
+
+#tab2-bar .tab2[selected=true] {
+    border: 1px solid white;
+    background: #666;
+    border: 1px solid #999;
+}
diff --git a/.conkerorrc/themes/yoshi/theme.json b/.conkerorrc/themes/yoshi/theme.json
new file mode 100644
index 0000000..bb74ee1
--- /dev/null
+++ b/.conkerorrc/themes/yoshi/theme.json
@@ -0,0 +1,9 @@
+{ "sheets" : [
+    "conkeror--scrollbars.css",
+    "new-tabs.css",
+    "minibuffer.css",
+    "mode-line.css",
+    "hints--url-panel.css",
+    "tab-bar.css"
+  ]
+}