vis: add keys for shell and themes, change current dir keys

vis/.config/vis/themes/lupan-dark.lua

@@ -1,8 +1,8 @@
 -- Eight-color scheme
 local lexers = vis.lexers
-lexers.STYLE_DEFAULT ='fore:#a6a6a6,back:#1f212e'
+lexers.STYLE_DEFAULT ='back:#1f212e,fore:#9da0af'
 lexers.STYLE_NOTHING = ''
-lexers.STYLE_ATTRIBUTE = 'fore:#949438,bold'
+lexers.STYLE_ATTRIBUTE = 'fore:#a1a3aa,bold'
 lexers.STYLE_CLASS = 'fore:yellow,bold'
 lexers.STYLE_COMMENT = 'fore:#334d40,bold'
 lexers.STYLE_CONSTANT = 'fore:cyan,bold'

vis/.config/vis/themes/lupan-light.lua

@@ -0,0 +1,158 @@
+-- Eight-color scheme
+local lexers = vis.lexers
+lexers.STYLE_DEFAULT ='back:#dbdff0,fore:#1f212e'
+lexers.STYLE_NOTHING = ''
+lexers.STYLE_ATTRIBUTE = 'fore:#a1a3aa,bold'
+lexers.STYLE_CLASS = 'fore:yellow,bold'
+lexers.STYLE_COMMENT = 'fore:#334d40,bold'
+lexers.STYLE_CONSTANT = 'fore:cyan,bold'
+lexers.STYLE_DEFINITION = 'fore:blue,bold'
+lexers.STYLE_ERROR = 'fore:red,italics'
+lexers.STYLE_FUNCTION = 'fore:#6b8ac7,bold'
+lexers.STYLE_HEADING = 'fore:#d1d147'
+lexers.STYLE_KEYWORD = 'fore:#bf8040,bold'
+lexers.STYLE_LABEL = 'fore:green,bold'
+lexers.STYLE_NUMBER = 'fore:#acac53,bold'
+lexers.STYLE_OPERATOR = 'fore:#93806c,bold'
+lexers.STYLE_REGEX = 'fore:#59862d,bold'
+lexers.STYLE_STRING = 'fore:#3d8f66,bold'
+lexers.STYLE_PREPROCESSOR = 'fore:#cc66cc,bold'
+lexers.STYLE_TAG = 'fore:#705943,bold'
+lexers.STYLE_TYPE = 'fore:#7461d1,bold'
+lexers.STYLE_VARIABLE = 'fore:#8c5eba,bold'
+lexers.STYLE_WHITESPACE = ''
+lexers.STYLE_EMBEDDED = 'back:#2d3353,bold'
+lexers.STYLE_IDENTIFIER = ''
+
+lexers.STYLE_LINENUMBER = ''
+lexers.STYLE_LINENUMBER_CURSOR = 'fore:#bf8040'
+lexers.STYLE_CURSOR = 'back:#bf8040,fore:#1f212e'
+lexers.STYLE_CURSOR_PRIMARY = lexers.STYLE_CURSOR..',fore:#e6fefe'
+lexers.STYLE_CURSOR_LINE = 'underlined'
+lexers.STYLE_COLOR_COLUMN = 'back:red'
+lexers.STYLE_SELECTION = 'back:#a1a3aa,bold'
+lexers.STYLE_STATUS = 'reverse'
+lexers.STYLE_STATUS_FOCUSED = 'reverse,bold'
+lexers.STYLE_SEPARATOR = lexers.STYLE_DEFAULT
+lexers.STYLE_INFO = 'bold'
+lexers.STYLE_EOF = ''
+
+-- lexer specific styles
+
+-- Diff
+lexers.STYLE_ADDITION = 'fore:#3a783a'
+lexers.STYLE_DELETION = 'fore:#862d2d'
+lexers.STYLE_CHANGE = 'fore:#2d3353'
+
+-- CSS
+lexers.STYLE_PROPERTY = lexers.STYLE_ATTRIBUTE
+lexers.STYLE_PSEUDOCLASS = ''
+lexers.STYLE_PSEUDOELEMENT = ''
+
+-- HTML
+lexers.STYLE_TAG_UNKNOWN = lexers.STYLE_TAG .. ',italics'
+lexers.STYLE_TAG_SINGLE = lexers.STYLE_TAG
+lexers.STYLE_TAG_DOCTYPE = lexers.STYLE_TAG .. ',bold'
+lexers.STYLE_ATTRIBUTE_UNKNOWN = lexers.STYLE_ATTRIBUTE .. ',italics'
+
+-- Latex, TeX, and Texinfo
+lexers.STYLE_COMMAND = lexers.STYLE_KEYWORD
+lexers.STYLE_COMMAND_SECTION = lexers.STYLE_CLASS
+lexers.STYLE_ENVIRONMENT = lexers.STYLE_TYPE
+lexers.STYLE_ENVIRONMENT_MATH = lexers.STYLE_NUMBER
+
+-- Makefile
+lexers.STYLE_TARGET = ''
+
+-- Markdown
+lexers.STYLE_HR = ''
+for i = 1,6 do lexers['STYLE_HEADING_H'..i] = lexers.STYLE_HEADING end
+lexers.STYLE_BOLD = 'bold'
+lexers.STYLE_ITALIC = 'italics'
+lexers.STYLE_LIST = lexers.STYLE_KEYWORD
+lexers.STYLE_LINK = lexers.STYLE_KEYWORD
+lexers.STYLE_REFERENCE = lexers.STYLE_KEYWORD
+lexers.STYLE_CODE = lexers.STYLE_EMBEDDED
+
+-- Output
+lexers.STYE_FILENAME = ''
+lexers.STYLE_LINE = ''
+lexers.STYLE_COLUMN = ''
+lexers.STYLE_MESSAGE = ''
+
+-- Python
+lexers.STYLE_KEYWORD_SOFT = ''
+
+-- Taskpaper
+lexers.STYLE_NOTE = ''
+lexers.STYLE_TAG_EXTENDED = ''
+lexers.STYLE_TAG_DAY = 'fore:yellow'
+lexers.STYLE_TAG_OVERDUE = 'fore:red'
+lexers.STYLE_TAG_PLAIN = ''
+
+-- XML
+lexers.STYLE_CDATA = ''
+
+-- YAML
+lexers.STYLE_ERROR_INDENT = 'back:red'
+
+-- The following are temporary styles until their legacy lexers are migrated.
+
+-- Antlr
+lexers.STYLE_ACTION = ''
+
+-- Clojure
+lexers.STYLE_CLOJURE_KEYWORD = lexers.STYLE_TYPE
+lexers.STYLE_CLOJURE_SYMBOL = lexers.STYLE_TYPE .. ',bold'
+
+-- Crystal
+--lexers.STYLE_SYMBOL = lexers.STYLE_STRING
+
+-- Gleam
+lexers.STYLE_MODULE = lexers.STYLE_CONSTANT
+lexers.STYLE_DISCARD = lexers.STYLE_COMMENT
+
+-- Icon
+lexers.STYLE_SPECIAL_KEYWORD = lexers.STYLE_TYPE
+
+-- jq
+lexers.STYLE_FORMAT = lexers.STYLE_CONSTANT
+lexers.STYLE_SYSVAR = lexers.STYLE_CONSTANT .. ',bold'
+
+-- Julia
+-- lexers.STYLE_SYMBOL = lexers.STYLE_STRING
+lexers.STYLE_CHARACTER = lexers.STYLE_CONSTANT
+
+-- Mediawiki
+lexers.STYLE_BEHAVIOR_SWITCH = lexers.STYLE_KEYWORD
+
+-- Moonscript
+lexers.STYLE_TBL_KEY = lexers.STYLE_REGEX
+lexers.STYLE_SELF_REF = lexers.STYLE_LABEL
+lexers.STYLE_PROPER_IDENT = lexers.STYLE_CLASS
+lexers.STYLE_FNDEF = lexers.STYLE_PREPROCESSOR
+-- lexers.STYLE_SYMBOL = lexers.STYLE_EMBEDDED
+
+-- reST
+lexers.STYLE_LITERAL_BLOCK = lexers.STYLE_EMBEDDED
+lexers.STYLE_FOOTNOTE_BLOCK = lexers.STYLE_LABEL
+lexers.STYLE_CITATION_BLOCK = lexers.STYLE_LABEL
+lexers.STYLE_LINK_BLOCK = lexers.STYLE_LABEL
+lexers.STYLE_CODE_BLOCK = lexers.STYLE_CODE
+lexers.STYLE_DIRECTIVE = lexers.STYLE_KEYWORD
+lexers.STYLE_SPHINX_DIRECTIVE = lexers.STYLE_KEYWORD
+lexers.STYLE_UNKNOWN_DIRECTIVE = lexers.STYLE_KEYWORD
+lexers.STYLE_SUBSTITUTION = lexers.STYLE_VARIABLE
+lexers.STYLE_INLINE_LITERAL = lexers.STYLE_EMBEDDED
+lexers.STYLE_ROLE = lexers.STYLE_CLASS
+lexers.STYLE_INTERPRETED = lexers.STYLE_STRING
+
+-- txt2tags
+lexers.STYLE_LINE = 'bold'
+for i = 1,5 do lexers['STYLE_H'..i] = lexers.STYLE_HEADING end
+lexers.STYLE_IMAGE = 'fore:green'
+lexers.STYLE_STRIKE = 'italics'
+lexers.STYLE_TAGGED = lexers.STYLE_EMBEDDED
+lexers.STYLE_TAGGED_AREA = lexers.STYLE_EMBEDDED
+lexers.STYLE_TABLE_SEP = 'fore:green'
+lexers.STYLE_HEADER_CELL_CONTENT = 'fore:green'

