ryuslash/legacy-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into phoenix

Browse source
This commit is contained in:
Tom Willemsen 2012-11-15 00:13:38 +01:00
commit 258cda86ca
2 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
.conkerorrc/init.js
View file

@ -1,6 +1,8 @@
require("content-policy.js"); require("content-policy.js");
require("favicon"); require("favicon");
var linkwave_program = "/home/slash/var/src/linkwave/src/linkwave";
theme_load_paths.push("/home/slash/.conkerorrc/themes/"); theme_load_paths.push("/home/slash/.conkerorrc/themes/");
define_browser_object_class( define_browser_object_class(
@ -43,17 +45,21 @@ function oni_linkwave_add(I) {
check_buffer(I.buffer, content_buffer); check_buffer(I.buffer, content_buffer);
let url = let url =
load_spec_uri_string(load_spec(I.buffer.top_frame)); load_spec_uri_string(load_spec(I.buffer.top_frame));
let title = escape(yield I.minibuffer.read( let title = yield I.minibuffer.read(
$prompt = "name (required): ", $prompt = "name (required): ",
$initial_value = I.buffer.title)); $initial_value = I.buffer.title);
let tags = escape(yield I.minibuffer.read( // let tags = escape(yield I.minibuffer.read(
$prompt = "tags (space delimited): ")); // $prompt = "tags (space delimited): "));
let description = escape(yield I.minibuffer.read( let description = yield I.minibuffer.read(
$prompt = "extended description: ")); $prompt = "extended description: ");
let command = let command = linkwave_program + ' "' + url + '" "' + title + '" "'
'/home/slash/development/projects/linkwave/src/linkwave "' + description + '"';
+ url + '" "' + title + '" "' + description + '"'; let result = yield shell_command(command);
I.window.minibuffer.message(command);
if (!result)
I.window.minibuffer.message('Added to linkwave');
else
I.window.minibuffer.message('Couldn\'t add to linkwave');
} }
interactive("linkwave-add", "Bookmark the page in linkwave", interactive("linkwave-add", "Bookmark the page in linkwave",
oni_linkwave_add); oni_linkwave_add);
@ -63,16 +69,15 @@ function oni_linkwave_add_link(I) {
let url = load_spec_uri_string( let url = load_spec_uri_string(
load_spec(encodeURIComponent(bo))); load_spec(encodeURIComponent(bo)));
check_buffer(I.buffer, content_buffer); check_buffer(I.buffer, content_buffer);
let title = escape(yield I.minibuffer.read( let title = yield I.minibuffer.read(
$prompt = "name (required): ", $prompt = "name (required): ",
$initial_value = bo.textContent)); $initial_value = bo.textContent);
let tags = escape(yield I.minibuffer.read( // let tags = escape(yield I.minibuffer.read(
$prompt = "tags (space delimited): ")); // $prompt = "tags (space delimited): "));
let description = escape(yield I.minibuffer.read( let description = yield I.minibuffer.read(
$prompt = "extended description: ")); $prompt = "extended description: ");
let command = let command = linkwave_program + ' "' + url + '" "' + title + '" "'
'/home/slash/development/projects/linkwave/src/linkwave "' + description + '"';
+ url + '" "' + title + '" "' + description + '"';
let result = yield shell_command(command); let result = yield shell_command(command);
if (!result) if (!result)

6
.xinitrc
View file

@ -9,12 +9,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
unset f unset f
fi fi
pidof mpdscribble >& /dev/null
if [ $? -ne 0 ]
then
mpdscribble &
fi
emacs --daemon & emacs --daemon &
fehlstart & fehlstart &