Updated version of vifm for vivid vervet

4 files changed, 313 insertions, 107 deletions

diff --git a/vifm/colors/Default b/vifm/colors/Default
new file mode 100644
index 0000000..8f65064
--- /dev/null
+++ b/vifm/colors/Default
@@ -0,0 +1,54 @@
+" vim: filetype=vifm :
+" You can edit this file by hand.
+" The " character at the beginning of a line comments out the line.
+" Blank lines are ignored.
+
+" The Default color scheme is used for any directory that does not have
+" a specified scheme and for parts of user interface like menus. A
+" color scheme set for a base directory will also
+" be used for the sub directories.
+
+" The standard ncurses colors are:
+" Default = -1 = None, can be used for transparency or default color
+" Black = 0
+" Red = 1
+" Green = 2
+" Yellow = 3
+" Blue = 4
+" Magenta = 5
+" Cyan = 6
+" White = 7
+
+" Available style values (some of them can be combined):
+" bold
+" underline
+" reverse or inverse
+" standout
+" none
+
+" Vifm supports 256 colors you can use color numbers 0-255
+" (requires properly set up terminal: set your TERM environment variable
+" (directly or using resources) to some color terminal name (e.g.
+" xterm-256color) from /usr/lib/terminfo/; you can check current number
+" of colors in your terminal with tput colors command)
+
+" highlight group cterm=style ctermfg=foreground_color ctermbg=background_color
+
+highlight Win cterm=none ctermfg=white ctermbg=black
+highlight Directory cterm=bold ctermfg=cyan ctermbg=black
+highlight Link cterm=bold ctermfg=yellow ctermbg=black
+highlight BrokenLink cterm=bold ctermfg=red ctermbg=none
+highlight Socket cterm=bold ctermfg=magenta ctermbg=black
+highlight Device cterm=bold ctermfg=red ctermbg=black
+highlight Fifo cterm=bold ctermfg=cyan ctermbg=none
+highlight Executable cterm=bold ctermfg=green ctermbg=black
+highlight Selected cterm=bold ctermfg=magenta ctermbg=black
+highlight CurrLine cterm=bold ctermfg=white ctermbg=blue
+highlight TopLine cterm=none ctermfg=black ctermbg=white
+highlight TopLineSel cterm=bold ctermfg=black ctermbg=none
+highlight StatusLine cterm=bold ctermfg=black ctermbg=white
+highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black
+highlight CmdLine cterm=none ctermfg=white ctermbg=black
+highlight ErrorMsg cterm=none ctermfg=red ctermbg=black
+highlight Border cterm=none ctermfg=black ctermbg=white
+highlight OtherLine cterm=bold,underline,reverse,standout ctermfg=none ctermbg=none
diff --git a/vifm/vifminfo b/vifm/vifminfo
new file mode 100644
index 0000000..349b43c
--- /dev/null
+++ b/vifm/vifminfo
@@ -0,0 +1,27 @@
+# You can edit this file by hand, but it's recommended not to do that.
+
+# Bookmarks:
+'H
+	/home/urbain
+	../
+-1
+'m
+	/home/urbain/Dropbox/phd/literature/October\ 14
+	Shear_viscosity.pdf
+-1
+'p
+	/home/urbain/Dropbox/phd
+	../
+-1
+
+# Command line history (oldest to newest):
+:set number
+:q
+
+# Search history (oldest to newest):
+
+# Prompt history (oldest to newest):
+
+# Trash content:
+t/home/urbain/.vifm/Trash/000_dead.letter
+	/home/urbain/dead.letter
diff --git a/vifm/vifmrc b/vifm/vifmrc
index 81f84fa..28426fb 100644
--- a/vifm/vifmrc
+++ b/vifm/vifmrc
@@ -1,108 +1,125 @@
-# You can edit this file by hand.
-# The # character at the beginning of a line comments out the line.
-# Blank lines are ignored.
-# The basic format for each item is shown with an example.
-# The '=' character is used to separate fields within a single line.
-# Most settings are true = 1 or false = 0.
-
-# This is the actual command used to start vi.  The default is vi.
-# If you would like to use another vi clone such as Vim, Elvis, or Vile
-# you will need to change this setting.
-
-VI_COMMAND=vim
-# VI_COMMAND=vim
-# VI_COMMAND=elvis -G termcap
-# VI_COMMAND=vile
-
-# Trash Directory
-# The default is to move files that are deleted with dd or :d to
-# the trash directory.  1 means use the trash directory 0 means
-# just use rm.  If you change this you will not be able to move
-# files by deleting them and then using p to put the file in the new location.
-# I recommend not changing this until you are familiar with vifm.
-# This probably shouldn't be an option.
-
-USE_TRASH=1
-
-# Show only one Window
-# If you would like to start vifm with only one window set this to 1
-
-USE_ONE_WINDOW=0
-
-# Screen configuration.  If you would like to use vifm with
-# the screen program set this to 1.
-
-USE_SCREEN=0
-
-# 1 means use color if the terminal supports it.
-# 0 means don't use color even if supported.
-
-# This is how many files to show in the directory history menu.
-
-HISTORY_LENGTH=100
-
-# The sort type is how the files will be sorted in the file listing.
-# Sort by File Extension = 0
-# Sort by File Name = 1
-# Sort by Group ID = 2
-# Sort by Group Name = 3
-# Sort by Mode = 4
-# Sort by Owner ID = 5
-# Sort by Owner Name = 6
-# Sort by Size = 7
-# Sort by Time Accessed =8
-# Sort by Time Changed =9
-# Sort by Time Modified =10
-# This can be set with the :sort command in vifm.
-
-LEFT_WINDOW_SORT_TYPE=1
-
-RIGHT_WINDOW_SORT_TYPE=1
-
-# The regular expression used to filter files out of
-# the directory listings.
-# LWIN_FILTER=\.o$ and LWIN_INVERT=1 would filter out all
-# of the .o files from the directory listing. LWIN_INVERT=0
-# would show only the .o files
-
-LWIN_FILTER=\.o$
-LWIN_INVERT=1
-RWIN_FILTER=\.o$
-RWIN_INVERT=1
-
-# If you installed the vim.txt help file change this to 1.
-# If would rather use a plain text help file set this to 0.
-
-USE_VIM_HELP=0
-
-# If you would like to run an executable file when you 
-# press return on the file name set this to 1.
-
-RUN_EXECUTABLE=0
-
-# BOOKMARKS=mark=/full/directory/path=filename
-
-BOOKMARKS=H=/home/urbain=../
-BOOKMARKS=m=/home/urbain/Dropbox/phd/literature/October 14=Shear_viscosity.pdf
-BOOKMARKS=p=/home/urbain/Dropbox/phd=../
-BOOKMARKS=z=/home/urbain/.vifm=../
-
-# COMMAND=command_name=action
-# The following macros can be used in a command
-# %a is replaced with the user arguments.
-# %f the current selected file, or files.
-# %F the current selected file, or files in the other directoy.
-# %d the current directory name.
-# %D the other window directory name.
-# %m run the command in a menu window
-
-
-# The file type is for the default programs to be used with
-# a file extension. 
-# FILETYPE=description=extension1,extension2=defaultprogram, program2
-# FILETYPE=Web=html,htm,shtml=links,mozilla,elvis
-# would set links as the default program for .html .htm .shtml files
-# The other programs for the file type can be accessed with the :file command
-# The command macros %f, %F, %d, %F may be used in the commands.
-# The %a macro is ignored.  To use a % you must put %%.
+" vim: filetype=vifm :
+" You can edit this file by hand.
+" The " character at the beginning of a line comments out the line.
+" Blank lines are ignored.
+" The basic format for each item is shown with an example.
 