vis/.config/vis/visrc.lua

@@ -192,7 +192,7 @@ vis.events.subscribe(vis.events.INIT, function()
 		search('fd -H --type f | fzf')
 	end, 'fzf: files with hidden files')
 
-	vis:map(vis.modes.NORMAL, ' .', function()
+	vis:map(vis.modes.NORMAL, ' df', function()
 		local path = vis.win.file.path
 		if path then
 			local dir = path:match('^.*/')
@@ -203,7 +203,7 @@ vis.events.subscribe(vis.events.INIT, function()
 		end
 	end, 'fzf in file directory')
 
-	vis:map(vis.modes.NORMAL, ' h.', function()
+	vis:map(vis.modes.NORMAL, ' dh', function()
 		local path = vis.win.file.path
 		if path then
 			local dir = path:match('^.*/')
@@ -214,6 +214,23 @@ vis.events.subscribe(vis.events.INIT, function()
 		end
 	end, 'fzf in file directory with hidden files')
 
+	vis:map(vis.modes.NORMAL, ' sh', function()
+		local shell = os.getenv('SHELL')
+		vis:command('!' .. shell)
+	end, 'run shell')
+
+	vis:map(vis.modes.NORMAL, ' ds', function()
+		local shell = os.getenv('SHELL')
+		local path = vis.win.file.path
+		if path then
+			local dir = path:match('^.*/')
+			local arg = escape_and_quoted(dir)
+			vis:command('!cd ' .. arg .. ' && ' .. shell)
+		else
+			vis:command('!' .. shell)
+		end
+	end, 'run shell in file directory')
+
 	vis:map(vis.modes.NORMAL, ' gf', function()
 		search('git ls-files | fzf')
 	end, 'fzf: git files')
@@ -276,6 +293,14 @@ vis.events.subscribe(vis.events.INIT, function()
 	vis:map(vis.modes.NORMAL, ' me', function()
 		vis:command('o ~/.config/vis/global-marks.txt')
 	end, 'global marks: edit')
+
+
+	vis:map(vis.modes.NORMAL, ' td', function()
+		vis:command('set theme lupan-dark')
+	end, 'change to dark theme')
+	vis:map(vis.modes.NORMAL, ' tl', function()
+		vis:command('set theme lupan-light')
+	end, 'change to light theme')
 end)
 
 vis.events.subscribe(vis.events.WIN_OPEN, function(win)