diff options
author | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
---|---|---|
committer | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
commit | 55ca176cd5022d2fc35bc2c06d5f9a764315f238 (patch) | |
tree | 3ee9e0df6dced4282af9116a8c93d888e30b7213 /.conkerorrc/init.js | |
parent | caf0ec0fb16b3f911d5d596766ee3048fe07fa66 (diff) | |
parent | 9ab70194a65f1d7ab726aaacdb43a58a02a048b6 (diff) | |
download | dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.tar.gz dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.zip |
Merge remote-tracking branch 'ryuslash/drd' into phoenix
Conflicts:
.config/herbstluftwm/autostart
.emacs.d/init.el
.xinitrc
.zprofile
Makefile
xmonad/xmonad.hs
Diffstat (limited to '.conkerorrc/init.js')
-rw-r--r-- | .conkerorrc/init.js | 28 |
1 files changed, 16 insertions, 12 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"); |