Some more ranger settings

7 files changed, 39 insertions, 103 deletions

diff --git a/archlinux.pkgs b/archlinux.pkgs
index 577b967..2728851 100644
--- a/archlinux.pkgs
+++ b/archlinux.pkgs
@@ -24,8 +24,9 @@ bc
 pv
 sysstat
 
-dnl We want ranger everywhere
+dnl I want ranger everywhere
 include(ranger)
+mpv
 
 dnl System stuff
 dhcpcd-openrc
@@ -48,6 +49,7 @@ dnl archive
 unzip
 zip
 rar
+p7zip
 
 dnl Base group
 syscmd(`pacman -Qg base | awk "{print \$2}"')
diff --git a/archlinux.pkgs.d/cynerd-laptop b/archlinux.pkgs.d/cynerd-laptop
index 85b9e7e..49305e1 100644
--- a/archlinux.pkgs.d/cynerd-laptop
+++ b/archlinux.pkgs.d/cynerd-laptop
@@ -12,6 +12,9 @@ easy-rsa
 freecad
 transmission-gtk
 qemu-arch-extra
+octave
+
+lighttpd
 
 dnl for testing
 stress
diff --git a/archlinux.pkgs.d/desktop b/archlinux.pkgs.d/desktop
index 8efbff6..bf2909c 100644
--- a/archlinux.pkgs.d/desktop
+++ b/archlinux.pkgs.d/desktop
@@ -96,6 +96,8 @@ dnl Codecs
 x264
 mpg123
 lib32-mpg123
+gst-libav
+lib32-gst-plugins-base-libs
 
 dnl Matlab fix
 ncurses5-compat-libs
diff --git a/archlinux.pkgs.d/ranger b/archlinux.pkgs.d/ranger
index 2de9219..d4aee2e 100644
--- a/archlinux.pkgs.d/ranger
+++ b/archlinux.pkgs.d/ranger
@@ -8,3 +8,5 @@ highlight
 mediainfo
 perl-image-exiftool
 w3m
+catdoc
+fbida
diff --git a/config/ranger/rc.conf b/config/ranger/rc.conf
index b2965cd..61bdfd4 100644
--- a/config/ranger/rc.conf
+++ b/config/ranger/rc.conf
@@ -49,7 +49,7 @@ set automatically_count_files true
 set open_all_images true
 
 # Be aware of version control systems and display information.
-set vcs_aware false
+set vcs_aware true
 
 # State of the three backends git, hg, bzr. The possible states are
 # disabled, local (only show local info), enabled (show local and remote
@@ -59,7 +59,7 @@ set vcs_backend_hg disabled
 set vcs_backend_bzr disabled
 
 # Use one of the supported image preview protocols
-set preview_images false
+set preview_images true
 
 # Set the preview image method. Supported methods:
 #
@@ -75,7 +75,7 @@ set preview_images false
 set preview_images_method w3m
 
 # Use a unicode "..." character to mark cut-off filenames?
-set unicode_ellipsis false
+set unicode_ellipsis true
 
 # Show dotfiles in the bookmark preview box?
 set show_hidden_bookmarks true
@@ -88,7 +88,7 @@ set colorscheme default
 # And collapse (shrink) the last column if there is nothing to preview?
 set preview_files true
 set preview_directories true
-set collapse_preview true
+set collapse_preview false
 
 # Save the console history on exit?
 set save_console_history true
@@ -104,7 +104,7 @@ set draw_progress_bar_in_status_bar true
 set draw_borders false
 
 # Display the directory name in tabs?
-set dirname_in_tabs false
+set dirname_in_tabs true
 
 # Enable the mouse support?
 set mouse_enabled true
@@ -117,17 +117,17 @@ set display_size_in_status_bar true
 set display_tags_in_all_columns true
 
 # Set a title for the window?
-set update_title false
+set update_title true
 
 # Set the title to "ranger" in the tmux program?
 set update_tmux_title false
 
 # Shorten the title if it gets long?  The number defines how many
 # directories are displayed at once, 0 turns off this feature.
-set shorten_title 3
+set shorten_title 6
 
 # Abbreviate $HOME with ~ in the titlebar (first line) of ranger?
-set tilde_in_titlebar false
+set tilde_in_titlebar true
 
 # How many directory-changes or console-commands should be kept in history?
 set max_history_size 20
@@ -196,8 +196,7 @@ set metadata_deep_search false
 # ===================================================================
 # You can set local options that only affect a single directory.
 
-# Examples:
-# setlocal path=~/downloads sort mtime
+setlocal path=~/downloads sort mtime
 
 # ===================================================================
 # == Command Aliases in the Console
diff --git a/config/ranger/rifle.conf b/config/ranger/rifle.conf
index 95e4242..3e684d8 100644
--- a/config/ranger/rifle.conf
+++ b/config/ranger/rifle.conf
@@ -49,34 +49,15 @@
 # only running the current file even if you have marked multiple files.
 
 #-------------------------------------------
+# XDG
+#-------------------------------------------
+# If we are in X use preferably xdg-open
+has xdg-open, X, flag f = xdg-open "$1"
+
+#-------------------------------------------
 # Websites
 #-------------------------------------------
-# Rarely installed browsers get higher priority; It is assumed that if you
-# install a rare browser, you probably use it.  Firefox/konqueror/w3m on the
-# other hand are often only installed as fallback browsers.
-ext x?html?, has surf,           X, flag f = surf -- file://"$1"
-ext x?html?, has vimprobable,    X, flag f = vimprobable -- "$@"
-ext x?html?, has vimprobable2,   X, flag f = vimprobable2 -- "$@"
-ext x?html?, has dwb,            X, flag f = dwb -- "$@"
-ext x?html?, has jumanji,        X, flag f = jumanji -- "$@"
-ext x?html?, has luakit,         X, flag f = luakit -- "$@"
-ext x?html?, has uzbl,           X, flag f = uzbl -- "$@"
-ext x?html?, has uzbl-tabbed,    X, flag f = uzbl-tabbed -- "$@"
-ext x?html?, has uzbl-browser,   X, flag f = uzbl-browser -- "$@"
-ext x?html?, has uzbl-core,      X, flag f = uzbl-core -- "$@"
-ext x?html?, has midori,         X, flag f = midori -- "$@"
-ext x?html?, has chromium,       X, flag f = chromium -- "$@"
-ext x?html?, has opera,          X, flag f = opera -- "$@"
-ext x?html?, has firefox,        X, flag f = firefox -- "$@"
-ext x?html?, has seamonkey,      X, flag f = seamonkey -- "$@"
-ext x?html?, has iceweasel,      X, flag f = iceweasel -- "$@"
-ext x?html?, has epiphany,       X, flag f = epiphany -- "$@"
-ext x?html?, has konqueror,      X, flag f = konqueror -- "$@"
-ext x?html?, has elinks,          terminal = elinks "$@"
-ext x?html?, has links2,          terminal = links2 "$@"
-ext x?html?, has links,           terminal = links "$@"
-ext x?html?, has lynx,            terminal = lynx -- "$@"
-ext x?html?, has w3m,             terminal = w3m "$@"
+ext x?html?, has w3m = w3m "$@"
 
 #-------------------------------------------
 # Misc
@@ -88,9 +69,6 @@ mime ^text,  label pager  = "$PAGER" -- "$@"
 !mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
 
 ext 1                         = man "$1"
-ext s[wmf]c, has zsnes, X     = zsnes "$1"
-ext s[wmf]c, has snes9x-gtk,X = snes9x-gtk "$1"
-ext nes, has fceux, X         = fceux "$1"
 ext exe                       = wine "$1"
 name ^[mM]akefile$            = make
 
@@ -107,74 +85,24 @@ ext php = php -- "$1"
 #--------------------------------------------
 # Audio without X
 #-------------------------------------------
-mime ^audio|ogg$, terminal, has mplayer  = mplayer -- "$@"
-mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@"
-mime ^audio|ogg$, terminal, has mpv      = mpv -- "$@"
-ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
-
-#--------------------------------------------
-# Video/Audio with a GUI
-#-------------------------------------------
-mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
-mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
-mime ^video,       has mpv,      X, flag f = mpv -- "$@"
-mime ^video,       has mpv,      X, flag f = mpv --fs -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -fs -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -fs -- "$@"
-mime ^video|audio, has vlc,      X, flag f = vlc -- "$@"
-mime ^video|audio, has totem,    X, flag f = totem -- "$@"
-mime ^video|audio, has totem,    X, flag f = totem --fullscreen -- "$@"
+# TODO when we have mpd launch it in it
+mime ^audio|ogg$, has mpv      = mpv -- "$@"
 
 #--------------------------------------------
 # Video without X:
 #-------------------------------------------
 mime ^video, terminal, !X, has mpv       = mpv -- "$@"
-mime ^video, terminal, !X, has mplayer2  = mplayer2 -- "$@"
-mime ^video, terminal, !X, has mplayer   = mplayer -- "$@"
 
 #-------------------------------------------
 # Documents
 #-------------------------------------------
-ext pdf, has llpp,     X, flag f = llpp "$@"
-ext pdf, has zathura,  X, flag f = zathura -- "$@"
-ext pdf, has mupdf,    X, flag f = mupdf "$@"
-ext pdf, has mupdf-x11,X, flag f = mupdf-x11 "$@"
-ext pdf, has apvlv,    X, flag f = apvlv -- "$@"
-ext pdf, has xpdf,     X, flag f = xpdf -- "$@"
-ext pdf, has evince,   X, flag f = evince -- "$@"
-ext pdf, has atril,    X, flag f = atril -- "$@"
-ext pdf, has okular,   X, flag f = okular -- "$@"
-ext pdf, has epdfview, X, flag f = epdfview -- "$@"
-ext pdf, has qpdfview, X, flag f = qpdfview "$@"
-
-ext docx?, has catdoc,       terminal = catdoc -- "$@" | "$PAGER"
-
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric,    X, flag f = gnumeric -- "$@"
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread,     X, flag f = kspread -- "$@"
-ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
-ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has soffice,     X, flag f = soffice "$@"
-ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has ooffice,     X, flag f = ooffice "$@"
-
-ext djvu, has zathura,X, flag f = zathura -- "$@"
-ext djvu, has evince, X, flag f = evince -- "$@"
-ext djvu, has atril,  X, flag f = atril -- "$@"
+ext docx?, has catdoc, terminal = catdoc -- "$@" | "$PAGER"
+ext pdf, has pdftotext = pdftotext "$@" | "$PAGER"
 
 #-------------------------------------------
 # Image Viewing:
 #-------------------------------------------
-mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
-mime ^image/svg, has display,  X, flag f = display -- "$@"
-
-mime ^image, has sxiv,      X, flag f = sxiv -- "$@"
-mime ^image, has feh,       X, flag f = feh -- "$@"
-mime ^image, has mirage,    X, flag f = mirage -- "$@"
-mime ^image, has ristretto, X, flag f = ristretto "$@"
-mime ^image, has eog,       X, flag f = eog -- "$@"
-mime ^image, has eom,       X, flag f = eom -- "$@"
-mime ^image, has gimp,      X, flag f = gimp -- "$@"
-ext xcf,                    X, flag f = gimp -- "$@"
+mime ^image, has fbi, = fbi -a -- "$@"
 
 #-------------------------------------------
 # Archives
@@ -189,14 +117,6 @@ ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has aunpack = aunpack -- "$
 ext tar|gz, has tar = tar vvtf "$@" | "$PAGER"
 ext tar|gz, has tar = tar vvxf "$@"
 
-#-------------------------------------------
-# Misc
-#-------------------------------------------
-label wallpaper, number 11, mime ^image, has feh, X = feh --bg-scale "$1"
-label wallpaper, number 12, mime ^image, has feh, X = feh --bg-tile "$1"
-label wallpaper, number 13, mime ^image, has feh, X = feh --bg-center "$1"
-label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1"
-
 # Define the editor for non-text files + pager as last action
               !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = ask
 label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = $EDITOR -- "$@"
diff --git a/shellrc b/shellrc
index 62bd2f1..5e65a79 100644
--- a/shellrc
+++ b/shellrc
@@ -33,6 +33,14 @@ alias v='vim'
 alias i='i3-msg'
 alias ra='ranger'
 
+# ranger alias with nesting control
+rg() {
+	if [ -z "$RANGER_LEVEL" ]; then
+		ranger
+	else
+		exit
+	fi
+}
 # Do not load system configuration for ranger (use only user one)
 export RANGER_LOAD_DEFAULT_RC=FALSE