update config files

4 files changed, 84 insertions, 99 deletions

diff --git a/config/joshuto.toml b/config/joshuto.toml
index 0b3aae1..af5be15 100644
--- a/config/joshuto.toml
+++ b/config/joshuto.toml
@@ -1,22 +1,18 @@
-# sort_type options: size, natural, basename, atime, ctime, mtime, type, random
-## currently only supports: natural, mtime
 tilde_in_titlebar = true
 
 # ratios for parent view, current view and preview
-column_ratio = [1, 3, 4]
+column_ratio = [1, 4, 4]
 
-# does nothing so far
 scroll_offset = 6
 
-sort_type = "natural"
-
 show_preview = true
 max_preview_size = 2097152 # 2MB
 
+# lexical, mtime, natural
+sort_method = "natural"
+
 [sort_option]
 show_hidden = false
 case_sensitive = false
 reverse = false
 directories_first = true
-
-show_preview = true
diff --git a/config/keymap.toml b/config/keymap.toml
index f1ec9e9..9f77587 100644
--- a/config/keymap.toml
+++ b/config/keymap.toml
@@ -108,18 +108,16 @@ args = [ "--overwrite" ]
 
 [[mapcommand]]
 keys = [ 97 ]
-command = "rename_file"
-args = [ "--append" ]
+command = "rename_append"
 
 [[mapcommand]]
 keys = [ 65 ]
-command = "rename_file"
-args = [ "--prepend" ]
+command = "rename_prepend"
 
 [[mapcommand]]
 keys = [ 99, 119 ]
-command = "rename_file"
-args = [ "--overwrite" ]
+command = "console"
+args = [ "rename " ]
 
 [[mapcommand]]
 keys = [ 100, 68 ]
@@ -165,7 +163,8 @@ args = [ "/etc" ]
 
 [[mapcommand]]
 keys = [ 47 ]
-command = "search"
+command = "console"
+args = [ "search " ]
 
 [[mapcommand]]
 keys = [ 78 ]
diff --git a/config/mimetype.toml b/config/mimetype.toml
index ddaafde..4d019de 100644
--- a/config/mimetype.toml
+++ b/config/mimetype.toml
@@ -1,71 +1,76 @@
 [[entry]]
-id = 1
-program = "nano"
+id	= 1
+program	= "nano"
 
 [[entry]]
-id = 2
-program = "gedit"
-fork = true
-silent = true
+id	= 2
+program	= "gedit"
+fork	= true
+silent	= true
 
 [[entry]]
-id = 10
-program = "mpv"
-fork = true
-silent = true
+id	= 10
+program	= "mpv"
+fork	= true
+silent	= true
 
 [[entry]]
-id = 11
-program = "mpv"
+id	= 11
+program	= "mpv"
 
 [[entry]]
-id = 20
-program = "qimgv"
-fork = true
-silent = true
+id	= 20
+program	= "qimgv"
+fork	= true
+silent	= true
 
 [[entry]]
-id = 21
-program = "krita"
-fork = true
-silent = true
+id	= 21
+program	= "krita"
+fork	= true
+silent	= true
 
 [[entry]]
-id = 50
-program = "pdflatex"
+id	= 50
+program	= "pdflatex"
 
 [[entry]]
-id = 55
-program = "evince"
-fork = true
-silent = true
+id	= 55
+program	= "evince"
+fork	= true
+silent	= true
 
 [[entry]]
-id = 60
-program = "tar"
-args = [ "-xvzf" ]
+id	= 60
+program	= "tar"
+args	= [ "-xvzf" ]
 [[entry]]
-id = 61
-program = "tar"
-args = [ "-xvJf" ]
+id	= 61
+program	= "tar"
+args	= [ "-xvJf" ]
+[[entry]]
+id	= 62
+program	= "tar"
+args	= [ "-xvjf" ]
 
 [[entry]]
-id = 70
-program = "unrar"
-args = [ "e" ]
+id	= 70
+program	= "unrar"
+args	= [ "e" ]
 [[entry]]
-id = 80
-program = "unzip"
+id	= 80
+program	= "unzip"
 
 [[entry]]