+" This is the actual command used to start vi.  The default is vim.
+" If you would like to use another vi clone such Elvis or Vile
+" you will need to change this setting.
+
+set vicmd=vim
+" set vicmd=elvis\ -G\ termcap
+" set vicmd=vile
+
+" Trash Directory
+" The default is to move files that are deleted with dd or :d to
+" the trash directory.  If you change this you will not be able to move
+" files by deleting them and then using p to put the file in the new location.
+" I recommend not changing this until you are familiar with vifm.
+" This probably shouldn't be an option.
+
+set trash
+
+" This is how many directories to store in the directory history.
+
+set history=100
+
+" Follow links on l or Enter.
+
+set followlinks
+
+" With this option turned on you can run partially entered commands with
+" unambiguous beginning using :! (e.g. :!Te instead of :!Terminal or :!Te<tab>).
+
+set nofastrun
+
+" Natural sort of (version) numbers within text.
+
+set nosortnumbers
+
+" Maximum number of changes that can be undone.
+
+set undolevels=100
+
+" If you installed the vim.txt help file set vimhelp.
+" If would rather use a plain text help file set novimhelp.
+
+set novimhelp
+
+" If you would like to run an executable file when you
+" press return on the file name set this.
+
+set norunexec
+
+" Use KiB, MiB, ... instead of K, M, ...
+
+set noiec
+
+" Selected color scheme
+
+colorscheme Default
+
+" The FUSE_HOME directory will be used as a root dir for all FUSE mounts.
+" Unless it exists with write/exec permissions set, vifm will attempt to
+" create it.
+
+set fusehome=/tmp/vifm_FUSE
+
+" Format for displaying time in file list. For example:
+" set timefmt=%m/%d-%H:%M
+" See man date or man strftime for details.
+
+set timefmt=\ %m/%d\ %H:%M
+
+" :mark mark /full/directory/path [filename]
+
+" mark H /home/urbain ../
+" mark m /home/urbain/Dropbox/phd/literature/October\ 14 Shear_viscosity.pdf
+" mark p /home/urbain/Dropbox/phd ../
+" mark z /home/urbain/.vifm ../
+
+" :com[mand] command_name action
+" The following macros can be used in a command
+" %a is replaced with the user arguments.
+" %c the current file under the cursor.
+" %C the current file under the cursor in the other directory.
+" %f the current selected file, or files.
+" %F the current selected file, or files in the other directory.
+" %b same as %f %F.
+" %d the current directory name.
+" %D the other window directory name.
+" %m run the command in a menu window
+
+
+" The file type is for the default programs to be used with
+" a file extension.
+" :filetype pattern1,pattern2 defaultprogram,program2
+" :fileviewer pattern1,pattern2 consoleviewer
+" The other programs for the file type can be accessed with the :file command
+" The command macros %f, %F, %d, %F may be used in the commands.
+" The %a macro is ignored.  To use a % you must put %%.
+
+" For automated FUSE mounts, you must register an extension with FILETYPE=..
+" in one of following formats:
+"
+" :filetype extensions FUSE_MOUNT|some_mount_command using %SOURCE_FILE and %DESTINATION_DIR variables
+" %SOURCE_FILE and %DESTINATION_DIR are filled in by vifm at runtime.
+" A sample line might look like this:
+" :filetype *.zip,*.jar,*.war,*.ear FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR
+"
+" :filetype extensions FUSE_MOUNT2|some_mount_command using %PARAM and %DESTINATION_DIR variables
+" %PARAM and %DESTINATION_DIR are filled in by vifm at runtime.
+" A sample line might look like this:
+" :filetype *.ssh FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR
+" %PARAM value is filled from the first line of file (whole line).
+" Example first line for SshMount filetype: root@127.0.0.1:/
+"
+" You can also add %CLEAR if you want to clear screen before running FUSE
+" program.
+
+" What should be saved automatically between vifm runs
+" Like in previous versions of vifm
+" set vifminfo=options,filetypes,commands,bookmarks,tui,state,cs,chistory,shistory,dirstack,registers,phistory
+" Like in vi
+set vifminfo=bookmarks,chistory,shistory,phistory
diff --git a/vifm/vifmrc.bak b/vifm/vifmrc.bak
new file mode 100644
index 0000000..81f84fa
--- /dev/null
+++ b/vifm/vifmrc.bak
@@ -0,0 +1,108 @@
+# You can edit this file by hand.
+# The # character at the beginning of a line comments out the line.
+# Blank lines are ignored.
+# The basic format for each item is shown with an example.
+# The '=' character is used to separate fields within a single line.
+# Most settings are true = 1 or false = 0.
+
+# This is the actual command used to start vi.  The default is vi.
+# If you would like to use another vi clone such as Vim, Elvis, or Vile
+# you will need to change this setting.
+
+VI_COMMAND=vim
+# VI_COMMAND=vim
+# VI_COMMAND=elvis -G termcap
+# VI_COMMAND=vile
+
+# Trash Directory
+# The default is to move files that are deleted with dd or :d to
+# the trash directory.  1 means use the trash directory 0 means
+# just use rm.  If you change this you will not be able to move
+# files by deleting them and then using p to put the file in the new location.
+# I recommend not changing this until you are familiar with vifm.
+# This probably shouldn't be an option.
+
+USE_TRASH=1
+
+# Show only one Window
+# If you would like to start vifm with only one window set this to 1
+
+USE_ONE_WINDOW=0
+
+# Screen configuration.  If you would like to use vifm with
+# the screen program set this to 1.
+
+USE_SCREEN=0
+
+# 1 means use color if the terminal supports it.
+# 0 means don't use color even if supported.
+
+# This is how many files to show in the directory history menu.
+
+HISTORY_LENGTH=100
+
+# The sort type is how the files will be sorted in the file listing.
+# Sort by File Extension = 0
+# Sort by File Name = 1
+# Sort by Group ID = 2
+# Sort by Group Name = 3
+# Sort by Mode = 4
+# Sort by Owner ID = 5
+# Sort by Owner Name = 6
+# Sort by Size = 7
+# Sort by Time Accessed =8
+# Sort by Time Changed =9
+# Sort by Time Modified =10
+# This can be set with the :sort command in vifm.
+
+LEFT_WINDOW_SORT_TYPE=1
+
+RIGHT_WINDOW_SORT_TYPE=1
+
+# The regular expression used to filter files out of
+# the directory listings.
+# LWIN_FILTER=\.o$ and LWIN_INVERT=1 would filter out all
+# of the .o files from the directory listing. LWIN_INVERT=0
+# would show only the .o files
+
+LWIN_FILTER=\.o$
+LWIN_INVERT=1
+RWIN_FILTER=\.o$
+RWIN_INVERT=1
+
+# If you installed the vim.txt help file change this to 1.
+# If would rather use a plain text help file set this to 0.
+
+USE_VIM_HELP=0
+
+# If you would like to run an executable file when you 
+# press return on the file name set this to 1.
+
+RUN_EXECUTABLE=0
+
+# BOOKMARKS=mark=/full/directory/path=filename
+
+BOOKMARKS=H=/home/urbain=../
+BOOKMARKS=m=/home/urbain/Dropbox/phd/literature/October 14=Shear_viscosity.pdf
+BOOKMARKS=p=/home/urbain/Dropbox/phd=../
+BOOKMARKS=z=/home/urbain/.vifm=../
+
+# COMMAND=command_name=action
+# The following macros can be used in a command
+# %a is replaced with the user arguments.
+# %f the current selected file, or files.
+# %F the current selected file, or files in the other directoy.
+# %d the current directory name.
+# %D the other window directory name.
+# %m run the command in a menu window
+
+
+# The file type is for the default programs to be used with
+# a file extension. 
+# FILETYPE=description=extension1,extension2=defaultprogram, program2
+# FILETYPE=Web=html,htm,shtml=links,mozilla,elvis
+# would set links as the default program for .html .htm .shtml files
+# The other programs for the file type can be accessed with the :file command
+# The command macros %f, %F, %d, %F may be used in the commands.
+# The %a macro is ignored.  To use a % you must put %%.
+