updated dir names and ranger keybindings

4 files changed, 18 insertions, 89 deletions

diff --git a/.bashrc b/.bashrc
index fd9b8ee..c9c0d01 100644
--- a/.bashrc
+++ b/.bashrc
@@ -17,6 +17,7 @@ shopt -s checkwinsize
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias diff='colordiff'
+alias less='less -R'
 
 PS1='[\u@\h \W]\$ '
 PS2='> '
@@ -35,3 +36,4 @@ esac
 [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
 
 export EDITOR="vim"
+export PAGER="less -R"
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index bb81982..a7f4363 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -79,91 +79,12 @@ for s = 1, screen.count() do
 end
 -- }}}
 
--- {{{ Menu
--- Create a laucher widget and a main menu
-myawesomemenu = {
-   { "manual", terminal .. " -e man awesome" },
-   { "restart", awesome.restart },
-   { "reboot", "reboot" },
-   { "poweroff", "poweroff" },
-   { "logout", "mate-session-save --logout" },
-}
-
-myinternetmenu = {
+mymainmenu = awful.menu({ items = { 
 	{ "firefox", "firefox", "/home/shmibs/.icons/FaenzaWolfe/apps/16/firefox.png" },
-	{ "tor", "/home/shmibs/stuffs/tor/start-tor-browser" },
+	{ "tor", "/home/shmibs/stuffs/tor/start-tor-browser", ".icons/NITRUX-Buttons/apps/16/vidalia.png" },
 	{ "qtransmission", "transmission-qt", "/home/shmibs/.icons/FaenzaWolfe/apps/16/transmission.png" },
-	{ "qtscrobbler", "qtscrobbler", "/home/shmibs/.icons/FaenzaWolfe/apps/16/lastfm.png" },
-	{ "midori", "midori", "/home/shmibs/.icons/FaenzaWolfe/apps/16/midori.png" },
-	{ "pidgin", "pidgin", "/home/shmibs/.icons/FaenzaWolfe/apps/16/pidgin.png" },
-}
-
--- {{ game menus
-
-myongamesmenu = {
-	{ "SleepIsDeath", "/home/shmibs/Games/SleepIsDeath_v16_UnixSource/run.sh", "/home/shmibs/Games/SleepIsDeath_v16_UnixSource/sleepisdeath.png" },
-}
-
-myplgamesmenu = {
-}
-
-mysisgamesmenu = {
-}
-
-myemgamesmenu = {
-	{ "M64Py", "m64py", "/home/shmibs/icons/mupen64plus.png" },
-	{ "mednafen", "mfe", "/home/shmibs/icons/mednafen.png" },
-	{ "snes9x", "snes9x-gtk", "/usr/share/icons/hicolor/16x16/apps/snes9x.png" },
-}
-
-mystgamesmenu = {
-	{ "MCDroid", "/home/shmibs/Games/desura/common/mcdroid/desura_launch_Play.sh" },
-}
-
-myargamesmenu = {
-	{ "voxatron", "voxatron" },
-	{ "Jamestown", "jamesown" },
-	{ "VVVVVV", "vvvvvv" },
-	{ "Steel Storm", "/home/shmibs/Games/desura/common/steel-storm/desura_launch_Play.sh" },
-}
-
-mypggamesmenu = {
-	{ "DoD", "/home/shmibs/Games/desura/common/dungeons-of-dredmor/desura_launch_Play.sh" },
-	{ "Minecraft", "java -jar /home/shmibs/Games/minecraft/minecraft.jar" },
-	{ "Dwarf Fortress", "dwarffortress" },
-}
-
-myadgamesmenu = {
-	{ "The Neverhood", "/usr/share/playonlinux/playonlinux --run \"The Neverhood\" %F" },
-	{ "Bastion", "bastion" },
-	{ "Fallout", "/home/shmibs/Games/desura/common/fallout/desura_launch_Play.sh" },
-}
-
-mypzgamesmenu = {
-	{ "Night Sky", "nightsky-game" },
-	{ "splice", "splice-hib" },
-}
-
-mygamesmenu = {
-	{ "Online", myongamesmenu },
-	{ "Platforming", myplgamesmenu },
-	{ "Simulation", mysigamesmenu },
-	{ "Emu", myemgamesmenu },
-	{ "Strategy", mystgamesmenu },
-	{ "Arcade", myargamesmenu },
-	{ "Proc-Gen", mypggamesmenu },
-	{ "Adventure", myadgamesmenu },
-	{ "Puzzle", mypzgamesmenu },
-	{ "desura", "/home/shmibs/Games/desura/desura" },
-	{ "desura -f", "/home/shmibs/Games/desura/desura -f" },
-	{ "playonlinux", "playonlinux" },
-}
-
--- }}
-
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, "/home/shmibs/.icons/FaenzaWolfe/places/22/distributor-logo-archlinux.png" },
-                                    { "internet", myinternetmenu, "/home/shmibs/.icons/FaenzaWolfe/categories/16/applications-internet.png" },
-                                    { "games", mygamesmenu, "/home/shmibs/.icons/FaenzaWolfe/categories/16/applications-games.png" }
+	{ "desura", "/home/shmibs/Games/desura/desura", "/home/shmibs/.icons/Faenza/apps/16/desura.png" },
+	{ "playonlinux", "playonlinux", "/home/shmibs/.icons/FaenzaWolfe/apps/16/playonlinux.png" },
                                   }
                         })
 
@@ -411,13 +332,13 @@ globalkeys = awful.util.table.join(
     awful.key({modkey, "Shift", "Control" }, "s"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Desktop\"") end),
     awful.key({modkey, "Shift", "Control" }, "m"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Music\"") end),
     awful.key({modkey, "Shift", "Control" }, "g"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Games\"") end),
