associations update

3 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3344c0005701..1a0632e7c39c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = noice-git
 	pkgdesc = Small terminal file browser written in C
-	pkgver = 0.8.r0.gae2cb6f
+	pkgver = 0.8.r3.g16f473f
 	pkgrel = 1
 	url = http://git.2f30.org/noice/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 03156e088731..f41738774f71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=noice-git
 _pkgname=noice
-pkgver=0.8.r0.gae2cb6f
+pkgver=0.8.r3.g16f473f
 pkgrel=1
 pkgdesc='Small terminal file browser written in C'
 arch=('i686' 'x86_64' 'armv6h')
diff --git a/config.h b/config.h
index e1490318f5eb..638a965b97ec 100644
--- a/config.h
+++ b/config.h
@@ -3,12 +3,12 @@
 #define CURSR " > "
 #define EMPTY "   "
 
-int dirorder    = 1; /* Set to 1 to sort by directory first */
+int dirorder    = 0; /* Set to 1 to sort by directory first */
 int mtimeorder  = 0; /* Set to 1 to sort by time modified */
 int icaseorder  = 0; /* Set to 1 to sort by ignoring case */
 int idletimeout = 0; /* Screensaver timeout in seconds, 0 to disable */
 int showhidden  = 0; /* Set to 1 to show hidden files by default */
-int usecolor    = 1; /* Set to 1 to enable color attributes */
+int usecolor    = 0; /* Set to 1 to enable color attributes */
 char *idlecmd   = "rain"; /* The screensaver program */
 
 /* See curs_attr(3) for valid video attributes */
@@ -32,12 +32,12 @@ struct cpair pairs[] = {
 };
 
 struct assoc assocs[] = {
-	{ "\\.(avi|mp4|mkv|mov|wav|mp3|ogg|flac|mod|it|xm|s3m)$", "mpv" },
-	{ "\\.(png|jpg|jpeg|gif)$", "sxiv" },
-	{ "\\.(html|svg)$", "firefox" },
-	{ "\\.pdf$", "mupdf" },
-	{ "\\.sh$", "sh" },
-	{ ".", "less" },
+	{ .regex = "\\.(avi|mp4|mkv|mov|ogm|3gp|dv|wav|aiff|pcm|mp3|ogg|flac|ape|aac|m4a|wma|opus|pls|m3u|mod|it|s3m|xm|flv)$", .file = "mpv", .argv = { "mpv", "--really-quiet", "--load-scripts=no", "{}", NULL } },
+	{ .regex = "\\.(png|jpg|jpeg|gif|bmp|tiff|tga)$", .file = "sxiv", .argv = { "sxiv", "{}", NULL} },
+	{ .regex = "\\.(html|svg)$", .file = "firefox", .argv = { "firefox", "{}", NULL } },
+	{ .regex = "\\.pdf$", .file = "mupdf", .argv = { "mupdf", "{}", NULL} },
+	{ .regex = "\\.sh$", .file = "sh", .argv = { "sh", "{}", NULL} },
+	{ .regex = ".", .file = "less", .argv = { "less", "{}", NULL } },
 };
 
 struct key bindings[] = {
@@ -72,26 +72,24 @@ struct key bindings[] = {
 	{ CONTROL('U'),   SEL_PGUP },
 	/* Home */
 	{ KEY_HOME,       SEL_HOME },
-	{ CONTROL('A'),   SEL_HOME },
- 	{ META('<'),      SEL_HOME },
+	{ META('<'),      SEL_HOME },
 	{ '^',            SEL_HOME },
 	/* End */
 	{ KEY_END,        SEL_END },
-	{ CONTROL('E'),   SEL_END },
- 	{ META('>'),      SEL_END },
+	{ META('>'),      SEL_END },
 	{ '$',            SEL_END },
 	/* Change dir */
 	{ 'c',            SEL_CD },
 	{ '~',            SEL_CDHOME },
 	/* Toggle hide .dot files */
 	{ '.',            SEL_TOGGLEDOT },
-  /* Toggle sort by directory first */
-  { 'd',            SEL_DSORT },
+	/* Toggle sort by directory first */
+	{ 'd',            SEL_DSORT },
 	/* Toggle sort by time */
 	{ 't',            SEL_MTIME },
+	/* Toggle case sensitivity */
+	{ 'i',            SEL_ICASE },
 	{ CONTROL('L'),   SEL_REDRAW },
-  /* Toggle case sensitivity */
-  { 'i',            SEL_ICASE },
 	/* Run command */
 	{ 'z',            SEL_RUN, "top" },
 	{ '!',            SEL_RUN, "sh", "SHELL" },