Merge branch 'master' of tardis:/dotfiles

diff --git a/Xmodmap_chronos b/Xmodmap_chronos
index e3565118bdddc2e63e4c95746f4ad101638a111a..73f2cadb8d2a2caa314d24cd08ea5f14f4dc9d09 100644 (file)
--- a/Xmodmap_chronos
+++ b/Xmodmap_chronos
@@ -1,13 +1,16 @@
 ! remap Caps_Lock as Escape
-remove Lock = Caps_Lock
-keysym Caps_Lock = Escape
+clear Lock
+keycode 66 = Escape NoSymbol Escape
 
-! switch Alt_L and Super_L
-remove Mod4 = Super_L
-remove Mod1 = Alt_L
-add Mod1 = Super_L
-add Mod4 = Alt_L
+! move around some keys
+keycode 64 = Super_L Super_L Super_L Super_L
+keycode 108 = Super_R Super_R Super_R Super_R
+keycode 133 = Alt_L Alt_L Alt_L Alt_L
+keycode 135 = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift
 
-! Alt_R as 3rd level chooser
-remove Mod1 = Alt_R
-add Mod5 = Alt_R
+clear Mod1
+clear Mod4
+add Mod1 = Alt_L
+add Mod4 = Super_L Super_R
+
+! vim: syntax=xmodmap

diff --git a/bin/whatsmyip b/bin/whatsmyip
index a441b43edd57b5356cf4ef11f87c2ae17d1b4aeb..4b6d0800bb0df96c898751002118816e9b2abe7a 100755 (executable)
--- a/bin/whatsmyip
+++ b/bin/whatsmyip
@@ -1,3 +1,4 @@
 #!/bin/bash
 # only works behind DD-WRT router
-ssh root@192.168.1.3 -p 2222 -q "nvram get wan_ipaddr"
+#ssh root@192.168.1.3 -p 2222 -q "nvram get wan_ipaddr"
+curl ifconfig.me/ip