-id = 100
-program = "libreoffice"
-fork = true
-silent = true
+id	= 100
+program	= "libreoffice"
+fork	= true
+silent	= true
 
 # specify which applications to use to open certain file types
 [extension]
 ## Image
+bmp	= [ 20, 21 ]
 gif	= [ 20, 21 ]
 jpg	= [ 20, 21 ]
 jpeg	= [ 20, 21 ]
@@ -85,28 +90,36 @@ wmv	= [ 10 ]
 
 # Text
 c	= [ 1, 2 ]
+conf	= [ 1, 2 ]
 cpp	= [ 1, 2 ]
-java	= [ 1, 2 ]
 css	= [ 1, 2 ]
+go	= [ 1, 2 ]
 hs	= [ 1, 2 ]
+html	= [ 1, 2 ]
+java	= [ 1, 2 ]
+js	= [ 1, 2 ]
+kt	= [ 1, 2 ]
 log	= [ 1, 2 ]
 md	= [ 1, 2 ]
 py	= [ 1, 2 ]
 rs	= [ 1, 2 ]
+sh	= [ 1, 2 ]
 toml	= [ 1, 2 ]
 xml	= [ 1, 2 ]
 
 tex	= [ 1, 50 ]
 
 # Archives
-rar = [ 70 ]
-gz = [ 60 ]
-xz = [ 61 ]
-zip = [ 80 ]
+bz2	= [ 62 ]
+gz	= [ 60 ]
+rar	= [ 70 ]
+xz	= [ 61 ]
+zip	= [ 80 ]
 
 # Misc
-odt = [ 100 ]
-pdf = [ 55 ]
+odt	= [ 100 ]
+odf	= [ 100 ]
+pdf	= [ 55 ]
 
 [mimetype]
 
diff --git a/config/theme.toml b/config/theme.toml
index 6a6d947..ebd496f 100644
--- a/config/theme.toml
+++ b/config/theme.toml
@@ -43,8 +43,9 @@ bg = -1
 colorpair = 3
 bold = true
 underline = false
+[selection.prefix]
 prefix = "  "
-prefixsize = 2
+size = 2
 
 [executable]
 colorpair = 2
@@ -74,85 +75,61 @@ underline = false
 [ext]
 	[ext.jpg]
 	colorpair = 3
-	bold = false
-	underline = false
 
 	[ext.jpeg]
 	colorpair = 3
-	bold = false
-	underline = false
 
 	[ext.png]
 	colorpair = 3
-	bold = false
-	underline = false
 
 	[ext.svg]
 	colorpair = 6
-	bold = false
-	underline = false
 
 	[ext.gif]
 	colorpair = 6
-	bold = false
-	underline = false
 
 	[ext.wav]
 	colorpair = 5
-	bold = false
-	underline = false
 
 	[ext.flac]
 	colorpair = 5
-	bold = false
-	underline = false
 
 	[ext.mp3]
 	colorpair = 5
-	bold = false
-	underline = false
+
+	[ext.avi]
+	colorpair = 5
 
 	[ext.mp4]
 	colorpair = 5
-	bold = false
-	underline = false
 
 	[ext.mkv]
 	colorpair = 5
-	bold = false
-	underline = false
 
 	[ext.m4a]
 	colorpair = 5
-	bold = false
-	underline = false
+
+	[ext.ts]
+	colorpair = 5
 
 	[ext.webm]
 	colorpair = 5
-	bold = false
-	underline = false
 
 	[ext.wmv]
 	colorpair = 5
-	bold = false
-	underline = false
 
 	[ext.7z]
 	colorpair = 1
-	bold = false
-	underline = false
 
 	[ext.zip]
 	colorpair = 1
-	bold = false
-	underline = false
 
-	[ext."tar.gz"]
+	[ext.bz2]
+	colorpair = 1
+	[ext.gz]
+	colorpair = 1
+	[ext.xz]
 	colorpair = 1
-	bold = false
-	underline = false
 
 	[ext.rar]
 	colorpair = 1
-	bold = false
-	underline = false