Merge remote-tracking branch 'origin/master'

This commit is contained in:
LordMZTE 2022-01-12 19:19:46 +01:00
commit 2d464941e2
2 changed files with 39 additions and 54 deletions

View file

@ -1,56 +1,37 @@
{
"diagnostic.virtualText": true,
"diagnostic.virtualTextCurrentLineOnly": false,
"languageserver": {
"haskell": {
"command": "haskell-language-server-wrapper",
"args": [
"--lsp"
],
"rootPatterns": [
"*.cabal",
"stack.yaml",
"cabal.project",
"package.yaml",
"hie.yaml"
],
"filetypes": [
"haskell",
"lhaskell"
]
},
"ocaml-lsp": {
"command": "opam",
"args": [
"config",
"exec",
"--",
"ocamllsp"
],
"filetypes": [
"ocaml",
"reason"
]
},
"mun": {
"command": "mun",
"rootPatterns": [
"mun.toml"
],
"trace.server": "verbose",
"args": [
"language-server"
],
"filetypes": [
"mun"
]
},
"zls" : {
"command": "zls",
"filetypes": ["zig"]
}
"diagnostic.virtualText": true,
"diagnostic.virtualTextCurrentLineOnly": false,
"languageserver": {
"haskell": {
"command": "haskell-language-server-wrapper",
"args": ["--lsp"],
"rootPatterns": [
"*.cabal",
"stack.yaml",
"cabal.project",
"package.yaml",
"hie.yaml"
],
"filetypes": ["haskell", "lhaskell"]
},
"java.format.enabled": true,
"java.format.onType.enabled": true,
"sumneko-lua.enableNvimLuaDev": true
"ocaml-lsp": {
"command": "opam",
"args": ["config", "exec", "--", "ocamllsp"],
"filetypes": ["ocaml", "reason"]
},
"mun": {
"command": "mun",
"rootPatterns": ["mun.toml"],
"trace.server": "verbose",
"args": ["language-server"],
"filetypes": ["mun"]
},
"zls": {
"command": "zls",
"filetypes": ["zig"]
}
},
"java.format.enabled": true,
"java.format.onType.enabled": true,
"sumneko-lua.enableNvimLuaDev": true
}

View file

@ -1,4 +1,8 @@
local blacklistedSites = { ".*twitch\\.tv.*", ".*twitter\\.com.*" }
local blacklistedSites = {
[[.*twitch\.tv.*]],
[[*twitter\.com.*]],
[[*koyu\.space.*]],
}
local localSettings = {
[".*"] = {