-    awful.key({modkey, "Shift", "Control" }, "p"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/projects\"") end),
+    awful.key({modkey, "Shift", "Control" }, "p"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Projects\"") end),
     awful.key({modkey, "Shift", "Control" }, "r"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/ROMz\"") end),
-    awful.key({modkey, "Shift", "Control" }, "c"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/comics\"") end),
-    awful.key({modkey, "Shift", "Control" }, "o"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/iso\"") end),
+    awful.key({modkey, "Shift", "Control" }, "c"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Comics\"") end),
+    awful.key({modkey, "Shift", "Control" }, "k"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Disks\"") end),
     awful.key({modkey, "Shift", "Control" }, "i"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Images\"") end),
-    awful.key({modkey, "Shift", "Control" }, "b"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/backdrops\"") end),
-    awful.key({modkey, "Shift", "Control" }, "t"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/thcool\"") end),
+    awful.key({modkey, "Shift", "Control" }, "b"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Backdrops\"") end),
+    awful.key({modkey, "Shift", "Control" }, "t"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Thcool\"") end),
     awful.key({modkey, "Shift", "Control" }, "v"      , function () awful.util.spawn_with_shell(terminal .. " -t ranger -e \"ranger /home/shmibs/Videos\"") end),
 
     -- focus and swap by direction.
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index 20f9ea3..d8a94ac 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -210,6 +210,7 @@ map ;  console
 map !  console shell 
 map @  console -p6 shell  %%s
 map #  console shell -p 
+map l  console shell -p
 map s  console shell 
 map r  chain draw_possible_programs; console open_with 
 map f  console find 
@@ -340,7 +341,9 @@ map cm search_next order=mtime
 map ca search_next order=atime
 
 # Tabs
-map <C-n>     tab_new ~
+map <C-t>     tab_new ~
+map <C-n>     tab_move 1
+map <C-p>     tab_move -1
 map <C-w>     tab_close
 map <TAB>     tab_move 1
 map <S-TAB>   tab_move -1
diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf
index e7fed6b..d3c9388 100644
--- a/.config/ranger/rifle.conf
+++ b/.config/ranger/rifle.conf
@@ -161,12 +161,15 @@ ext djvu, has evince, X, flag f = evince -- "$@"
 # Archives
 #-------------------------------------------
 # This requires atool
+ext cbr|cbz,                                         has mcomix, X, flag f   = mcomix -- "$@"
 ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has als                 = als -- "$@" | "$PAGER"
 ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has als                 = als -- "$@" | "$PAGER"
 ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has aunpack             = aunpack -- "$@"
 ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has aunpack             = aunpack -- "$@"
 ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has engrampa, X, flag f = engrampa -- "$@"
 ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has engrampa, X, flag f = engrampa -- "$@"
+ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has mcomix, X, flag f   = mcomix -- "$@"
+ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has mcomix, X, flag f   = mcomix -- "$@"
 
 # Fallback:
 ext tar|gz, has tar = tar vvtf "$@" | "$PAGER"