diff --git a/.gitignore b/.gitignore index 349122e..c395d5b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ dotfiles/.config/tmux/resurrect/ dotfiles/.config/coc/mru dotfiles/.config/coc/extensions/coc-yank-data/yank dotfiles/.config/coc/memos.json +dotfiles/.config/coc/history.json +dotfiles/.config/nvim/library/ diff --git a/dotfiles/.config/coc/history.json b/dotfiles/.config/coc/history.json deleted file mode 100644 index 1960143..0000000 --- a/dotfiles/.config/coc/history.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "outline": { - "%2Fhome%2Fygg%2FWorkspace%2Fconfiguration%F0%9F%A7%AA%2Fdotfiles%2F": { - "local%2Fshare%2Ffzf": [ - "rg" - ] - } - }, - "commands": { - "%2Fhome%2Fygg%2FWorkspace%2Fconfiguration%F0%9F%A7%AA%2Fdotfiles%2F": { - "config%2Fnvim%2Fplugconfig%2Fneoclide": [ - "vim", - "kkkk", - "kkkkkkjjjjj" - ] - }, - "%2Fhome%2Fygg%2FWorkspace%2FUbuntu%F0%9F%A6%8B%2Fpanel-django%2Fpanel_django%2Fapps%2Fubuntu": [ - "pythonset" - ] - } -} \ No newline at end of file diff --git a/dotfiles/.config/fish/config.fish b/dotfiles/.config/fish/config.fish index e819efe..3c51e7e 100644 --- a/dotfiles/.config/fish/config.fish +++ b/dotfiles/.config/fish/config.fish @@ -53,3 +53,4 @@ end # See fishfile for installed plugins through fisherman abbr gc git commit -m abbr gp git push origin master +abbr python python diff --git a/dotfiles/.config/nvim/after b/dotfiles/.config/nvim/after deleted file mode 120000 index a216d70..0000000 --- a/dotfiles/.config/nvim/after +++ /dev/null @@ -1 +0,0 @@ -library/MattDev_NvimConfig⛺/after \ No newline at end of file diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/after/syntax/c.vim b/dotfiles/.config/nvim/after/syntax/c.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/after/syntax/c.vim rename to dotfiles/.config/nvim/after/syntax/c.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/after/syntax/cpp.vim b/dotfiles/.config/nvim/after/syntax/cpp.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/after/syntax/cpp.vim rename to dotfiles/.config/nvim/after/syntax/cpp.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/after/syntax/python.vim b/dotfiles/.config/nvim/after/syntax/python.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/after/syntax/python.vim rename to dotfiles/.config/nvim/after/syntax/python.vim diff --git a/dotfiles/.config/nvim/autoload b/dotfiles/.config/nvim/autoload deleted file mode 120000 index 46e9709..0000000 --- a/dotfiles/.config/nvim/autoload +++ /dev/null @@ -1 +0,0 @@ -library/MattDev_NvimConfig⛺/autoload \ No newline at end of file diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/airline/themes/gruvbox.vim b/dotfiles/.config/nvim/autoload/airline/themes/gruvbox.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/airline/themes/gruvbox.vim rename to dotfiles/.config/nvim/autoload/airline/themes/gruvbox.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/airline/themes/quantum.vim b/dotfiles/.config/nvim/autoload/airline/themes/quantum.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/airline/themes/quantum.vim rename to dotfiles/.config/nvim/autoload/airline/themes/quantum.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/plug.vim b/dotfiles/.config/nvim/autoload/plug.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/plug.vim rename to dotfiles/.config/nvim/autoload/plug.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/plug.vim.old b/dotfiles/.config/nvim/autoload/plug.vim.old similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/autoload/plug.vim.old rename to dotfiles/.config/nvim/autoload/plug.vim.old diff --git a/dotfiles/.config/nvim/coc-settings.json b/dotfiles/.config/nvim/coc-settings.json deleted file mode 120000 index eb2b036..0000000 --- a/dotfiles/.config/nvim/coc-settings.json +++ /dev/null @@ -1 +0,0 @@ -library/MattDev_NvimConfig⛺/coc-settings.json \ No newline at end of file diff --git a/dotfiles/.config/nvim/coc-settings.json b/dotfiles/.config/nvim/coc-settings.json new file mode 100644 index 0000000..434011b --- /dev/null +++ b/dotfiles/.config/nvim/coc-settings.json @@ -0,0 +1,1064 @@ +{ + "$schema": "http://json-schema.org/draft-06/schema", + "description": "Configuration file for coc.nvim", + "additionalProperties": false, + "definitions": { + "languageServerBase": { + "type": "object", + "properties": { + "enable": { + "type": "boolean", + "default": true + }, + "cwd": { + "type": "string", + "default": "", + "description": "Working directory of languageserver, absolute path or relative to workspace folder, use workspace root by default" + }, + "disableDynamicRegister": { + "type": "boolean", + "default": false, + "description": "Disable dynamic registerCapability feature for this languageserver to avoid duplicated feature regstration." + }, + "disableWorkspaceFolders": { + "type": "boolean", + "default": false, + "description": "Disable workspaceFolders feature for this languageserver." + }, + "disableDiagnostics": { + "type": "boolean", + "default": false, + "description": "Disable handle diagnostics for this languageserver." + }, + "disableCompletion": { + "type": "boolean", + "default": false, + "description": "Disable completion feature for this languageserver." + }, + "env": { + "type": "object", + "default": null, + "description": "Environment variables for child process." + }, + "stdioEncoding": { + "type": "string", + "default": "utf8", + "description": "Encoding used for stdio of child process." + }, + "rootPatterns": { + "type": "array", + "default": [], + "description": "Root patterns used to resolve rootPath from current file, default to workspace root", + "items": { + "type": "string" + } + }, + "requireRootPattern": { + "type": "boolean", + "default": false, + "description": "If true, doesn't start server when root pattern not found." + }, + "ignoredRootPaths": { + "type": "array", + "default": [], + "description": "Absolute root paths that language server should not use as rootPath, higher priority than rootPatterns.", + "items": { + "type": "string" + } + }, + "filetypes": { + "type": "array", + "default": [], + "description": "Supported filetypes, add * in array for all filetypes.", + "items": { + "type": "string" + } + }, + "additionalSchemes": { + "type": "array", + "default": [], + "description": "Additional uri schemes, default schemes including file & untitled.", + "items": { + "type": "string" + } + }, + "revealOutputChannelOn": { + "type": "string", + "default": "never", + "description": "Configure message level to show the output channel buffer", + "enum": ["info", "warn", "error", "never"] + }, + "progressOnInitialization": { + "type": "boolean", + "default": true, + "description": "Enable progress report on languageserver initialize." + }, + "initializationOptions": { + "type": "object", + "default": {}, + "description": "initializationOptions passed to languageserver" + }, + "settings": { + "type": "object", + "default": {}, + "description": "Settings of languageserver" + }, + "trace.server": { + "type": "string", + "default": "off", + "enum": ["off", "messages", "verbose"], + "description": "Trace level of communication between server and client" + } + } + }, + "languageServerSocket": { + "type": "object", + "allOf": [{ "$ref": "#/definitions/languageServerBase" }], + "required": ["port", "filetypes"], + "additionalProperties": false, + "properties": { + "port": { + "type": "integer", + "description": "Port number of socket server" + }, + "host": { + "type": "string", + "default": "127.0.0.1", + "description": "Host of server" + }, + "disableWorkspaceFolders": {}, + "disableDynamicRegister": {}, + "disableDiagnostics": {}, + "disableCompletion": {}, + "enable": {}, + "rootPatterns": {}, + "requireRootPattern": {}, + "ignoredRootPaths": {}, + "filetypes": {}, + "additionalSchemes": {}, + "revealOutputChannelOn": {}, + "progressOnInitialization": {}, + "initializationOptions": {}, + "settings": {}, + "stdioEncoding": {}, + "trace.server": {} + } + }, + "languageServerModule": { + "type": "object", + "allOf": [{ "$ref": "#/definitions/languageServerBase" }], + "required": ["module", "filetypes"], + "additionalProperties": false, + "properties": { + "module": { + "type": "string", + "default": "", + "description": "Absolute path of javascript file, should works in IPC mode" + }, + "args": { + "type": "array", + "default": [], + "description": "Extra arguments of module", + "items": { + "type": "string" + } + }, + "runtime": { + "type": "string", + "default": "", + "description": "Absolute path of node runtime." + }, + "execArgv": { + "type": "array", + "default": [], + "description": "Argv passed to node when using module, normally used for debugging, ex: [\"--nolazy\", \"--inspect-brk=6045\"]", + "items": { + "type": "string" + } + }, + "transport": { + "type": "string", + "default": "ipc", + "description": "Transport kind used by server, could be 'ipc', 'stdio', 'socket' and 'pipe'", + "enum": ["ipc", "stdio", "socket", "pipe"] + }, + "transportPort": { + "type": "integer", + "description": "Port number used when transport is 'socket'" + }, + "cwd": {}, + "env": {}, + "enable": {}, + "disableDynamicRegister": {}, + "disableWorkspaceFolders": {}, + "disableDiagnostics": {}, + "disableCompletion": {}, + "rootPatterns": {}, + "requireRootPattern": {}, + "ignoredRootPaths": {}, + "filetypes": {}, + "additionalSchemes": {}, + "revealOutputChannelOn": {}, + "progressOnInitialization": {}, + "initializationOptions": {}, + "stdioEncoding": {}, + "settings": {}, + "trace.server": {} + } + }, + "languageServerCommand": { + "type": "object", + "required": ["command", "filetypes"], + "allOf": [{ "$ref": "#/definitions/languageServerBase" }], + "additionalProperties": false, + "properties": { + "command": { + "type": "string", + "default": "", + "description": "Executable in $PATH to start languageserver, should not used with module" + }, + "args": { + "type": "array", + "default": [], + "description": "Arguments of command", + "items": { + "type": "string" + } + }, + "detached": { + "type": "boolean", + "default": false, + "description": "Detach the languageserver process" + }, + "shell": { + "type": "boolean", + "default": false, + "description": "Use shell for process" + }, + "cwd": {}, + "env": {}, + "enable": {}, + "disableDynamicRegister": {}, + "disableWorkspaceFolders": {}, + "disableDiagnostics": {}, + "disableCompletion": {}, + "rootPatterns": {}, + "requireRootPattern": {}, + "ignoredRootPaths": {}, + "filetypes": {}, + "additionalSchemes": {}, + "revealOutputChannelOn": {}, + "progressOnInitialization": {}, + "initializationOptions": {}, + "stdioEncoding": {}, + "settings": {}, + "trace.server": {} + } + } + }, + "properties": { + "http.proxy": { + "type": "string", + "default": "", + "description": "http proxy uri, used for extensions that send request. Format: proxy-server:1234 or user:password@prox-server:1234 with auth support" + }, + "http.proxyStrictSSL": { + "type": "boolean", + "description": "Controls whether the proxy server certificate should be verified against the list of supplied CAs", + "default": true + }, + "npm.binPath": { + "type": "string", + "default": "npm", + "description": "Command or absolute path to npm or yarn." + }, + "suggest.enablePreselect": { + "type": "boolean", + "description": "Enable preselect feature of LSP, only works on neovim", + "default": false + }, + "suggest.maxPreviewWidth": { + "type": "number", + "default": 80, + "description": "Maximum width of floating preview window." + }, + "suggest.enablePreview": { + "type": "boolean", + "description": "Add preview option to completeopt, default: false.", + "default": false + }, + "suggest.floatEnable": { + "type": "boolean", + "description": "Enable floating window for documentation when possible.", + "default": true + }, + "suggest.labelMaxLength": { + "type": "number", + "description": "Max length of abbr that shown as label of complete item.", + "default": 200 + }, + "suggest.detailMaxLength": { + "type": "number", + "description": "Max length of detail that should be shown in popup menu.", + "default": 100 + }, + "suggest.detailField": { + "type": "string", + "default": "menu", + "description": "Where to add the detail in complete item when it's less than max length.", + "enum": ["abbr", "menu", "preview"] + }, + "suggest.autoTrigger": { + "type": "string", + "default": "always", + "description": "How should completion be triggered", + "enum": ["always", "trigger", "none"] + }, + "suggest.languageSourcePriority": { + "type": "number", + "default": 99, + "description": "Priority of language sources." + }, + "suggest.numberSelect": { + "type": "boolean", + "description": "Input number to select complete item, works on neovim >= 0.4.3 only.", + "default": false + }, + "suggest.disableKind": { + "type": "boolean", + "description": "Remove kind field from vim complete item.", + "default": false + }, + "suggest.disableMenu": { + "type": "boolean", + "description": "Remove menu field from vim complete item.", + "default": false + }, + "suggest.disableMenuShortcut": { + "type": "boolean", + "description": "Disable shortcut of completion source in menu.", + "default": false + }, + "suggest.snippetIndicator": { + "type": "string", + "default": "~", + "description": "The character used in abbr of complete item to indicate the item could be expand as snippet." + }, + "suggest.maxCompleteItemCount": { + "type": "number", + "default": 50, + "description": "Maximum number of complete items shown in vim" + }, + "suggest.preferCompleteThanJumpPlaceholder": { + "type": "boolean", + "description": "Confirm completion instead of jump to next placeholder when completion is activated.", + "default": false + }, + "suggest.fixInsertedWord": { + "type": "boolean", + "description": "Make inserted word replace word characters after cursor position.", + "default": true + }, + "suggest.localityBonus": { + "type": "boolean", + "description": "Boost suggestions that appear closer to the cursor position.", + "default": true + }, + "suggest.triggerAfterInsertEnter": { + "type": "boolean", + "description": "Trigger completion after InsertEnter, auto trigger should be 'always' to enable this option", + "default": false + }, + "suggest.timeout": { + "type": "integer", + "default": 5000, + "minimum": 500, + "maximum": 15000, + "description": "Timeout for completion, in miliseconds." + }, + "suggest.minTriggerInputLength": { + "type": "number", + "default": 1, + "description": "Mininal input length for trigger completion, default 1" + }, + "suggest.triggerCompletionWait": { + "type": "integer", + "default": 50, + "minimum": 30, + "maximum": 500, + "description": "Wait time between text change and completion start, cancel completion when text changed during wait." + }, + "suggest.echodocSupport": { + "type": "boolean", + "default": false, + "description": "When enabled, add function signature to user_data.signature to support echodoc.vim" + }, + "suggest.acceptSuggestionOnCommitCharacter": { + "type": "boolean", + "default": false, + "description": "Controls whether suggestions should be accepted on commit characters. For example, in JavaScript, the semi-colon (`;`) can be a commit character that accepts a suggestion and types that character. Requires CompleteChanged event to work." + }, + "suggest.noselect": { + "type": "boolean", + "description": "Not make vim select first item on completion start", + "default": true + }, + "suggest.keepCompleteopt": { + "type": "boolean", + "description": "When enabled, completeopt is not overriden, auto completion will be disabled if completeopt doesn't have noinsert and noselect.", + "default": false + }, + "suggest.lowPrioritySourceLimit": { + "type": "integer", + "minimum": 1, + "maximum": 100, + "description": "Max items count for source priority lower than 90." + }, + "suggest.highPrioritySourceLimit": { + "type": "integer", + "minimum": 1, + "maximum": 100, + "description": "Max items count for source priority bigger than or equal to 90." + }, + "suggest.removeDuplicateItems": { + "type": "boolean", + "description": "Remove completion items with duplicated word for all sources, snippet items are excluded.", + "default": false + }, + "suggest.defaultSortMethod": { + "type": "string", + "description": "Default sorting behavior for suggested completion items.", + "default": "length", + "enum": ["length", "alphabetical"] + }, + "suggest.completionItemKindLabels": { + "type": "object", + "default": {}, + "description": "Set custom labels to completion items' kinds.", + "properties": { + "text": { "type": "string" }, + "method": { "type": "string" }, + "function": { "type": "string" }, + "constructor": { "type": "string" }, + "field": { "type": "string" }, + "variable": { "type": "string" }, + "class": { "type": "string" }, + "interface": { "type": "string" }, + "module": { "type": "string" }, + "property": { "type": "string" }, + "unit": { "type": "string" }, + "value": { "type": "string" }, + "enum": { "type": "string" }, + "keyword": { "type": "string" }, + "snippet": { "type": "string" }, + "color": { "type": "string" }, + "file": { "type": "string" }, + "reference": { "type": "string" }, + "folder": { "type": "string" }, + "enumMember": { "type": "string" }, + "constant": { "type": "string" }, + "struct": { "type": "string" }, + "event": { "type": "string" }, + "operator": { "type": "string" }, + "typeParameter": { "type": "string" }, + "default": { "type": "string" } + }, + "additionalProperties": false + }, + "suggest.invalidInsertCharacters": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Invalid character for strip valid word when inserting text of complete item.", + "default": [" ", "(", "<", "{", "[", "\r", "\n"] + }, + "suggest.asciiCharactersOnly": { + "type": "boolean", + "description": "Suggest ASCII characters only", + "default": false + }, + "diagnostic.enable": { + "type": "boolean", + "description": "Set to false to disable diagnostic display", + "default": true + }, + "diagnostic.level": { + "type": "string", + "description": "Used for filter diagnostics by diagnostic severity.", + "default": "hint", + "enum": ["hint", "information", "warning", "error"] + }, + "diagnostic.checkCurrentLine": { + "type": "boolean", + "description": "When enabled, show all diagnostics of current line if there are none at the current position.", + "default": false + }, + "diagnostic.messageTarget": { + "type": "string", + "description": "Diagnostic message target.", + "default": "float", + "enum": ["echo", "float"] + }, + "diagnostic.messageDelay": { + "type": "number", + "description": "How long to wait (in milliseconds) before displaying the diagnostic message with echo or float", + "default": 200 + }, + "diagnostic.refreshOnInsertMode": { + "type": "boolean", + "description": "Enable diagnostic refresh on insert mode, default false.", + "default": false + }, + "diagnostic.refreshAfterSave": { + "type": "boolean", + "description": "Only refresh diagnostics after save, default false.", + "default": false + }, + "diagnostic.displayByAle": { + "type": "boolean", + "description": "Use Ale for display diagnostics in vim, will disable coc for display diagnostics, restart required on change.", + "default": false + }, + "diagnostic.virtualText": { + "type": "boolean", + "description": "Use NeoVim virtual text to display diagnostics", + "default": false + }, + "diagnostic.virtualTextCurrentLineOnly": { + "type": "boolean", + "description": "Only show virtualText diagnostic on current cursor line", + "default": true + }, + "diagnostic.virtualTextPrefix": { + "type": "string", + "description": "The prefix added virtual text diagnostics", + "default": " " + }, + "diagnostic.virtualTextLines": { + "type": "number", + "description": "The number of non empty lines from a diagnostic to display", + "default": 3 + }, + "diagnostic.virtualTextLineSeparator": { + "type": "string", + "description": "The text that will mark a line end from the diagnostic message", + "default": " \\ " + }, + "diagnostic.enableSign": { + "type": "boolean", + "default": true, + "description": "Enable signs for diagnostics." + }, + "diagnostic.enableHighlightLineNumber": { + "type": "boolean", + "default": true, + "description": "Enable highlighting line numbers for diagnostics, only works with neovim and diagnostic.enableSign is true." + }, + "diagnostic.enableMessage": { + "type": "string", + "default": "always", + "description": "When to enable show messages of diagnostics.", + "enum": ["always", "jump", "never"] + }, + "diagnostic.highlightOffset": { + "type": "number", + "description": "Offset number of buffer.addHighlight, neovim only.", + "default": 1000 + }, + "diagnostic.signOffset": { + "type": "number", + "description": "Offset number of sign", + "default": 1000 + }, + "diagnostic.errorSign": { + "type": "string", + "description": "Text of error sign", + "default": ">>" + }, + "diagnostic.warningSign": { + "type": "string", + "description": "Text of warning sign", + "default": "⚠" + }, + "diagnostic.infoSign": { + "type": "string", + "description": "Text of info sign", + "default": ">>" + }, + "diagnostic.hintSign": { + "type": "string", + "description": "Text of hint sign", + "default": ">>" + }, + "diagnostic.maxWindowHeight": { + "type": "number", + "description": "Maximum height of diagnostics floating window.", + "default": 8 + }, + "diagnostic.maxWindowWidth": { + "type": "number", + "description": "Maximum width of diagnostics floating window.", + "default": 80 + }, + "diagnostic.filetypeMap": { + "type": "object", + "description": "A map between buffer filetype and the filetype assigned to diagnostics. To syntax highlight diagnostics withs their parent buffer type use `\"default\": \"bufferType\"`", + "default": {} + }, + "diagnostic.format": { + "type": "string", + "description": "Define the diagnostic format. Available parts: source, code, severity, message", + "default": "[%source%code] [%severity] %message" + }, + "diagnostic.separateRelatedInformationAsDiagnostics": { + "type": "boolean", + "default": false, + "description": "Separate related information as diagnostics" + }, + "signature.enable": { + "type": "boolean", + "description": "Enable signature help when trigger character typed, require restart service on change.", + "default": true + }, + "signature.triggerSignatureWait": { + "type": "integer", + "default": 50, + "minimum": 50, + "maximum": 300, + "description": "Timeout for trigger signature help, in miliseconds." + }, + "signature.target": { + "type": "string", + "description": "Target of signature help, use float when possible by default.", + "enum": ["float", "echo"] + }, + "signature.floatMaxWidth": { + "type": "integer", + "default": 60, + "description": "Max width of signature float window." + }, + "signature.preferShownAbove": { + "type": "boolean", + "description": "Show signature help float window above cursor when possible, require restart service on change.", + "default": true + }, + "signature.hideOnTextChange": { + "type": "boolean", + "description": "Hide signature float window when text changed, require restart service on change.", + "default": false + }, + "signature.maxWindowHeight": { + "type": "number", + "description": "Maximum height of floating signature help window.", + "default": 8 + }, + "codeLens.enable": { + "type": "boolean", + "description": "Enable codeLens feature, require neovim with set virtual text feature.", + "default": false + }, + "codeLens.separator": { + "type": "string", + "description": "Separator text for codeLens in virtual text", + "default": "‣" + }, + "codeLens.subseparator": { + "type": "string", + "description": "Subseparator between codeLenses in virtual text", + "default": " " + }, + "refactor.openCommand": { + "type": "string", + "description": "Open command for refactor window.", + "default": "vsplit" + }, + "refactor.beforeContext": { + "type": "number", + "default": 3, + "description": "Print num lines of leading context before each match." + }, + "refactor.afterContext": { + "type": "number", + "default": 3, + "description": "Print num lines of trailing context after each match." + }, + "workspace.ignoredFiletypes": { + "type": "array", + "default": ["markdown", "log", "txt", "help"], + "description": "Filetypes that should be ignored for resolve workspace folder.", + "items": { + "type": "string" + } + }, + "list.indicator": { + "type": "string", + "default": ">", + "description": "The character used as first character in prompt line" + }, + "list.interactiveDebounceTime": { + "type": "number", + "default": 100, + "description": "Debouce time for input change on interactive mode." + }, + "list.maxHeight": { + "type": "number", + "default": 10, + "description": "Maximum height of list window." + }, + "list.minHeight": { + "type": "number", + "default": 1, + "description": "Minimum height of list window." + }, + "list.signOffset": { + "type": "number", + "default": 900, + "description": "Sign offset of list, should be different from other plugins." + }, + "list.selectedSignText": { + "type": "string", + "default": "*", + "description": "Sign text for selected lines." + }, + "list.extendedSearchMode": { + "type": "boolean", + "default": true, + "description": "Enable extended search mode which allows multiple search patterns delimited by spaces." + }, + "list.autoResize": { + "type": "boolean", + "default": true, + "description": "Enable auto resize feature." + }, + "list.limitLines": { + "type": "number", + "default": 30000, + "description": "Limit lines for list buffer." + }, + "list.maxPreviewHeight": { + "type": "number", + "default": 12, + "description": "Max height for preview window of list." + }, + "list.previewSplitRight": { + "type": "boolean", + "default": false, + "description": "Use vsplit for preview window." + }, + "list.previewHighlightGroup": { + "type": "string", + "default": "Search", + "description": "Highlight group used for highlight the range in preview window." + }, + "list.nextKeymap": { + "type": "string", + "default": "", + "description": "Key used for select next line on insert mode." + }, + "list.previousKeymap": { + "type": "string", + "default": "", + "description": "Key used for select previous line on insert mode." + }, + "list.normalMappings": { + "type": "object", + "default": {}, + "description": "Custom keymappings on normal mode." + }, + "list.insertMappings": { + "type": "object", + "default": {}, + "description": "Custom keymappings on insert mode." + }, + "list.source.symbols.excludes": { + "type": "array", + "default": [], + "description": "Patterns of mimimatch for filepath to execlude from symbols list.", + "items": { + "type": "string" + } + }, + "list.source.outline.ctagsFilestypes": { + "type": "array", + "default": [], + "description": "Filetypes that should use ctags for outline instead of language server.", + "items": { + "type": "string" + } + }, + "cursors.cancelKey": { + "type": "string", + "default": "", + "description": "Key used for cancel cursors session." + }, + "cursors.nextKey": { + "type": "string", + "default": "", + "description": "Key used for jump to next cursors position. " + }, + "cursors.previousKey": { + "type": "string", + "default": "", + "description": "Key used for jump to previous cursors position." + }, + "coc.preferences.maxFileSize": { + "type": "string", + "default": "10MB", + "description": "Maximum file size in bytes that coc.nvim should handle, default '10MB'" + }, + "coc.preferences.promptWorkspaceEdit": { + "type": "boolean", + "description": "Prompt confirm from user when apply workspace edit for unloaded files.", + "default": true + }, + "coc.preferences.listOfWorkspaceEdit": { + "type": "string", + "default": "quickfix", + "description": "List should contains changed locations after workspace edit, default to vim's quickfix", + "enum": ["quickfix", "location", "none"] + }, + "coc.preferences.useQuickfixForLocations": { + "type": "boolean", + "description": "Use vim's quickfix list for jump locations,\n need restart on change.", + "default": false + }, + "coc.preferences.extensionUpdateCheck": { + "type": "string", + "default": "never", + "description": "Interval for check extension update, could be daily, weekly, never", + "enum": ["daily", "weekly", "never"] + }, + "coc.preferences.snippetStatusText": { + "type": "string", + "default": "SNIP", + "description": "Text shown in statusline to indicate snippet session is activated." + }, + "coc.preferences.hoverTarget": { + "type": "string", + "description": "Target to show hover information, default is floating window when possible.", + "enum": ["preview", "echo", "float"] + }, + "coc.preferences.colorSupport": { + "type": "boolean", + "description": "Enable color highlight if language server support it.", + "default": true + }, + "coc.preferences.previewAutoClose": { + "type": "boolean", + "description": "Auto close preview window on cursor move.", + "default": true + }, + "coc.preferences.previewMaxHeight": { + "type": "number", + "default": 12, + "description": "Max height of preview window for hover." + }, + "coc.preferences.currentFunctionSymbolAutoUpdate": { + "type": "boolean", + "description": "Automatically update the value of b:coc_current_function on CursorHold event", + "default": false + }, + "coc.preferences.formatOnSaveFiletypes": { + "type": "array", + "default": [], + "description": "Filetypes that should run format on save.", + "items": { + "type": "string" + } + }, + "coc.preferences.formatOnInsertLeave": { + "type": "boolean", + "description": "Trigger format on type when insert leave by send \n to the server.", + "default": false + }, + "coc.preferences.enableFloatHighlight": { + "type": "boolean", + "description": "Enable highlight for floating window.", + "default": true + }, + "coc.preferences.rootPatterns": { + "type": "array", + "default": [".git", ".hg", ".projections.json"], + "description": "Root patterns to resolve workspaceFolder from parent folders of opened files, resolved from up to down.", + "items": { + "type": "string" + } + }, + "coc.preferences.watchmanPath": { + "type": "string", + "description": "executable path for https://facebook.github.io/watchman/, detected from $PATH by default", + "default": null + }, + "coc.preferences.jumpCommand": { + "type": "string", + "description": "Command used for location jump, like goto definition, goto references etc.", + "default": "edit" + }, + "coc.preferences.messageLevel": { + "type": "string", + "description": "Message level for filter echoed messages, could be 'more', 'warning' and 'error'", + "default": "more", + "enum": ["more", "warning", "error"] + }, + "coc.preferences.bracketEnterImprove": { + "type": "boolean", + "description": "Improve enter inside bracket `<> {} [] ()` by add new empty line below and place cursor to it. Works with `coc#on_enter()`", + "default": true + }, + "coc.preferences.formatOnType": { + "type": "boolean", + "description": "Set to true to enable format on type", + "default": false + }, + "coc.preferences.formatOnTypeFiletypes": { + "type": "array", + "default": [], + "description": "Filetypes that should run format on typing. Only take effect when `coc.preferences.formatOnType` set `true`", + "items": { + "type": "string" + } + }, + "coc.preferences.highlightTimeout": { + "type": "integer", + "default": 500, + "minimum": 200, + "maximum": 5000, + "description": "Highlight timeout for buffer in floating window." + }, + "coc.preferences.snippets.enable": { + "type": "boolean", + "description": "Set to false to disable snippets support.", + "default": true + }, + "coc.source.around.enable": { + "type": "boolean", + "default": true + }, + "coc.source.around.firstMatch": { + "type": "boolean", + "description": "Filter complete items by first letter strict match.", + "default": true + }, + "coc.source.around.shortcut": { + "type": "string", + "default": "A" + }, + "coc.source.around.priority": { + "type": "integer", + "default": 1 + }, + "coc.source.around.disableSyntaxes": { + "type": "array", + "default": [], + "items": { + "type": "string" + } + }, + "coc.source.buffer.enable": { + "type": "boolean", + "default": true + }, + "coc.source.buffer.shortcut": { + "type": "string", + "default": "B" + }, + "coc.source.buffer.priority": { + "type": "integer", + "default": 1 + }, + "coc.source.buffer.firstMatch": { + "type": "boolean", + "description": "Filter complete items by first letter strict match.", + "default": true + }, + "coc.source.buffer.ignoreGitignore": { + "type": "boolean", + "default": true, + "description": "Ignore git ignored files for buffer words" + }, + "coc.source.buffer.disableSyntaxes": { + "type": "array", + "default": [], + "items": { + "type": "string" + } + }, + "coc.source.file.enable": { + "type": "boolean", + "default": true + }, + "coc.source.file.shortcut": { + "type": "string", + "default": "F" + }, + "coc.source.file.priority": { + "type": "integer", + "default": 10 + }, + "coc.source.file.disableSyntaxes": { + "type": "array", + "default": [], + "items": { + "type": "string" + } + }, + "coc.source.file.triggerCharacters": { + "type": "array", + "default": ["/"], + "items": { + "type": "string" + } + }, + "coc.source.file.trimSameExts": { + "type": "array", + "default": [".ts", ".js"], + "description": "Trim same extension on file completion", + "items": { + "type": "string" + } + }, + "coc.source.file.ignoreHidden": { + "type": "boolean", + "default": true, + "description": "Ignore completion for hidden files" + }, + "coc.source.file.ignorePatterns": { + "type": "array", + "default": [], + "description": "Ignore patterns of matcher", + "items": { + "type": "string" + } + }, + "languageserver": { + "type": "object", + "default": {}, + "description": "Dictionary of languageservers, key is used as id of languageserver.", + "patternProperties": { + "^[_a-zA-Z]+$": { + "oneOf": [ + { + "$ref": "#/definitions/languageServerModule" + }, + { + "$ref": "#/definitions/languageServerCommand" + }, + { + "$ref": "#/definitions/languageServerSocket" + } + ] + } + } + } + }, + "cSpell.ignoreWords": [ + "", + "postgresql", + "pytest", + "sigint", + "trainsets" + ], + "clangd.path": "/home/matt/.config/coc/extensions/coc-clangd-data/install/10.0.0/clangd_10.0.0/bin/clangd" + } + diff --git a/dotfiles/.config/nvim/colors b/dotfiles/.config/nvim/colors deleted file mode 120000 index ccc1b70..0000000 --- a/dotfiles/.config/nvim/colors +++ /dev/null @@ -1 +0,0 @@ -library/MattDev_NvimConfig⛺/colors \ No newline at end of file diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/PaperColor.vim b/dotfiles/.config/nvim/colors/PaperColor.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/PaperColor.vim rename to dotfiles/.config/nvim/colors/PaperColor.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/badwolf.vim b/dotfiles/.config/nvim/colors/badwolf.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/badwolf.vim rename to dotfiles/.config/nvim/colors/badwolf.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/jellybeans.vim b/dotfiles/.config/nvim/colors/jellybeans.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/jellybeans.vim rename to dotfiles/.config/nvim/colors/jellybeans.vim diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/quantum.vim b/dotfiles/.config/nvim/colors/quantum.vim similarity index 100% rename from dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/colors/quantum.vim rename to dotfiles/.config/nvim/colors/quantum.vim diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim deleted file mode 120000 index 471c23c..0000000 --- a/dotfiles/.config/nvim/init.vim +++ /dev/null @@ -1 +0,0 @@ -library/MattDev_NvimConfig⛺/init.vim \ No newline at end of file diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim new file mode 100644 index 0000000..3e28835 --- /dev/null +++ b/dotfiles/.config/nvim/init.vim @@ -0,0 +1,29 @@ +runtime plugins.vim +runtime settings.vim +runtime themes.vim +runtime autocommands.vim +runtime coc.vim +runtime keys.vim + +" Check code as python3 by default +let g:neomake_python_python_maker = neomake#makers#ft#python#python() +let g:neomake_python_flake8_maker = neomake#makers#ft#python#flake8() +let g:neomake_python_python_maker.exe = 'python3 -m py_compile' +let g:neomake_python_flake8_maker.exe = 'python3 -m flake8' + +" Disable error messages inside the buffer, next to the problematic line +let g:neomake_virtualtext_current_error = 1 + +"------------------------------------------------------------------------------ +" Shawn Anderson as of September 30th 2020 +noremap f 0 +noremap j $ +set ignorecase " ignores case of letters on searches +set smartcase " Override the 'ignorecase' option if the search pattern contains upper case characters +map / :nohl +noremap jj +noremap kk + +" This makes the location of the current open file always the current working +" directory of vim. This pairs very nicely with tmux. Added - Sept 15th 2020 +autocmd BufEnter * lcd %:p:h diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/coc-settings.json b/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/coc-settings.json deleted file mode 100644 index 434011b..0000000 --- a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/coc-settings.json +++ /dev/null @@ -1,1064 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema", - "description": "Configuration file for coc.nvim", - "additionalProperties": false, - "definitions": { - "languageServerBase": { - "type": "object", - "properties": { - "enable": { - "type": "boolean", - "default": true - }, - "cwd": { - "type": "string", - "default": "", - "description": "Working directory of languageserver, absolute path or relative to workspace folder, use workspace root by default" - }, - "disableDynamicRegister": { - "type": "boolean", - "default": false, - "description": "Disable dynamic registerCapability feature for this languageserver to avoid duplicated feature regstration." - }, - "disableWorkspaceFolders": { - "type": "boolean", - "default": false, - "description": "Disable workspaceFolders feature for this languageserver." - }, - "disableDiagnostics": { - "type": "boolean", - "default": false, - "description": "Disable handle diagnostics for this languageserver." - }, - "disableCompletion": { - "type": "boolean", - "default": false, - "description": "Disable completion feature for this languageserver." - }, - "env": { - "type": "object", - "default": null, - "description": "Environment variables for child process." - }, - "stdioEncoding": { - "type": "string", - "default": "utf8", - "description": "Encoding used for stdio of child process." - }, - "rootPatterns": { - "type": "array", - "default": [], - "description": "Root patterns used to resolve rootPath from current file, default to workspace root", - "items": { - "type": "string" - } - }, - "requireRootPattern": { - "type": "boolean", - "default": false, - "description": "If true, doesn't start server when root pattern not found." - }, - "ignoredRootPaths": { - "type": "array", - "default": [], - "description": "Absolute root paths that language server should not use as rootPath, higher priority than rootPatterns.", - "items": { - "type": "string" - } - }, - "filetypes": { - "type": "array", - "default": [], - "description": "Supported filetypes, add * in array for all filetypes.", - "items": { - "type": "string" - } - }, - "additionalSchemes": { - "type": "array", - "default": [], - "description": "Additional uri schemes, default schemes including file & untitled.", - "items": { - "type": "string" - } - }, - "revealOutputChannelOn": { - "type": "string", - "default": "never", - "description": "Configure message level to show the output channel buffer", - "enum": ["info", "warn", "error", "never"] - }, - "progressOnInitialization": { - "type": "boolean", - "default": true, - "description": "Enable progress report on languageserver initialize." - }, - "initializationOptions": { - "type": "object", - "default": {}, - "description": "initializationOptions passed to languageserver" - }, - "settings": { - "type": "object", - "default": {}, - "description": "Settings of languageserver" - }, - "trace.server": { - "type": "string", - "default": "off", - "enum": ["off", "messages", "verbose"], - "description": "Trace level of communication between server and client" - } - } - }, - "languageServerSocket": { - "type": "object", - "allOf": [{ "$ref": "#/definitions/languageServerBase" }], - "required": ["port", "filetypes"], - "additionalProperties": false, - "properties": { - "port": { - "type": "integer", - "description": "Port number of socket server" - }, - "host": { - "type": "string", - "default": "127.0.0.1", - "description": "Host of server" - }, - "disableWorkspaceFolders": {}, - "disableDynamicRegister": {}, - "disableDiagnostics": {}, - "disableCompletion": {}, - "enable": {}, - "rootPatterns": {}, - "requireRootPattern": {}, - "ignoredRootPaths": {}, - "filetypes": {}, - "additionalSchemes": {}, - "revealOutputChannelOn": {}, - "progressOnInitialization": {}, - "initializationOptions": {}, - "settings": {}, - "stdioEncoding": {}, - "trace.server": {} - } - }, - "languageServerModule": { - "type": "object", - "allOf": [{ "$ref": "#/definitions/languageServerBase" }], - "required": ["module", "filetypes"], - "additionalProperties": false, - "properties": { - "module": { - "type": "string", - "default": "", - "description": "Absolute path of javascript file, should works in IPC mode" - }, - "args": { - "type": "array", - "default": [], - "description": "Extra arguments of module", - "items": { - "type": "string" - } - }, - "runtime": { - "type": "string", - "default": "", - "description": "Absolute path of node runtime." - }, - "execArgv": { - "type": "array", - "default": [], - "description": "Argv passed to node when using module, normally used for debugging, ex: [\"--nolazy\", \"--inspect-brk=6045\"]", - "items": { - "type": "string" - } - }, - "transport": { - "type": "string", - "default": "ipc", - "description": "Transport kind used by server, could be 'ipc', 'stdio', 'socket' and 'pipe'", - "enum": ["ipc", "stdio", "socket", "pipe"] - }, - "transportPort": { - "type": "integer", - "description": "Port number used when transport is 'socket'" - }, - "cwd": {}, - "env": {}, - "enable": {}, - "disableDynamicRegister": {}, - "disableWorkspaceFolders": {}, - "disableDiagnostics": {}, - "disableCompletion": {}, - "rootPatterns": {}, - "requireRootPattern": {}, - "ignoredRootPaths": {}, - "filetypes": {}, - "additionalSchemes": {}, - "revealOutputChannelOn": {}, - "progressOnInitialization": {}, - "initializationOptions": {}, - "stdioEncoding": {}, - "settings": {}, - "trace.server": {} - } - }, - "languageServerCommand": { - "type": "object", - "required": ["command", "filetypes"], - "allOf": [{ "$ref": "#/definitions/languageServerBase" }], - "additionalProperties": false, - "properties": { - "command": { - "type": "string", - "default": "", - "description": "Executable in $PATH to start languageserver, should not used with module" - }, - "args": { - "type": "array", - "default": [], - "description": "Arguments of command", - "items": { - "type": "string" - } - }, - "detached": { - "type": "boolean", - "default": false, - "description": "Detach the languageserver process" - }, - "shell": { - "type": "boolean", - "default": false, - "description": "Use shell for process" - }, - "cwd": {}, - "env": {}, - "enable": {}, - "disableDynamicRegister": {}, - "disableWorkspaceFolders": {}, - "disableDiagnostics": {}, - "disableCompletion": {}, - "rootPatterns": {}, - "requireRootPattern": {}, - "ignoredRootPaths": {}, - "filetypes": {}, - "additionalSchemes": {}, - "revealOutputChannelOn": {}, - "progressOnInitialization": {}, - "initializationOptions": {}, - "stdioEncoding": {}, - "settings": {}, - "trace.server": {} - } - } - }, - "properties": { - "http.proxy": { - "type": "string", - "default": "", - "description": "http proxy uri, used for extensions that send request. Format: proxy-server:1234 or user:password@prox-server:1234 with auth support" - }, - "http.proxyStrictSSL": { - "type": "boolean", - "description": "Controls whether the proxy server certificate should be verified against the list of supplied CAs", - "default": true - }, - "npm.binPath": { - "type": "string", - "default": "npm", - "description": "Command or absolute path to npm or yarn." - }, - "suggest.enablePreselect": { - "type": "boolean", - "description": "Enable preselect feature of LSP, only works on neovim", - "default": false - }, - "suggest.maxPreviewWidth": { - "type": "number", - "default": 80, - "description": "Maximum width of floating preview window." - }, - "suggest.enablePreview": { - "type": "boolean", - "description": "Add preview option to completeopt, default: false.", - "default": false - }, - "suggest.floatEnable": { - "type": "boolean", - "description": "Enable floating window for documentation when possible.", - "default": true - }, - "suggest.labelMaxLength": { - "type": "number", - "description": "Max length of abbr that shown as label of complete item.", - "default": 200 - }, - "suggest.detailMaxLength": { - "type": "number", - "description": "Max length of detail that should be shown in popup menu.", - "default": 100 - }, - "suggest.detailField": { - "type": "string", - "default": "menu", - "description": "Where to add the detail in complete item when it's less than max length.", - "enum": ["abbr", "menu", "preview"] - }, - "suggest.autoTrigger": { - "type": "string", - "default": "always", - "description": "How should completion be triggered", - "enum": ["always", "trigger", "none"] - }, - "suggest.languageSourcePriority": { - "type": "number", - "default": 99, - "description": "Priority of language sources." - }, - "suggest.numberSelect": { - "type": "boolean", - "description": "Input number to select complete item, works on neovim >= 0.4.3 only.", - "default": false - }, - "suggest.disableKind": { - "type": "boolean", - "description": "Remove kind field from vim complete item.", - "default": false - }, - "suggest.disableMenu": { - "type": "boolean", - "description": "Remove menu field from vim complete item.", - "default": false - }, - "suggest.disableMenuShortcut": { - "type": "boolean", - "description": "Disable shortcut of completion source in menu.", - "default": false - }, - "suggest.snippetIndicator": { - "type": "string", - "default": "~", - "description": "The character used in abbr of complete item to indicate the item could be expand as snippet." - }, - "suggest.maxCompleteItemCount": { - "type": "number", - "default": 50, - "description": "Maximum number of complete items shown in vim" - }, - "suggest.preferCompleteThanJumpPlaceholder": { - "type": "boolean", - "description": "Confirm completion instead of jump to next placeholder when completion is activated.", - "default": false - }, - "suggest.fixInsertedWord": { - "type": "boolean", - "description": "Make inserted word replace word characters after cursor position.", - "default": true - }, - "suggest.localityBonus": { - "type": "boolean", - "description": "Boost suggestions that appear closer to the cursor position.", - "default": true - }, - "suggest.triggerAfterInsertEnter": { - "type": "boolean", - "description": "Trigger completion after InsertEnter, auto trigger should be 'always' to enable this option", - "default": false - }, - "suggest.timeout": { - "type": "integer", - "default": 5000, - "minimum": 500, - "maximum": 15000, - "description": "Timeout for completion, in miliseconds." - }, - "suggest.minTriggerInputLength": { - "type": "number", - "default": 1, - "description": "Mininal input length for trigger completion, default 1" - }, - "suggest.triggerCompletionWait": { - "type": "integer", - "default": 50, - "minimum": 30, - "maximum": 500, - "description": "Wait time between text change and completion start, cancel completion when text changed during wait." - }, - "suggest.echodocSupport": { - "type": "boolean", - "default": false, - "description": "When enabled, add function signature to user_data.signature to support echodoc.vim" - }, - "suggest.acceptSuggestionOnCommitCharacter": { - "type": "boolean", - "default": false, - "description": "Controls whether suggestions should be accepted on commit characters. For example, in JavaScript, the semi-colon (`;`) can be a commit character that accepts a suggestion and types that character. Requires CompleteChanged event to work." - }, - "suggest.noselect": { - "type": "boolean", - "description": "Not make vim select first item on completion start", - "default": true - }, - "suggest.keepCompleteopt": { - "type": "boolean", - "description": "When enabled, completeopt is not overriden, auto completion will be disabled if completeopt doesn't have noinsert and noselect.", - "default": false - }, - "suggest.lowPrioritySourceLimit": { - "type": "integer", - "minimum": 1, - "maximum": 100, - "description": "Max items count for source priority lower than 90." - }, - "suggest.highPrioritySourceLimit": { - "type": "integer", - "minimum": 1, - "maximum": 100, - "description": "Max items count for source priority bigger than or equal to 90." - }, - "suggest.removeDuplicateItems": { - "type": "boolean", - "description": "Remove completion items with duplicated word for all sources, snippet items are excluded.", - "default": false - }, - "suggest.defaultSortMethod": { - "type": "string", - "description": "Default sorting behavior for suggested completion items.", - "default": "length", - "enum": ["length", "alphabetical"] - }, - "suggest.completionItemKindLabels": { - "type": "object", - "default": {}, - "description": "Set custom labels to completion items' kinds.", - "properties": { - "text": { "type": "string" }, - "method": { "type": "string" }, - "function": { "type": "string" }, - "constructor": { "type": "string" }, - "field": { "type": "string" }, - "variable": { "type": "string" }, - "class": { "type": "string" }, - "interface": { "type": "string" }, - "module": { "type": "string" }, - "property": { "type": "string" }, - "unit": { "type": "string" }, - "value": { "type": "string" }, - "enum": { "type": "string" }, - "keyword": { "type": "string" }, - "snippet": { "type": "string" }, - "color": { "type": "string" }, - "file": { "type": "string" }, - "reference": { "type": "string" }, - "folder": { "type": "string" }, - "enumMember": { "type": "string" }, - "constant": { "type": "string" }, - "struct": { "type": "string" }, - "event": { "type": "string" }, - "operator": { "type": "string" }, - "typeParameter": { "type": "string" }, - "default": { "type": "string" } - }, - "additionalProperties": false - }, - "suggest.invalidInsertCharacters": { - "type": "array", - "items": { - "type": "string" - }, - "description": "Invalid character for strip valid word when inserting text of complete item.", - "default": [" ", "(", "<", "{", "[", "\r", "\n"] - }, - "suggest.asciiCharactersOnly": { - "type": "boolean", - "description": "Suggest ASCII characters only", - "default": false - }, - "diagnostic.enable": { - "type": "boolean", - "description": "Set to false to disable diagnostic display", - "default": true - }, - "diagnostic.level": { - "type": "string", - "description": "Used for filter diagnostics by diagnostic severity.", - "default": "hint", - "enum": ["hint", "information", "warning", "error"] - }, - "diagnostic.checkCurrentLine": { - "type": "boolean", - "description": "When enabled, show all diagnostics of current line if there are none at the current position.", - "default": false - }, - "diagnostic.messageTarget": { - "type": "string", - "description": "Diagnostic message target.", - "default": "float", - "enum": ["echo", "float"] - }, - "diagnostic.messageDelay": { - "type": "number", - "description": "How long to wait (in milliseconds) before displaying the diagnostic message with echo or float", - "default": 200 - }, - "diagnostic.refreshOnInsertMode": { - "type": "boolean", - "description": "Enable diagnostic refresh on insert mode, default false.", - "default": false - }, - "diagnostic.refreshAfterSave": { - "type": "boolean", - "description": "Only refresh diagnostics after save, default false.", - "default": false - }, - "diagnostic.displayByAle": { - "type": "boolean", - "description": "Use Ale for display diagnostics in vim, will disable coc for display diagnostics, restart required on change.", - "default": false - }, - "diagnostic.virtualText": { - "type": "boolean", - "description": "Use NeoVim virtual text to display diagnostics", - "default": false - }, - "diagnostic.virtualTextCurrentLineOnly": { - "type": "boolean", - "description": "Only show virtualText diagnostic on current cursor line", - "default": true - }, - "diagnostic.virtualTextPrefix": { - "type": "string", - "description": "The prefix added virtual text diagnostics", - "default": " " - }, - "diagnostic.virtualTextLines": { - "type": "number", - "description": "The number of non empty lines from a diagnostic to display", - "default": 3 - }, - "diagnostic.virtualTextLineSeparator": { - "type": "string", - "description": "The text that will mark a line end from the diagnostic message", - "default": " \\ " - }, - "diagnostic.enableSign": { - "type": "boolean", - "default": true, - "description": "Enable signs for diagnostics." - }, - "diagnostic.enableHighlightLineNumber": { - "type": "boolean", - "default": true, - "description": "Enable highlighting line numbers for diagnostics, only works with neovim and diagnostic.enableSign is true." - }, - "diagnostic.enableMessage": { - "type": "string", - "default": "always", - "description": "When to enable show messages of diagnostics.", - "enum": ["always", "jump", "never"] - }, - "diagnostic.highlightOffset": { - "type": "number", - "description": "Offset number of buffer.addHighlight, neovim only.", - "default": 1000 - }, - "diagnostic.signOffset": { - "type": "number", - "description": "Offset number of sign", - "default": 1000 - }, - "diagnostic.errorSign": { - "type": "string", - "description": "Text of error sign", - "default": ">>" - }, - "diagnostic.warningSign": { - "type": "string", - "description": "Text of warning sign", - "default": "⚠" - }, - "diagnostic.infoSign": { - "type": "string", - "description": "Text of info sign", - "default": ">>" - }, - "diagnostic.hintSign": { - "type": "string", - "description": "Text of hint sign", - "default": ">>" - }, - "diagnostic.maxWindowHeight": { - "type": "number", - "description": "Maximum height of diagnostics floating window.", - "default": 8 - }, - "diagnostic.maxWindowWidth": { - "type": "number", - "description": "Maximum width of diagnostics floating window.", - "default": 80 - }, - "diagnostic.filetypeMap": { - "type": "object", - "description": "A map between buffer filetype and the filetype assigned to diagnostics. To syntax highlight diagnostics withs their parent buffer type use `\"default\": \"bufferType\"`", - "default": {} - }, - "diagnostic.format": { - "type": "string", - "description": "Define the diagnostic format. Available parts: source, code, severity, message", - "default": "[%source%code] [%severity] %message" - }, - "diagnostic.separateRelatedInformationAsDiagnostics": { - "type": "boolean", - "default": false, - "description": "Separate related information as diagnostics" - }, - "signature.enable": { - "type": "boolean", - "description": "Enable signature help when trigger character typed, require restart service on change.", - "default": true - }, - "signature.triggerSignatureWait": { - "type": "integer", - "default": 50, - "minimum": 50, - "maximum": 300, - "description": "Timeout for trigger signature help, in miliseconds." - }, - "signature.target": { - "type": "string", - "description": "Target of signature help, use float when possible by default.", - "enum": ["float", "echo"] - }, - "signature.floatMaxWidth": { - "type": "integer", - "default": 60, - "description": "Max width of signature float window." - }, - "signature.preferShownAbove": { - "type": "boolean", - "description": "Show signature help float window above cursor when possible, require restart service on change.", - "default": true - }, - "signature.hideOnTextChange": { - "type": "boolean", - "description": "Hide signature float window when text changed, require restart service on change.", - "default": false - }, - "signature.maxWindowHeight": { - "type": "number", - "description": "Maximum height of floating signature help window.", - "default": 8 - }, - "codeLens.enable": { - "type": "boolean", - "description": "Enable codeLens feature, require neovim with set virtual text feature.", - "default": false - }, - "codeLens.separator": { - "type": "string", - "description": "Separator text for codeLens in virtual text", - "default": "‣" - }, - "codeLens.subseparator": { - "type": "string", - "description": "Subseparator between codeLenses in virtual text", - "default": " " - }, - "refactor.openCommand": { - "type": "string", - "description": "Open command for refactor window.", - "default": "vsplit" - }, - "refactor.beforeContext": { - "type": "number", - "default": 3, - "description": "Print num lines of leading context before each match." - }, - "refactor.afterContext": { - "type": "number", - "default": 3, - "description": "Print num lines of trailing context after each match." - }, - "workspace.ignoredFiletypes": { - "type": "array", - "default": ["markdown", "log", "txt", "help"], - "description": "Filetypes that should be ignored for resolve workspace folder.", - "items": { - "type": "string" - } - }, - "list.indicator": { - "type": "string", - "default": ">", - "description": "The character used as first character in prompt line" - }, - "list.interactiveDebounceTime": { - "type": "number", - "default": 100, - "description": "Debouce time for input change on interactive mode." - }, - "list.maxHeight": { - "type": "number", - "default": 10, - "description": "Maximum height of list window." - }, - "list.minHeight": { - "type": "number", - "default": 1, - "description": "Minimum height of list window." - }, - "list.signOffset": { - "type": "number", - "default": 900, - "description": "Sign offset of list, should be different from other plugins." - }, - "list.selectedSignText": { - "type": "string", - "default": "*", - "description": "Sign text for selected lines." - }, - "list.extendedSearchMode": { - "type": "boolean", - "default": true, - "description": "Enable extended search mode which allows multiple search patterns delimited by spaces." - }, - "list.autoResize": { - "type": "boolean", - "default": true, - "description": "Enable auto resize feature." - }, - "list.limitLines": { - "type": "number", - "default": 30000, - "description": "Limit lines for list buffer." - }, - "list.maxPreviewHeight": { - "type": "number", - "default": 12, - "description": "Max height for preview window of list." - }, - "list.previewSplitRight": { - "type": "boolean", - "default": false, - "description": "Use vsplit for preview window." - }, - "list.previewHighlightGroup": { - "type": "string", - "default": "Search", - "description": "Highlight group used for highlight the range in preview window." - }, - "list.nextKeymap": { - "type": "string", - "default": "", - "description": "Key used for select next line on insert mode." - }, - "list.previousKeymap": { - "type": "string", - "default": "", - "description": "Key used for select previous line on insert mode." - }, - "list.normalMappings": { - "type": "object", - "default": {}, - "description": "Custom keymappings on normal mode." - }, - "list.insertMappings": { - "type": "object", - "default": {}, - "description": "Custom keymappings on insert mode." - }, - "list.source.symbols.excludes": { - "type": "array", - "default": [], - "description": "Patterns of mimimatch for filepath to execlude from symbols list.", - "items": { - "type": "string" - } - }, - "list.source.outline.ctagsFilestypes": { - "type": "array", - "default": [], - "description": "Filetypes that should use ctags for outline instead of language server.", - "items": { - "type": "string" - } - }, - "cursors.cancelKey": { - "type": "string", - "default": "", - "description": "Key used for cancel cursors session." - }, - "cursors.nextKey": { - "type": "string", - "default": "", - "description": "Key used for jump to next cursors position. " - }, - "cursors.previousKey": { - "type": "string", - "default": "", - "description": "Key used for jump to previous cursors position." - }, - "coc.preferences.maxFileSize": { - "type": "string", - "default": "10MB", - "description": "Maximum file size in bytes that coc.nvim should handle, default '10MB'" - }, - "coc.preferences.promptWorkspaceEdit": { - "type": "boolean", - "description": "Prompt confirm from user when apply workspace edit for unloaded files.", - "default": true - }, - "coc.preferences.listOfWorkspaceEdit": { - "type": "string", - "default": "quickfix", - "description": "List should contains changed locations after workspace edit, default to vim's quickfix", - "enum": ["quickfix", "location", "none"] - }, - "coc.preferences.useQuickfixForLocations": { - "type": "boolean", - "description": "Use vim's quickfix list for jump locations,\n need restart on change.", - "default": false - }, - "coc.preferences.extensionUpdateCheck": { - "type": "string", - "default": "never", - "description": "Interval for check extension update, could be daily, weekly, never", - "enum": ["daily", "weekly", "never"] - }, - "coc.preferences.snippetStatusText": { - "type": "string", - "default": "SNIP", - "description": "Text shown in statusline to indicate snippet session is activated." - }, - "coc.preferences.hoverTarget": { - "type": "string", - "description": "Target to show hover information, default is floating window when possible.", - "enum": ["preview", "echo", "float"] - }, - "coc.preferences.colorSupport": { - "type": "boolean", - "description": "Enable color highlight if language server support it.", - "default": true - }, - "coc.preferences.previewAutoClose": { - "type": "boolean", - "description": "Auto close preview window on cursor move.", - "default": true - }, - "coc.preferences.previewMaxHeight": { - "type": "number", - "default": 12, - "description": "Max height of preview window for hover." - }, - "coc.preferences.currentFunctionSymbolAutoUpdate": { - "type": "boolean", - "description": "Automatically update the value of b:coc_current_function on CursorHold event", - "default": false - }, - "coc.preferences.formatOnSaveFiletypes": { - "type": "array", - "default": [], - "description": "Filetypes that should run format on save.", - "items": { - "type": "string" - } - }, - "coc.preferences.formatOnInsertLeave": { - "type": "boolean", - "description": "Trigger format on type when insert leave by send \n to the server.", - "default": false - }, - "coc.preferences.enableFloatHighlight": { - "type": "boolean", - "description": "Enable highlight for floating window.", - "default": true - }, - "coc.preferences.rootPatterns": { - "type": "array", - "default": [".git", ".hg", ".projections.json"], - "description": "Root patterns to resolve workspaceFolder from parent folders of opened files, resolved from up to down.", - "items": { - "type": "string" - } - }, - "coc.preferences.watchmanPath": { - "type": "string", - "description": "executable path for https://facebook.github.io/watchman/, detected from $PATH by default", - "default": null - }, - "coc.preferences.jumpCommand": { - "type": "string", - "description": "Command used for location jump, like goto definition, goto references etc.", - "default": "edit" - }, - "coc.preferences.messageLevel": { - "type": "string", - "description": "Message level for filter echoed messages, could be 'more', 'warning' and 'error'", - "default": "more", - "enum": ["more", "warning", "error"] - }, - "coc.preferences.bracketEnterImprove": { - "type": "boolean", - "description": "Improve enter inside bracket `<> {} [] ()` by add new empty line below and place cursor to it. Works with `coc#on_enter()`", - "default": true - }, - "coc.preferences.formatOnType": { - "type": "boolean", - "description": "Set to true to enable format on type", - "default": false - }, - "coc.preferences.formatOnTypeFiletypes": { - "type": "array", - "default": [], - "description": "Filetypes that should run format on typing. Only take effect when `coc.preferences.formatOnType` set `true`", - "items": { - "type": "string" - } - }, - "coc.preferences.highlightTimeout": { - "type": "integer", - "default": 500, - "minimum": 200, - "maximum": 5000, - "description": "Highlight timeout for buffer in floating window." - }, - "coc.preferences.snippets.enable": { - "type": "boolean", - "description": "Set to false to disable snippets support.", - "default": true - }, - "coc.source.around.enable": { - "type": "boolean", - "default": true - }, - "coc.source.around.firstMatch": { - "type": "boolean", - "description": "Filter complete items by first letter strict match.", - "default": true - }, - "coc.source.around.shortcut": { - "type": "string", - "default": "A" - }, - "coc.source.around.priority": { - "type": "integer", - "default": 1 - }, - "coc.source.around.disableSyntaxes": { - "type": "array", - "default": [], - "items": { - "type": "string" - } - }, - "coc.source.buffer.enable": { - "type": "boolean", - "default": true - }, - "coc.source.buffer.shortcut": { - "type": "string", - "default": "B" - }, - "coc.source.buffer.priority": { - "type": "integer", - "default": 1 - }, - "coc.source.buffer.firstMatch": { - "type": "boolean", - "description": "Filter complete items by first letter strict match.", - "default": true - }, - "coc.source.buffer.ignoreGitignore": { - "type": "boolean", - "default": true, - "description": "Ignore git ignored files for buffer words" - }, - "coc.source.buffer.disableSyntaxes": { - "type": "array", - "default": [], - "items": { - "type": "string" - } - }, - "coc.source.file.enable": { - "type": "boolean", - "default": true - }, - "coc.source.file.shortcut": { - "type": "string", - "default": "F" - }, - "coc.source.file.priority": { - "type": "integer", - "default": 10 - }, - "coc.source.file.disableSyntaxes": { - "type": "array", - "default": [], - "items": { - "type": "string" - } - }, - "coc.source.file.triggerCharacters": { - "type": "array", - "default": ["/"], - "items": { - "type": "string" - } - }, - "coc.source.file.trimSameExts": { - "type": "array", - "default": [".ts", ".js"], - "description": "Trim same extension on file completion", - "items": { - "type": "string" - } - }, - "coc.source.file.ignoreHidden": { - "type": "boolean", - "default": true, - "description": "Ignore completion for hidden files" - }, - "coc.source.file.ignorePatterns": { - "type": "array", - "default": [], - "description": "Ignore patterns of matcher", - "items": { - "type": "string" - } - }, - "languageserver": { - "type": "object", - "default": {}, - "description": "Dictionary of languageservers, key is used as id of languageserver.", - "patternProperties": { - "^[_a-zA-Z]+$": { - "oneOf": [ - { - "$ref": "#/definitions/languageServerModule" - }, - { - "$ref": "#/definitions/languageServerCommand" - }, - { - "$ref": "#/definitions/languageServerSocket" - } - ] - } - } - } - }, - "cSpell.ignoreWords": [ - "", - "postgresql", - "pytest", - "sigint", - "trainsets" - ], - "clangd.path": "/home/matt/.config/coc/extensions/coc-clangd-data/install/10.0.0/clangd_10.0.0/bin/clangd" - } - diff --git a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/init.vim b/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/init.vim deleted file mode 100644 index 7c75bcf..0000000 --- a/dotfiles/.config/nvim/library/MattDev_NvimConfig⛺/init.vim +++ /dev/null @@ -1,21 +0,0 @@ -runtime plugins.vim -runtime settings.vim -runtime themes.vim -runtime autocommands.vim -runtime coc.vim -runtime keys.vim - -" Check code as python3 by default -let g:neomake_python_python_maker = neomake#makers#ft#python#python() -let g:neomake_python_flake8_maker = neomake#makers#ft#python#flake8() -let g:neomake_python_python_maker.exe = 'python3 -m py_compile' -let g:neomake_python_flake8_maker.exe = 'python3 -m flake8' - -" Disable error messages inside the buffer, next to the problematic line -let g:neomake_virtualtext_current_error = 1 - -"------------------------------------------------------------------------------ -" Shawn Anderson as of September 30th 2020 -noremap f 0 -noremap j $ -map / :nohl diff --git a/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim b/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim index 3c9a6c4..be12103 100644 --- a/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim +++ b/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim @@ -40,8 +40,8 @@ Plug 'junegunn/fzf.vim' "`:Helptags` | Help tags [1] "`:Filetypes` | File types "------------------+----------------------------------------------------------------------- -nnoremap :Commandsfzf# -"nnoremap :History +nnoremap :Commandsfzf# +nnoremap :History "nnoremap :History: "nnoremap :History/ "nnoremap :Files @@ -55,4 +55,23 @@ nnoremap :Commandsfzf# "nnoremap :Lines "For jmcomets/vim-pony -nnoremap d :Commands^D +nnoremap d :Commands'DjangoGoto + +" Workspace Search +command! -bang Work call fzf#vim#files('~/Workspace', 0) + +" Grep current git project +command! -bang -nargs=* Work2 + \ call fzf#vim#files( + \ 'git grep --line-number -- '.shellescape(), 0, + \ fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), 0) + +command! -bang -nargs=* GGrep + \ call fzf#vim#grep( + \ 'git grep --line-number -- '.shellescape(), 0, + \ fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), 0) + +command! -bang -nargs=* Rg + \ call fzf#vim#grep( + \ 'rg --column --line-number --no-heading --color=always --smart-case -- '.shellescape(), 1, + \ fzf#vim#with_preview(), 0) diff --git a/dotfiles/.config/nvim/plugged b/dotfiles/.config/nvim/plugged deleted file mode 120000 index 9831815..0000000 --- a/dotfiles/.config/nvim/plugged +++ /dev/null @@ -1 +0,0 @@ -library/MattDev_NvimConfig⛺/plugged \ No newline at end of file diff --git a/dotfiles/.config/nvim/plugins.vim b/dotfiles/.config/nvim/plugins.vim index ace0974..097a5db 100644 --- a/dotfiles/.config/nvim/plugins.vim +++ b/dotfiles/.config/nvim/plugins.vim @@ -39,7 +39,7 @@ runtime plugconfig/arielrossanigo/dir-configs-override.vim.vim runtime plugconfig/voldikss/vim-floaterm.vim runtime plugconfig/justinmk/vim-sneak.vim runtime plugconfig/honza/vim-snippets.vim -runtime plugconfig/unblevable/quick-scope.vim +"runtime plugconfig/unblevable/quick-scope.vim runtime plugconfig/junegunn/vim-github-dashboard.vim runtime plugconfig/jmcomets/vim-pony.vim Plug 'psliwka/vim-smoothie' @@ -176,7 +176,7 @@ let g:indentLine_char = '┊' " Distraction free programming Plug 'junegunn/goyo.vim' " Goyo mappings -nmap :Goyo 60x60 +nmap :Goyo " Tell vim-plug we finished declaring plugins, so it can load them diff --git a/dotfiles/.config/tmux/keys.tmux b/dotfiles/.config/tmux/keys.tmux index 3c98cab..ac0eb8a 100644 --- a/dotfiles/.config/tmux/keys.tmux +++ b/dotfiles/.config/tmux/keys.tmux @@ -2,6 +2,9 @@ unbind C-b set -g prefix ^A +# Goyo +bind G set status + # New Window unbind ^C bind c new-window -c '#{pane_current_path}' diff --git a/dotfiles/.config/tmux/settings.tmux b/dotfiles/.config/tmux/settings.tmux index 6497fd0..13138cc 100644 --- a/dotfiles/.config/tmux/settings.tmux +++ b/dotfiles/.config/tmux/settings.tmux @@ -1,6 +1,6 @@ # change pane numbers to start with 1 instead of 0 -set -g base-index 1 -set -g pane-base-index 1 +#set -g base-index 1 +#set -g pane-base-index 1 # Set fish as default shell set -g default-shell /usr/bin/fish