several small things, mostly track .conkerorrc

5 files changed, 93 insertions, 25 deletions

diff --git a/.bashrc b/.bashrc
index 9192d66..c4e4c64 100644
--- a/.bashrc
+++ b/.bashrc
@@ -38,8 +38,7 @@ esac
 # set a fancy prompt (non-color, unless we know we "want" color)
 case "$TERM" in
     linux)       color_prompt=yes;;
-    *-color*)    color_prompt=yes;;
-    *-256color*) color_prompt=yes;;
+    *-*color*)   color_prompt=yes;;
 esac
 
 # uncomment for a colored prompt, if the terminal has the capability; turned
diff --git a/.conkerorrc b/.conkerorrc
new file mode 100644
index 0000000..e33add1
--- /dev/null
+++ b/.conkerorrc
@@ -0,0 +1,55 @@
+/* -*- Mode: js -*- */
+session_pref("signon.rememberSignons", true);
+session_pref("signon.expireMasterPassword", false);
+session_pref("signon.SignonFileName", "signons.txt");
+
+define_webjump("ddg", "https://duckduckgo.com/?q=%s");
+
+// Load login manager
+Components.classes["@mozilla.org/login-manager;1"].getService(Components.interfaces.nsILoginManager);
+
+// Auto complete stuff
+minibuffer_auto_complete_default = true;
+url_completion_use_history = true; // should work since bf05c87405
+url_completion_use_bookmarks = true;
+
+// Prompt before closing
+//define_key(content_buffer_normal_keymap, "C-x C-c", "confirm-quit");
+//can_kill_last_buffer = false;
+
+// Workaround for scrollbar bug (issue351)
+add_hook("create_buffer_late_hook",
+         function (buffer) {
+             buffer.top_frame.scrollbars.visible = true;
+         });
+
+// load session module
+require("session.js");
+session_auto_save_auto_load = true; // auto-load session
+
+// Don't show a clock in the modeline
+remove_hook("mode_line_hook", mode_line_adder(clock_widget));
+
+// Add favicons to the modeline
+require("favicon");
+add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget), true);
+read_buffer_show_icons = true;
+
+// load firebug lite
+define_variable("firebug_url",
+    "https://getfirebug.com/firebug-lite.js");
+
+function firebug (I) {
+    var doc = I.buffer.document;
+    var script = doc.createElement('script');
+    script.setAttribute('type', 'text/javascript');
+    script.setAttribute('src', firebug_url);
+    script.setAttribute('onload', 'firebug.init();');
+    doc.body.appendChild(script);
+}
+interactive("firebug", "open firebug lite", firebug);
+
+// Make middle-click open links in a new buffer
+require("clicks-in-new-buffer.js");
+clicks_in_new_buffer_target = OPEN_NEW_BUFFER_BACKGROUND; 
+clicks_in_new_buffer_button = 1;
diff --git a/.git.info.exclude b/.git.info.exclude
index d57169f..35e6e7e 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -76,6 +76,7 @@ history.*
 .prefix
 .offlineimap
 .crontab.local
+.xmodmap
 .elmo
 .ido.last
 .bogofilter/*
diff --git a/.gitconfig b/.gitconfig
index b5992f8..86f8b1e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,5 @@
 [user]
 	name = Luke Shumaker
 	email = LukeShu@sbcglobal.net
+[color]
+	ui = auto
diff --git a/.wmii/wmiirc_local b/.wmii/wmiirc_local
index 07d4544..4b0330e 100755
--- a/.wmii/wmiirc_local
+++ b/.wmii/wmiirc_local
@@ -1,26 +1,37 @@
-#!/bin/dash
+#!/bin/dash -f
+# -*- mode: sh; -*-
 
-export WMII_FONT='xft:Monospace-8'
-#export WMII_TERM="urxvt"
-export WMII_TERM="emacsterm"
+# wmiirc file for my HP Pavilion dv6426us laptop
 
-. $HOME/.wmii/wmiirc_local.local
-. $HOME/.wmii/wmiirc_solarized_dark
+MODKEY=Mod4
 
-# Use Emacs keybindings, not VI
-UP=p
-DOWN=n
-LEFT=b
-RIGHT=f
-
-local_events() {
-	cat <<'!'
-Menu Client-3-Delete-(kill)
-	wmiir xwrite /client/$1/ctl kill
-Menu Client-3-Kill-(slay)
-	wmiir xwrite /client/$1/ctl slay
-KeyGroup Client actions
-Key $MODKEY-x-1 # Toggle selected client's fullscreen state
-	wmiir xwrite /client/sel/ctl Fullscreen toggle
-!
-}
\ No newline at end of file
+status() {
+	buffer=$(
+	echo -n ' '
+	# Wifi status
+	echo -n 'Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality)
+	
+	echo -n ' | '
+	
+	# Battery charge (not status)
+	echo -n $(acpi -b | sed 's/.*, \{0,2\}\([0-9]\{1,3\}%\),.*/Bat: \1/')
+	
+	echo -n ' | '
+	# CPU
+	# This doesn't work for me, it shows capacity
+	#echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')
+	# This actually displays %idle
+	echo -n 'CPU: [ '$(tail -n3 ~/tmp/cputime|sed -u 's/  */\t/g'|cut -f3,12|sed 's/\t\(.*\)/(\1)/')' ]'
+	
+	#echo -n ' | '
+	
+	#echo -n $(uptime | sed 's/.*://; s/,//g')
+	
+	echo -n ' | '
+	
+	echo -n $(date) 
+	
+	echo -n ' '
+	)
+	echo "$buffer"
+}