summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2012-03-13 19:34:44 +0100
committerGravatar Tom Willemsen2012-03-13 19:34:44 +0100
commit1fe74dd7260402df854aab2fd388b9af74afcc45 (patch)
treea6562b03c9af3cae962141cc2991dd0e42893e9f
parent20d500539d1a47811189ebf60381b07ec6be516e (diff)
parent2019a6f2446894a5e9ee511bd70717a6018f6798 (diff)
downloaddotfiles-1fe74dd7260402df854aab2fd388b9af74afcc45.tar.gz
dotfiles-1fe74dd7260402df854aab2fd388b9af74afcc45.zip
Merge remote-tracking branch 'refs/remotes/github/master' into phoenix
-rw-r--r--.Xdefaults4
-rw-r--r--.config/cower/config3
-rw-r--r--.conkerorrc/settings.js3
3 files changed, 7 insertions, 3 deletions
diff --git a/.Xdefaults b/.Xdefaults
index f790070..693a10f 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -61,8 +61,8 @@ urxvt*urlLauncher: firefox
urxvt*matcher.button: 1
! Appearance
-urxvt.font: xft:DejaVu Sans Mono:weight=medium:pixelsize=13
-urxvt.boldFont: xft:DejaVu Sans Mono:weight=black:pixelsize=13
+urxvt.font: xft:DejaVu Sans Mono:weight=medium:pixelsize=15
+urxvt.boldFont: xft:DejaVu Sans Mono:weight=black:pixelsize=15
urxvt.transparent: true
xterm*faceName: -misc-tamsyn-medium-r-normal-*-17-*-*-*-*-*-iso8859-*
diff --git a/.config/cower/config b/.config/cower/config
new file mode 100644
index 0000000..dfe376b
--- /dev/null
+++ b/.config/cower/config
@@ -0,0 +1,3 @@
+# -*- eval: (git-auto-commit-mode 1) -*-
+Color = always
+TargetDir = /home/slash/var/aur/
diff --git a/.conkerorrc/settings.js b/.conkerorrc/settings.js
index b9f4ad6..0c74f0f 100644
--- a/.conkerorrc/settings.js
+++ b/.conkerorrc/settings.js
@@ -2,7 +2,8 @@
cwd = make_file("/home/slash/downloads/");
url_remoting_fn = load_url_in_new_buffer;
read_buffer_show_icons = true;
-hints_display_url_panel = true;
+
+hints_minibuffer_annotation_mode(true);
add_hook("before_quit_hook",
function () {