diff --git a/config/VSCodium/settings.json b/config/VSCodium/settings.json
index 024991f7..02cc740a 100644
--- a/config/VSCodium/settings.json
+++ b/config/VSCodium/settings.json
@@ -512,5 +512,1415 @@
"isItalic": true,
"styleMode": "full"
}
- }
+ },
+ "cSpell.enabled": false,
+ // Which key
+ "whichkey.sortOrder": "alphabetically",
+ "whichkey.delay": 0,
+ "whichkey.bindings": [
+ {
+ "key": ":",
+ "name": "Commands",
+ "type": "command",
+ "command": "workbench.action.showCommands"
+ },
+ {
+ "key": "\t",
+ "name": "Last editor",
+ "type": "commands",
+ "commands": [
+ "workbench.action.quickOpenPreviousRecentlyUsedEditorInGroup",
+ "list.select"
+ ]
+ },
+ {
+ "key": "?",
+ "name": "Search keybindings",
+ "type": "command",
+ "command": "whichkey.searchBindings"
+ },
+ {
+ "key": ",",
+ "name": "Show all buffers/editors",
+ "type": "command",
+ "command": "workbench.action.showAllEditors"
+ },
+ {
+ "key": ".",
+ "name": "Repeat most recent action",
+ "type": "command",
+ "command": "whichkey.repeatMostRecent"
+ },
+ {
+ "key": "a",
+ "name": " Annotation/Snippets",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "a",
+ "name": "Start debug",
+ "type": "command",
+ "command": "workbench.action.debug.start"
+ }
+ ]
+ },
+ {
+ "key": "b",
+ "name": " Buffers/Editors",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "B",
+ "name": "Show all buffers/editors in active group",
+ "type": "command",
+ "command": "workbench.action.showEditorsInActiveGroup"
+ },
+ {
+ "key": "d",
+ "name": "Delete buffer/editor",
+ "type": "command",
+ "command": "workbench.action.closeActiveEditor"
+ },
+ {
+ "key": "H",
+ "name": "Move editor into left group",
+ "type": "command",
+ "command": "workbench.action.moveEditorToLeftGroup"
+ },
+ {
+ "key": "J",
+ "name": "Move editor into below group",
+ "type": "command",
+ "command": "workbench.action.moveEditorToBelowGroup"
+ },
+ {
+ "key": "K",
+ "name": "Move editor into above group",
+ "type": "command",
+ "command": "workbench.action.moveEditorToAboveGroup"
+ },
+ {
+ "key": "L",
+ "name": "Move editor into right group",
+ "type": "command",
+ "command": "workbench.action.moveEditorToRightGroup"
+ },
+ {
+ "key": "o",
+ "name": "Close other editors",
+ "type": "command",
+ "command": "workbench.action.closeOtherEditors"
+ },
+ {
+ "key": "n",
+ "name": "Next editor",
+ "type": "command",
+ "command": "workbench.action.nextEditor"
+ },
+ {
+ "key": "u",
+ "name": "Reopen closed editor",
+ "type": "command",
+ "command": "workbench.action.reopenClosedEditor"
+ }
+ ]
+ },
+ {
+ "key": "c",
+ "name": " Code",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "a",
+ "name": "Start debug",
+ "type": "command",
+ "command": "workbench.action.debug.start"
+ }
+ ]
+ },
+ {
+ "key": "d",
+ "name": "+Debug",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "d",
+ "name": "Start debug",
+ "type": "command",
+ "command": "workbench.action.debug.start"
+ },
+ {
+ "key": "D",
+ "name": "Run without debugging",
+ "type": "command",
+ "command": "workbench.action.debug.run"
+ },
+ {
+ "key": "S",
+ "name": "Stop debug",
+ "type": "command",
+ "command": "workbench.action.debug.stop"
+ },
+ {
+ "key": "c",
+ "name": "Continue debug",
+ "type": "command",
+ "command": "workbench.action.debug.continue"
+ },
+ {
+ "key": "p",
+ "name": "Pause debug",
+ "type": "command",
+ "command": "workbench.action.debug.pause"
+ },
+ {
+ "key": "R",
+ "name": "Restart debug",
+ "type": "command",
+ "command": "workbench.action.debug.restart"
+ },
+ {
+ "key": "i",
+ "name": "Step into",
+ "type": "command",
+ "command": "workbench.action.debug.stepInto"
+ },
+ {
+ "key": "s",
+ "name": "Step over",
+ "type": "command",
+ "command": "workbench.action.debug.stepOver"
+ },
+ {
+ "key": "o",
+ "name": "Step out",
+ "type": "command",
+ "command": "workbench.action.debug.stepOut"
+ },
+ {
+ "key": "b",
+ "name": "Toggle breakpoint",
+ "type": "command",
+ "command": "editor.debug.action.toggleBreakpoint"
+ },
+ {
+ "key": "B",
+ "name": "Toggle inline breakpoint",
+ "type": "command",
+ "command": "editor.debug.action.toggleInlineBreakpoint"
+ },
+ {
+ "key": "j",
+ "name": "Jump to cursor",
+ "type": "command",
+ "command": "debug.jumpToCursor"
+ },
+ {
+ "key": "v",
+ "name": "REPL",
+ "type": "command",
+ "command": "workbench.debug.action.toggleRepl"
+ },
+ {
+ "key": "w",
+ "name": "Focus on watch window",
+ "type": "command",
+ "command": "workbench.debug.action.focusWatchView"
+ },
+ {
+ "key": "W",
+ "name": "Add to watch",
+ "type": "command",
+ "command": "editor.debug.action.selectionToWatch"
+ }
+ ]
+ },
+ {
+ "key": "e",
+ "name": "+Errors",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": ".",
+ "name": "Error transient",
+ "type": "command",
+ "command": "whichkey.showTransient",
+ "args": "whichkey.transient.error"
+ },
+ {
+ "key": "l",
+ "name": "List errors",
+ "type": "command",
+ "command": "workbench.actions.view.problems"
+ },
+ {
+ "key": "N",
+ "name": "Previous error",
+ "type": "command",
+ "command": "editor.action.marker.prev"
+ },
+ {
+ "key": "n",
+ "name": "Next error",
+ "type": "command",
+ "command": "editor.action.marker.next"
+ },
+ {
+ "key": "p",
+ "name": "Previous error",
+ "type": "command",
+ "command": "editor.action.marker.prev"
+ }
+ ]
+ },
+ {
+ "key": "f",
+ "name": " File/Find",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "f",
+ "name": "Open file/folder",
+ "type": "command",
+ "command": "whichkey.openFile"
+ },
+ {
+ "key": "n",
+ "name": "New Untitled",
+ "type": "command",
+ "command": "workbench.action.files.newUntitledFile"
+ },
+ {
+ "key": "S",
+ "name": "Save all files",
+ "type": "command",
+ "command": "workbench.action.files.saveAll"
+ },
+ {
+ "key": "r",
+ "name": "Open recent",
+ "type": "command",
+ "command": "workbench.action.openRecent"
+ },
+ {
+ "key": "R",
+ "name": "Rename file",
+ "type": "commands",
+ "commands": [
+ "workbench.files.action.showActiveFileInExplorer",
+ "renameFile"
+ ]
+ },
+ {
+ "key": "e",
+ "name": "Show explorer view",
+ "type": "command",
+ "command": "workbench.view.explorer"
+ },
+ {
+ "key": "E",
+ "name": "Show active file in tree/explorer view",
+ "type": "command",
+ "command": "workbench.files.action.showActiveFileInExplorer"
+ },
+ {
+ "key": "y",
+ "name": "Copy path of active file",
+ "type": "command",
+ "command": "workbench.action.files.copyPathOfActiveFile"
+ },
+ {
+ "key": "o",
+ "name": "Open with",
+ "type": "command",
+ "command": "explorer.openWith"
+ },
+ {
+ "key": "l",
+ "name": "Change file language",
+ "type": "command",
+ "command": "workbench.action.editor.changeLanguageMode"
+ },
+ {
+ "key": "=",
+ "name": "Format file",
+ "type": "command",
+ "command": "editor.action.formatDocument"
+ },
+ {
+ "key": "i",
+ "name": "+Indentation",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "i",
+ "name": "Change indentation",
+ "type": "command",
+ "command": "changeEditorIndentation"
+ },
+ {
+ "key": "d",
+ "name": "Detect indentation",
+ "type": "command",
+ "command": "editor.action.detectIndentation"
+ },
+ {
+ "key": "r",
+ "name": "Reindent",
+ "type": "command",
+ "command": "editor.action.reindentlines"
+ },
+ {
+ "key": "R",
+ "name": "Reindent selected",
+ "type": "command",
+ "command": "editor.action.reindentselectedlines"
+ },
+ {
+ "key": "t",
+ "name": "Convert indentation to tabs",
+ "type": "command",
+ "command": "editor.action.indentationToTabs"
+ },
+ {
+ "key": "s",
+ "name": "Convert indentation to spaces",
+ "type": "command",
+ "command": "editor.action.indentationToSpaces"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "key": "g",
+ "name": " Git",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "b",
+ "name": "Checkout",
+ "type": "command",
+ "command": "git.checkout"
+ },
+ {
+ "key": "c",
+ "name": "Commit",
+ "type": "command",
+ "command": "git.commit"
+ },
+ {
+ "key": "d",
+ "name": "Delete Branch",
+ "type": "command",
+ "command": "git.deleteBranch"
+ },
+ {
+ "key": "f",
+ "name": "Fetch",
+ "type": "command",
+ "command": "git.fetch"
+ },
+ {
+ "key": "i",
+ "name": "Init",
+ "type": "command",
+ "command": "git.init"
+ },
+ {
+ "key": "m",
+ "name": "Merge",
+ "type": "command",
+ "command": "git.merge"
+ },
+ {
+ "key": "p",
+ "name": "Publish",
+ "type": "command",
+ "command": "git.publish"
+ },
+ {
+ "key": "s",
+ "name": "Status",
+ "type": "command",
+ "command": "workbench.view.scm"
+ },
+ {
+ "key": "S",
+ "name": "Stage",
+ "type": "command",
+ "command": "git.stage"
+ },
+ {
+ "key": "U",
+ "name": "Unstage",
+ "type": "command",
+ "command": "git.unstage"
+ }
+ ]
+ },
+ {
+ "key": "h",
+ "name": " Harpoon",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "b",
+ "name": "Checkout",
+ "type": "command",
+ "command": "git.checkout"
+ },
+ {
+ "key": "c",
+ "name": "Commit",
+ "type": "command",
+ "command": "git.commit"
+ },
+ {
+ "key": "d",
+ "name": "Delete Branch",
+ "type": "command",
+ "command": "git.deleteBranch"
+ },
+ {
+ "key": "f",
+ "name": "Fetch",
+ "type": "command",
+ "command": "git.fetch"
+ },
+ {
+ "key": "i",
+ "name": "Init",
+ "type": "command",
+ "command": "git.init"
+ },
+ {
+ "key": "m",
+ "name": "Merge",
+ "type": "command",
+ "command": "git.merge"
+ },
+ {
+ "key": "p",
+ "name": "Publish",
+ "type": "command",
+ "command": "git.publish"
+ },
+ {
+ "key": "s",
+ "name": "Status",
+ "type": "command",
+ "command": "workbench.view.scm"
+ },
+ {
+ "key": "S",
+ "name": "Stage",
+ "type": "command",
+ "command": "git.stage"
+ },
+ {
+ "key": "U",
+ "name": "Unstage",
+ "type": "command",
+ "command": "git.unstage"
+ }
+ ]
+ },
+ {
+ "key": "i",
+ "name": "+Insert",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "j",
+ "name": "Insert line below",
+ "type": "command",
+ "command": "editor.action.insertLineAfter"
+ },
+ {
+ "key": "k",
+ "name": "Insert line above",
+ "type": "command",
+ "command": "editor.action.insertLineBefore"
+ },
+ {
+ "key": "s",
+ "name": "Insert snippet",
+ "type": "command",
+ "command": "editor.action.insertSnippet"
+ }
+ ]
+ },
+ {
+ "key": "p",
+ "name": "+Project",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "f",
+ "name": "Find file in project",
+ "type": "command",
+ "command": "workbench.action.quickOpen"
+ },
+ {
+ "key": "p",
+ "name": "Switch project",
+ "type": "command",
+ "command": "workbench.action.openRecent"
+ },
+ {
+ "key": "t",
+ "name": "Show tree/explorer view",
+ "type": "command",
+ "command": "workbench.view.explorer"
+ }
+ ]
+ },
+ {
+ "key": "r",
+ "name": "+Repeat",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": ".",
+ "name": "Repeat recent actions",
+ "type": "command",
+ "command": "whichkey.repeatRecent"
+ }
+ ]
+ },
+ {
+ "key": "s",
+ "name": "+Search/Symbol",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "e",
+ "name": "Edit symbol",
+ "type": "command",
+ "command": "editor.action.rename"
+ },
+ {
+ "key": "h",
+ "name": "Highlight symbol transient",
+ "type": "commands",
+ "commands": [
+ "editor.action.wordHighlight.trigger",
+ "whichkey.showTransient"
+ ],
+ "args": [null, "whichkey.transient.symbol"]
+ },
+ {
+ "key": "j",
+ "name": "Jump to symbol in file",
+ "type": "command",
+ "command": "workbench.action.gotoSymbol"
+ },
+ {
+ "key": "J",
+ "name": "Jump to symbol in workspace",
+ "type": "command",
+ "command": "workbench.action.showAllSymbols"
+ },
+ {
+ "key": "p",
+ "name": "Search in a project",
+ "type": "command",
+ "command": "workbench.action.findInFiles"
+ },
+ {
+ "key": "P",
+ "name": "Search in a project with a selection",
+ "type": "commands",
+ "commands": [
+ "editor.action.addSelectionToNextFindMatch",
+ "workbench.action.findInFiles"
+ ]
+ },
+ {
+ "key": "r",
+ "name": "Search all references",
+ "type": "command",
+ "command": "editor.action.referenceSearch.trigger"
+ },
+ {
+ "key": "R",
+ "name": "Search all references in side bar",
+ "type": "command",
+ "command": "references-view.find"
+ },
+ {
+ "key": "s",
+ "name": "Search in current file",
+ "type": "command",
+ "command": "actions.find"
+ }
+ ]
+ },
+ {
+ "key": "S",
+ "name": "+Show",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "e",
+ "name": "Show explorer",
+ "type": "command",
+ "command": "workbench.view.explorer"
+ },
+ {
+ "key": "s",
+ "name": "Show search",
+ "type": "command",
+ "command": "workbench.view.search"
+ },
+ {
+ "key": "g",
+ "name": "Show source control",
+ "type": "command",
+ "command": "workbench.view.scm"
+ },
+ {
+ "key": "t",
+ "name": "Show test",
+ "type": "command",
+ "command": "workbench.view.extension.test"
+ },
+ {
+ "key": "r",
+ "name": "Show remote explorer",
+ "type": "command",
+ "command": "workbench.view.remote"
+ },
+ {
+ "key": "x",
+ "name": "Show extensions",
+ "type": "command",
+ "command": "workbench.view.extensions"
+ },
+ {
+ "key": "p",
+ "name": "Show problem",
+ "type": "command",
+ "command": "workbench.actions.view.problems"
+ },
+ {
+ "key": "o",
+ "name": "Show output",
+ "type": "command",
+ "command": "workbench.action.output.toggleOutput"
+ },
+ {
+ "key": "d",
+ "name": "Show debug console",
+ "type": "command",
+ "command": "workbench.debug.action.toggleRepl"
+ }
+ ]
+ },
+ {
+ "key": "t",
+ "name": "+Toggles",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "c",
+ "name": "Toggle find case sensitive",
+ "type": "command",
+ "command": "toggleFindCaseSensitive"
+ },
+ {
+ "key": "w",
+ "name": "Toggle ignore trim whitespace in diff",
+ "type": "command",
+ "command": "toggle.diff.ignoreTrimWhitespace"
+ },
+ {
+ "key": "W",
+ "name": "Toggle word wrap",
+ "type": "command",
+ "command": "editor.action.toggleWordWrap"
+ }
+ ]
+ },
+ {
+ "key": "T",
+ "name": "+UI toggles",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "b",
+ "name": "Toggle side bar visibility",
+ "type": "command",
+ "command": "workbench.action.toggleSidebarVisibility"
+ },
+ {
+ "key": "j",
+ "name": "Toggle panel visibility",
+ "type": "command",
+ "command": "workbench.action.togglePanel"
+ },
+ {
+ "key": "F",
+ "name": "Toggle full screen",
+ "type": "command",
+ "command": "workbench.action.toggleFullScreen"
+ },
+ {
+ "key": "s",
+ "name": "Select theme",
+ "type": "command",
+ "command": "workbench.action.selectTheme"
+ },
+ {
+ "key": "m",
+ "name": "Toggle maximized panel",
+ "type": "command",
+ "command": "workbench.action.toggleMaximizedPanel"
+ },
+ {
+ "key": "t",
+ "name": "Toggle tool/activity bar visibility",
+ "type": "command",
+ "command": "workbench.action.toggleActivityBarVisibility"
+ },
+ {
+ "key": "T",
+ "name": "Toggle tab visibility",
+ "type": "command",
+ "command": "workbench.action.toggleTabsVisibility"
+ },
+ {
+ "key": "z",
+ "name": "Toggle zen mode",
+ "type": "command",
+ "command": "workbench.action.toggleZenMode"
+ }
+ ]
+ },
+ {
+ "key": "w",
+ "name": "+Window",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "W",
+ "name": "Focus previous editor group",
+ "type": "command",
+ "command": "workbench.action.focusPreviousGroup"
+ },
+ {
+ "key": "-",
+ "name": "Split editor below",
+ "type": "command",
+ "command": "workbench.action.splitEditorDown"
+ },
+ {
+ "key": "/",
+ "name": "Split editor right",
+ "type": "command",
+ "command": "workbench.action.splitEditor"
+ },
+ {
+ "key": "s",
+ "name": "Split editor below",
+ "type": "command",
+ "command": "workbench.action.splitEditorDown"
+ },
+ {
+ "key": "v",
+ "name": "Split editor right",
+ "type": "command",
+ "command": "workbench.action.splitEditor"
+ },
+ {
+ "key": "h",
+ "name": "Focus editor group left",
+ "type": "command",
+ "command": "workbench.action.focusLeftGroup"
+ },
+ {
+ "key": "j",
+ "name": "Focus editor group down",
+ "type": "command",
+ "command": "workbench.action.focusBelowGroup"
+ },
+ {
+ "key": "k",
+ "name": "Focus editor group up",
+ "type": "command",
+ "command": "workbench.action.focusAboveGroup"
+ },
+ {
+ "key": "l",
+ "name": "Focus editor group right",
+ "type": "command",
+ "command": "workbench.action.focusRightGroup"
+ },
+ {
+ "key": "H",
+ "name": "Move editor group left",
+ "type": "command",
+ "command": "workbench.action.moveActiveEditorGroupLeft"
+ },
+ {
+ "key": "J",
+ "name": "Move editor group down",
+ "type": "command",
+ "command": "workbench.action.moveActiveEditorGroupDown"
+ },
+ {
+ "key": "K",
+ "name": "Move editor group up",
+ "type": "command",
+ "command": "workbench.action.moveActiveEditorGroupUp"
+ },
+ {
+ "key": "L",
+ "name": "Move editor group right",
+ "type": "command",
+ "command": "workbench.action.moveActiveEditorGroupRight"
+ },
+ {
+ "key": "t",
+ "name": "Toggle editor group sizes",
+ "type": "command",
+ "command": "workbench.action.toggleEditorWidths"
+ },
+ {
+ "key": "m",
+ "name": "Maximize editor group",
+ "type": "command",
+ "command": "workbench.action.minimizeOtherEditors"
+ },
+ {
+ "key": "M",
+ "name": "Maximize editor group and hide side bar",
+ "type": "command",
+ "command": "workbench.action.maximizeEditor"
+ },
+ {
+ "key": "=",
+ "name": "Reset editor group sizes",
+ "type": "command",
+ "command": "workbench.action.evenEditorWidths"
+ },
+ {
+ "key": "z",
+ "name": "Combine all editors",
+ "type": "command",
+ "command": "workbench.action.joinAllGroups"
+ },
+ {
+ "key": "d",
+ "name": "Close editor group",
+ "type": "command",
+ "command": "workbench.action.closeEditorsInGroup"
+ },
+ {
+ "key": "x",
+ "name": "Close all editor groups",
+ "type": "command",
+ "command": "workbench.action.closeAllGroups"
+ }
+ ]
+ },
+ {
+ "key": "x",
+ "name": "+Text",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "i",
+ "name": "Organize Imports",
+ "type": "command",
+ "command": "editor.action.organizeImports"
+ },
+ {
+ "key": "r",
+ "name": "Rename symbol",
+ "type": "command",
+ "command": "editor.action.rename"
+ },
+ {
+ "key": "R",
+ "name": "Refactor",
+ "type": "command",
+ "command": "editor.action.refactor"
+ },
+ {
+ "key": ".",
+ "name": "Quick fix",
+ "type": "command",
+ "command": "editor.action.quickFix"
+ },
+ {
+ "key": "a",
+ "name": "Find all references",
+ "type": "command",
+ "command": "editor.action.referenceSearch.trigger"
+ },
+ {
+ "key": "u",
+ "name": "To lower case",
+ "type": "command",
+ "command": "editor.action.transformToLowercase"
+ },
+ {
+ "key": "U",
+ "name": "To upper case",
+ "type": "command",
+ "command": "editor.action.transformToUppercase"
+ },
+ {
+ "key": "J",
+ "name": "Move lines down transient",
+ "type": "commands",
+ "commands": [
+ "editor.action.moveLinesDownAction",
+ "whichkey.showTransient"
+ ],
+ "args": [null, "whichkey.transient.lineMoving"]
+ },
+ {
+ "key": "K",
+ "name": "Move lines up transient",
+ "type": "commands",
+ "commands": [
+ "editor.action.moveLinesUpAction",
+ "whichkey.showTransient"
+ ],
+ "args": [null, "whichkey.transient.lineMoving"]
+ },
+ {
+ "key": "l",
+ "name": "+Lines",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "s",
+ "name": "Sort lines in ascending order",
+ "type": "command",
+ "command": "editor.action.sortLinesAscending"
+ },
+ {
+ "key": "S",
+ "name": "Sort lines in descending order",
+ "type": "command",
+ "command": "editor.action.sortLinesDescending"
+ },
+ {
+ "key": "d",
+ "name": "Duplicate lines down",
+ "type": "command",
+ "command": "editor.action.copyLinesDownAction"
+ },
+ {
+ "key": "D",
+ "name": "Duplicate lines up",
+ "type": "command",
+ "command": "editor.action.copyLinesUpAction"
+ }
+ ]
+ },
+ {
+ "key": "d",
+ "name": "+Delete",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "w",
+ "name": "Delete trailing whitespace",
+ "type": "command",
+ "command": "editor.action.trimTrailingWhitespace"
+ }
+ ]
+ },
+ {
+ "key": "m",
+ "name": "+Merge conflict",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "b",
+ "name": "Accept both",
+ "type": "command",
+ "command": "merge-conflict.accept.both"
+ },
+ {
+ "key": "c",
+ "name": "Accept current",
+ "type": "command",
+ "command": "merge-conflict.accept.current"
+ },
+ {
+ "key": "i",
+ "name": "Accept incoming",
+ "type": "command",
+ "command": "merge-conflict.accept.incoming"
+ },
+ {
+ "key": "B",
+ "name": "Accept all both",
+ "type": "command",
+ "command": "merge-conflict.accept.all-both"
+ },
+ {
+ "key": "C",
+ "name": "Accept all current",
+ "type": "command",
+ "command": "merge-conflict.accept.all-current"
+ },
+ {
+ "key": "I",
+ "name": "Accept all incoming",
+ "type": "command",
+ "command": "merge-conflict.accept.all-incoming"
+ },
+ {
+ "key": "s",
+ "name": "Accept selection",
+ "type": "command",
+ "command": "merge-conflict.accept.selection"
+ },
+ {
+ "key": "k",
+ "name": "Compare current conflict",
+ "type": "command",
+ "command": "merge-conflict.compare"
+ },
+ {
+ "key": "n",
+ "name": "Next Conflict",
+ "type": "command",
+ "command": "merge-conflict.next"
+ },
+ {
+ "key": "N",
+ "name": "Previous Conflict",
+ "type": "command",
+ "command": "merge-conflict.previous"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "key": "z",
+ "name": "+Zoom/Fold",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": ".",
+ "name": "+Fold",
+ "type": "bindings",
+ "bindings": [
+ {
+ "key": "a",
+ "name": "Toggle: around a point",
+ "type": "command",
+ "command": "editor.toggleFold"
+ },
+ {
+ "key": "c",
+ "name": "Close: at a point",
+ "type": "command",
+ "command": "editor.fold"
+ },
+ {
+ "key": "b",
+ "name": "Close: all block comments",
+ "type": "command",
+ "command": "editor.foldAllBlockComments"
+ },
+ {
+ "key": "g",
+ "name": "Close: all regions",
+ "type": "command",
+ "command": "editor.foldAllMarkerRegions"
+ },
+ {
+ "key": "m",
+ "name": "Close: all",
+ "type": "command",
+ "command": "editor.foldAll"
+ },
+ {
+ "key": "o",
+ "name": "Open: at a point",
+ "type": "command",
+ "command": "editor.unfold"
+ },
+ {
+ "key": "O",
+ "name": "Open: recursively",
+ "type": "command",
+ "command": "editor.unfoldRecursively"
+ },
+ {
+ "key": "G",
+ "name": "Open: all regions",
+ "type": "command",
+ "command": "editor.unfoldAllMarkerRegions"
+ },
+ {
+ "key": "r",
+ "name": "Open: all",
+ "type": "command",
+ "command": "editor.unfoldAll"
+ }
+ ]
+ },
+ {
+ "key": "f",
+ "name": "Frame zooming transient",
+ "type": "command",
+ "command": "whichkey.showTransient",
+ "args": "whichkey.transient.frameZooming"
+ },
+ {
+ "key": "x",
+ "name": "Font zooming transient",
+ "type": "command",
+ "command": "whichkey.showTransient",
+ "args": "whichkey.transient.fontZooming"
+ },
+ {
+ "key": "i",
+ "name": "Image zooming transient",
+ "type": "command",
+ "command": "whichkey.showTransient",
+ "args": "whichkey.transient.imageZooming"
+ }
+ ]
+ },
+ {
+ "key": "!",
+ "name": "Show terminal",
+ "type": "command",
+ "command": "workbench.action.terminal.focus"
+ },
+ {
+ "key": "/",
+ "name": "Search in a project",
+ "type": "command",
+ "command": "workbench.action.findInFiles"
+ },
+ {
+ "key": "*",
+ "name": "Search in a project with a selection",
+ "type": "commands",
+ "commands": [
+ "editor.action.addSelectionToNextFindMatch",
+ "workbench.action.findInFiles"
+ ]
+ },
+ {
+ "key": "v",
+ "name": "Smart select/expand region transient",
+ "type": "commands",
+ "commands": ["editor.action.smartSelect.grow", "whichkey.showTransient"],
+ "args": [null, "whichkey.transient.smartExpand"]
+ },
+ {
+ "key": "1",
+ "name": "Focus 1st editor group",
+ "type": "command",
+ "command": "workbench.action.focusFirstEditorGroup"
+ },
+ {
+ "key": "2",
+ "name": "Focus 2nd editor group",
+ "type": "command",
+ "command": "workbench.action.focusSecondEditorGroup"
+ },
+ {
+ "key": "3",
+ "name": "Focus 3rd editor group",
+ "type": "command",
+ "command": "workbench.action.focusThirdEditorGroup"
+ },
+ {
+ "key": "4",
+ "name": "Focus 4th editor group",
+ "type": "command",
+ "command": "workbench.action.focusFourthEditorGroup"
+ },
+ {
+ "key": "5",
+ "name": "Focus 5th editor group",
+ "type": "command",
+ "command": "workbench.action.focusFifthEditorGroup"
+ },
+ {
+ "key": "6",
+ "name": "Focus 6th editor group",
+ "type": "command",
+ "command": "workbench.action.focusSixthEditorGroup"
+ },
+ {
+ "key": "7",
+ "name": "Focus 7th editor group",
+ "type": "command",
+ "command": "workbench.action.focusSeventhEditorGroup"
+ },
+ {
+ "key": "8",
+ "name": "Focus 8th editor group",
+ "type": "command",
+ "command": "workbench.action.focusEighthEditorGroup"
+ }
+ ],
+ "whichkey.transient": {
+ "error": {
+ "title": "Error transient",
+ "bindings": [
+ {
+ "key": "N",
+ "name": "Previous error",
+ "command": "editor.action.marker.prev"
+ },
+ {
+ "key": "n",
+ "name": "Next error",
+ "command": "editor.action.marker.next"
+ },
+ {
+ "key": "p",
+ "name": "Previous error",
+ "command": "editor.action.marker.prev"
+ }
+ ]
+ },
+ "symbol": {
+ "title": "Highlight symbol transient",
+ "bindings": [
+ {
+ "key": "p",
+ "name": "Previous occurrence",
+ "command": "editor.action.wordHighlight.prev"
+ },
+ {
+ "key": "N",
+ "name": "Previous occurrence",
+ "command": "editor.action.wordHighlight.prev"
+ },
+ {
+ "key": "n",
+ "name": "Next occurrence",
+ "command": "editor.action.wordHighlight.next"
+ },
+ {
+ "key": "/",
+ "name": "Search in a project with a selection",
+ "commands": [
+ "editor.action.addSelectionToNextFindMatch",
+ "workbench.action.findInFiles"
+ ]
+ }
+ ]
+ },
+ "lineMoving": {
+ "title": "Line moving transient",
+ "bindings": [
+ {
+ "key": "J",
+ "name": "Move lines down",
+ "command": "editor.action.moveLinesDownAction"
+ },
+ {
+ "key": "K",
+ "name": "Move lines up",
+ "command": "editor.action.moveLinesUpAction"
+ }
+ ]
+ },
+ "frameZooming": {
+ "title": "Frame zooming transient",
+ "bindings": [
+ {
+ "key": "=",
+ "name": "Zoom in",
+ "command": "workbench.action.zoomIn"
+ },
+ {
+ "key": "+",
+ "name": "Zoom in",
+ "command": "workbench.action.zoomIn"
+ },
+ {
+ "key": "-",
+ "name": "Zoom out",
+ "command": "workbench.action.zoomOut"
+ },
+ {
+ "key": "0",
+ "name": "Reset zoom",
+ "command": "workbench.action.zoomReset"
+ }
+ ]
+ },
+ "fontZooming": {
+ "title": "Front zooming transient",
+ "bindings": [
+ {
+ "key": "=",
+ "name": "Zoom in",
+ "command": "editor.action.fontZoomIn"
+ },
+ {
+ "key": "+",
+ "name": "Zoom in",
+ "command": "editor.action.fontZoomIn"
+ },
+ {
+ "key": "-",
+ "name": "Zoom out",
+ "command": "editor.action.fontZoomOut"
+ },
+ {
+ "key": "0",
+ "name": "Reset zoom",
+ "command": "editor.action.fontZoomReset"
+ }
+ ]
+ },
+ "imageZooming": {
+ "title": "Image zooming transient",
+ "bindings": [
+ {
+ "key": "=",
+ "name": "Zoom in",
+ "command": "imagePreview.zoomIn"
+ },
+ {
+ "key": "+",
+ "name": "Zoom in",
+ "command": "imagePreview.zoomIn"
+ },
+ {
+ "key": "-",
+ "name": "Zoom out",
+ "command": "imagePreview.zoomOut"
+ }
+ ]
+ },
+ "smartExpand": {
+ "title": "Smart expand transient",
+ "bindings": [
+ {
+ "key": "v",
+ "name": "Grow selection",
+ "command": "editor.action.smartSelect.grow"
+ },
+ {
+ "key": "V",
+ "name": "Shrink selection",
+ "command": "editor.action.smartSelect.shrink"
+ }
+ ]
+ }
+ },
+ "workbench.statusBar.visible": false,
+ "workbench.activityBar.location": "hidden"
}
diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md
index 5892e623..5cd659c3 100644
--- a/config/nvim/.github/README.md
+++ b/config/nvim/.github/README.md
@@ -1,4 +1,3 @@
-
# :herb: About
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 46ffce2a..7ec98f9a 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,7 +1,7 @@
{
- "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" },
+ "LazyVim": { "branch": "main", "commit": "c433ea7aa842c446edc2b1570998bf5440c68188" },
"LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
- "SchemaStore.nvim": { "branch": "main", "commit": "0f86f114e099c008a7cca8f6deea072207f81204" },
+ "SchemaStore.nvim": { "branch": "main", "commit": "f877fa4f16b04c8d2e253539e1803a0850833272" },
"actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" },
"animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
"autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" },
@@ -19,16 +19,16 @@
"codeium.vim": { "branch": "main", "commit": "a1c3d6b369a18514d656dac149de807becacbdf7" },
"comment-box.nvim": { "branch": "main", "commit": "612d8d546470699d4c7991139883a390d49cf589" },
"compiler.nvim": { "branch": "main", "commit": "4a44a63b2d5bad828d1a29a28a2a9a04119e01a8" },
- "conform.nvim": { "branch": "master", "commit": "cbc5745bf7519acaf3a5cbaaa677fd556aa813d7" },
+ "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" },
"crates.nvim": { "branch": "main", "commit": "9bad17fd404d318e222b6cc057cc0a929be2d8e9" },
"dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
"debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" },
"dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
"dooku.nvim": { "branch": "main", "commit": "632ac0e27a96e77d8be47c42583fb58c3be9d85f" },
- "dressing.nvim": { "branch": "master", "commit": "c1179336aaeca82a785cade27e9b7b276af3222e" },
+ "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" },
"dropbar.nvim": { "branch": "master", "commit": "0c3b4f6b64af8e24c115f5f4fd7b35c978ee43db" },
- "edgy.nvim": { "branch": "main", "commit": "8355be45610afdf79a0bab32b91ee297997455b4" },
+ "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" },
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
"friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
"garbage-day.nvim": { "branch": "main", "commit": "957499b8a493974bd7002b68b1f15f7d285e0dd1" },
@@ -53,7 +53,7 @@
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
- "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
+ "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" },
"middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
"mini.ai": { "branch": "main", "commit": "f7787cff9cc42004f722ca1e64e6af4e64e34177" },
"mini.align": { "branch": "main", "commit": "708c0265b1513a00c83c181bff3d237741031cd1" },
@@ -63,8 +63,8 @@
"mini.surround": { "branch": "main", "commit": "7bf8915ba15d7a4f3c2afe7868d3c15a858d73f1" },
"multicursors.nvim": { "branch": "main", "commit": "8e876fe9db46c1b76c151202b418df21eca07bad" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "2f2d08894bbc679d4d181604c16bb7079f646384" },
- "neoconf.nvim": { "branch": "main", "commit": "fe9e3a933a8c5f9feb5b0fd4cc451f4241d94263" },
- "neodev.nvim": { "branch": "main", "commit": "aaeb44589cab39c2545a328661af355622d68479" },
+ "neoconf.nvim": { "branch": "main", "commit": "cfc29315288515849aa54c05828d49f01f033b66" },
+ "neodev.nvim": { "branch": "main", "commit": "5bbbeda6a9c672f314c95ca47a8b495cf6de17f9" },
"neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
"neotest": { "branch": "master", "commit": "dcdb40ea48f9c7b67a5576f6bb2e5f63ec15f2c0" },
"neotest-bash": { "branch": "main", "commit": "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb" },
@@ -99,7 +99,7 @@
"nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" },
"nvim-scissors": { "branch": "main", "commit": "63d05e732d1403fcd7c7e1fb6b55763adcd08b64" },
"nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" },
- "nvim-treesitter": { "branch": "master", "commit": "5d5eba78a7eee55df2c18d62cfc81ce9318bddd6" },
+ "nvim-treesitter": { "branch": "master", "commit": "97997c928bb038457f49343ffa5304d931545584" },
"nvim-treesitter-context": { "branch": "master", "commit": "85cf977181fb8e816e47ac05df7f756e9cb72caf" },
"nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" },
@@ -109,19 +109,19 @@
"nvim-various-textobjs": { "branch": "main", "commit": "ca9e6f290c25f6a3168c5dd64b9ef0a8000263d9" },
"nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" },
"nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" },
- "octo.nvim": { "branch": "master", "commit": "2ab86dc1e882c5e05679faaa2827010494597b8b" },
- "oil.nvim": { "branch": "master", "commit": "dd432e76d01eda08b8658415588d011009478469" },
+ "octo.nvim": { "branch": "master", "commit": "ed1526bf3ca2c22affa191e7b8d97915bcbadf10" },
+ "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" },
"openingh.nvim": { "branch": "main", "commit": "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc" },
- "outline.nvim": { "branch": "main", "commit": "4ad4e8e2b9c797d68774b0d88f91c92183975639" },
+ "outline.nvim": { "branch": "main", "commit": "a8d40aecb799196303ff3521c0e31c87bba57198" },
"overseer.nvim": { "branch": "master", "commit": "68a2d344cea4a2e11acfb5690dc8ecd1a1ec0ce0" },
"package-info.nvim": { "branch": "master", "commit": "18f8126dd8e65b2e21804c9107785af4abbb5bfc" },
"persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
"persistent-breakpoints.nvim": { "branch": "main", "commit": "db2ad5974b0435cb806cd287e7525219d6ac4bd3" },
- "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+ "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" },
- "rainbow-delimiters.nvim": { "branch": "master", "commit": "1951d157c07a0349c2d1af62a4ca61443aafc89a" },
- "refactoring.nvim": { "branch": "master", "commit": "c067e44b8171494fc1b5206ab4c267cd74c043b1" },
+ "rainbow-delimiters.nvim": { "branch": "master", "commit": "a5077cb6144fe46bc8b5002c52bb75a17369e44b" },
+ "refactoring.nvim": { "branch": "master", "commit": "f4546284059f7dc01f65be93d03f6c850fd2aba1" },
"rest.nvim": { "branch": "main", "commit": "84e81a19ab24ccf05c9233d34d4dfce61c233abe" },
"rustaceanvim": { "branch": "master", "commit": "b0c03f052d24a2bfc4cc681075c2d81d3c3ac2f7" },
"satellite.nvim": { "branch": "main", "commit": "99610b77fe2e047d2e55d70a256bcf63953eb6d7" },
@@ -143,10 +143,10 @@
"telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" },
"telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
"telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
- "telescope.nvim": { "branch": "master", "commit": "0902bb39ebaf76e655addc65130eb79b29abe6d2" },
+ "telescope.nvim": { "branch": "master", "commit": "20efb3864903fb854a85faf57513ffd80582275b" },
"text-case.nvim": { "branch": "main", "commit": "6bc91cde614bbec6f0befbaf7fcd302415d803fb" },
"theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" },
- "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
+ "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
"tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" },
"tree-sitter-hyprlang": { "branch": "master", "commit": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee" },
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
@@ -169,5 +169,5 @@
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
"windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" },
"yanky.nvim": { "branch": "main", "commit": "6bb9ffd3cad4c9876bda54e19d0659de28a4f84f" },
- "zen-mode.nvim": { "branch": "main", "commit": "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50" }
+ "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
}
\ No newline at end of file
diff --git a/config/nvim/lua/plugins/extras/dap/core.lua b/config/nvim/lua/plugins/extras/dap/core.lua
index ee9a5b80..2ecf1689 100644
--- a/config/nvim/lua/plugins/extras/dap/core.lua
+++ b/config/nvim/lua/plugins/extras/dap/core.lua
@@ -22,6 +22,14 @@ return {
{ "", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
},
},
+ {
+ "nvim-neotest/neotest",
+ optional = true,
+ -- stylua: ignore
+ keys = {
+ { "tL", function() require("neotest").run.run_last({ strategy = "dap" }) end, desc = "Debug Last Test" },
+ },
+ },
{
"folke/which-key.nvim",
opts = {
diff --git a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
index e8bd04f6..ca3a4669 100644
--- a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
+++ b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
@@ -141,6 +141,10 @@ return {
["neotest-vitest"] = {},
},
},
+ -- stylua: ignore
+ keys = {
+ { "tw", function() require('neotest').run.run({ jestCommand = 'jest --watch ' }) end, desc = "Run Watch" },
+ },
},
{
"luckasRanarison/nvim-devdocs",
diff --git a/config/nvim/lua/plugins/extras/test/core.lua b/config/nvim/lua/plugins/extras/test/core.lua
index f0def530..6e25a488 100644
--- a/config/nvim/lua/plugins/extras/test/core.lua
+++ b/config/nvim/lua/plugins/extras/test/core.lua
@@ -1,14 +1,5 @@
return {
{ import = "lazyvim.plugins.extras.test.core" },
- {
- "nvim-neotest/neotest",
- -- stylua: ignore
- keys = {
- { "tl", function() require("neotest").run.run_last() end, desc = "Run Last Test" },
- { "tL", function() require("neotest").run.run_last({ strategy = "dap" }) end, desc = "Debug Last Test" },
- { "tw", "lua require('neotest').run.run({ jestCommand = 'jest --watch ' })", desc = "Run Watch" },
- },
- },
{
"folke/which-key.nvim",
opts = {
diff --git a/config/nvim/lua/plugins/extras/util/vscode.lua b/config/nvim/lua/plugins/extras/util/vscode.lua
index 274b74ce..c42adfef 100644
--- a/config/nvim/lua/plugins/extras/util/vscode.lua
+++ b/config/nvim/lua/plugins/extras/util/vscode.lua
@@ -57,8 +57,6 @@ vim.api.nvim_create_autocmd("User", {
map("n", "", "Find")
-- find in files
map("n", "/", vscode_action("workbench.action.findInFiles"))
- -- open symbol
- map("n", "ss", vscode_action("workbench.action.gotoSymbol"))
-- view problems
map("n", "xx", vscode_action("workbench.actions.view.problems"))
-- open file explorer
@@ -138,6 +136,8 @@ vim.api.nvim_create_autocmd("User", {
-- diagnostics
map("n", "]d", vscode_action("editor.action.marker.next"))
map("n", "[d", vscode_action("editor.action.marker.prev"))
+ -- whichkey
+ map("n", "", vscode_action("whichkey.show"))
end,
})
@@ -159,4 +159,15 @@ return {
},
},
},
+ {
+ "folke/flash.nvim",
+ init = function()
+ local palette = require("catppuccin.palettes").get_palette("macchiato")
+ local bg = palette.none
+ vim.api.nvim_set_hl(0, "FlashBackdrop", { fg = bg })
+ vim.api.nvim_set_hl(0, "FlashLabel", { fg = palette.green, bg = bg, bold = true })
+ vim.api.nvim_set_hl(0, "FlashMatch", { fg = palette.lavender, bg = bg })
+ vim.api.nvim_set_hl(0, "FlashCurrent", { fg = palette.peach, bg = bg })
+ end,
+ },
}
diff --git a/config/nvim/lua/plugins/lspconfig.lua b/config/nvim/lua/plugins/lspconfig.lua
index 81841342..faebe20d 100644
--- a/config/nvim/lua/plugins/lspconfig.lua
+++ b/config/nvim/lua/plugins/lspconfig.lua
@@ -12,18 +12,15 @@ return {
keys[#keys + 1] = { "cls", "LspStart", desc = "Start Lsp" }
keys[#keys + 1] = { "clS", "LspStop", desc = "Stop Lsp" }
- -- stylua: ignore
- keys[#keys + 1] = { "cll", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", desc = "List Workspace" }
-
- -- stylua: ignore
- keys[#keys + 1] = { "clr", "lua vim.lsp.buf.remove_workspace_folder()", desc = "Remove workspace" }
- keys[#keys + 1] = { "cla", "lua vim.lsp.buf.add_workspace_folder()", desc = "Add workspace" }
+ -- stylua: ignore start
+ keys[#keys + 1] = { "clr", function() vim.lsp.buf.remove_workspace_folder() end, desc = "Remove workspace" }
+ keys[#keys + 1] = { "cla", function() vim.lsp.buf.add_workspace_folder() end, desc = "Add workspace" }
+ -- stylua: ignore end
keys[#keys + 1] = { "clh", vim.lsp.codelens.run, desc = "Run Code Lens" }
keys[#keys + 1] = { "cld", vim.lsp.codelens.refresh, desc = "Refresh Code Lens" }
end,
opts = {
- -- options for vim.diagnostic.config()
diagnostics = {
virtual_text = {
float = {
@@ -39,14 +36,6 @@ return {
},
},
},
- signs = {
- text = {
- [vim.diagnostic.severity.ERROR] = require("lazyvim.config").icons.diagnostics.Error,
- [vim.diagnostic.severity.WARN] = require("lazyvim.config").icons.diagnostics.Warn,
- [vim.diagnostic.severity.HINT] = require("lazyvim.config").icons.diagnostics.Hint,
- [vim.diagnostic.severity.INFO] = require("lazyvim.config").icons.diagnostics.Info,
- },
- },
},
inlay_hints = {
enabled = nvim_0_10,