diff --git a/Sublime/User/Preferences.sublime-settings b/Sublime/User/Preferences.sublime-settings index 7ece1870..28c63253 100644 --- a/Sublime/User/Preferences.sublime-settings +++ b/Sublime/User/Preferences.sublime-settings @@ -1,5 +1,5 @@ { - "font_face": "Fira Code", + "font_face": "MonoLisa", "font_size": 20, "font_options": ["no_italic", "no_liga"], "line_padding_top": 15, @@ -8,6 +8,7 @@ [ "Vintage", ], + "close_windows_when_empty": true, "show_git_status": false, "highlight_line": true, "save_on_focus_lost": true, diff --git a/vscode-keybindings.json b/vscode-keybindings.json index 1184e5ba..756d345f 100644 --- a/vscode-keybindings.json +++ b/vscode-keybindings.json @@ -1,4 +1,25 @@ [ + // Editor Layout + { + "key": "cmd+1", + "command": "workbench.action.editorLayoutSingle", + }, + { + "key": "cmd+2", + "command": "workbench.action.editorLayoutTwoColumns", + }, + { + "key": "cmd+3", + "command": "workbench.action.editorLayoutThreeColumns", + }, + { + "key": "cmd+[", + "command": "workbench.action.focusPreviousGroup" + }, + { + "key": "cmd+]", + "command": "workbench.action.focusNextGroup" + }, // Run Task { "key": "cmd+b", @@ -13,38 +34,32 @@ "key": "cmd+shift+o", "command": "workbench.action.files.openFileFolderInNewWindow", }, - { - "key": "cmd+ctrl+p", - "command": "gitProjectManager.openProject", - }, - { - "key": "cmd+alt+p", - "command": "gitProjectManager.openProjectNewWindow", - }, // Toggle Explorer { - "key": "cmd+1", + "key": "cmd+k cmd+e", "command": "workbench.view.explorer", "when": "!explorerViewletVisible" }, { - "key": "cmd+1", + "key": "cmd+k cmd+e", "command": "workbench.action.toggleSidebarVisibility", "when": "explorerViewletVisible" }, // Toggle Terminal + { - "key": "cmd+2", + "key": "cmd+k cmd+t", "command": "workbench.action.terminal.toggleTerminal" }, // Toggle Search + { - "key": "cmd+3", + "key": "cmd+k cmd+s", "command": "workbench.view.search", "when": "!activeViewlet == 'workbench.view.search'" }, { - "key": "cmd+3", + "key": "cmd+k cmd+s", "command": "workbench.action.toggleSidebarVisibility", "when": "activeViewlet == 'workbench.view.search'" }, @@ -54,22 +69,29 @@ "when": "view.workbench.view.search.visible" }, // Toggle Git - { - "key": "cmd+4", + + { + "key": "cmd+k cmd+g", "command": "workbench.view.scm", "when": "!view.workbench.scm.visible" }, { - "key": "cmd+4", + "key": "cmd+k cmd+g", "command": "workbench.action.toggleSidebarVisibility", "when": "view.workbench.scm.visible" }, // LSP + // Quick fix { "key": "cmd+enter", "command": "editor.action.quickFix", "when": "editorHasCodeActionsProvider && textInputFocus && !editorReadonly" }, + { + "key": "cmd+ctrl+r", + "command": "editor.action.rename", + "when": "editorHasRenameProvider && editorTextFocus && !editorReadonly" + }, { // Goto Definition "key": "cmd+.", "command": "editor.action.revealDefinition", @@ -84,15 +106,7 @@ "key": "cmd+shift+.", "command": "editor.action.goToReferences" }, - // Editor Layout - { - "key": "cmd+\\", - "command": "workbench.action.editorLayoutTwoColumns", - }, - { - "key": "cmd+shift+\\", - "command": "workbench.action.editorLayoutSingle", - }, + // Consisten Ctrl n / p { "key": "ctrl+n", diff --git a/vscode-settings.json b/vscode-settings.json index 1316d252..58cf1882 100644 --- a/vscode-settings.json +++ b/vscode-settings.json @@ -1,47 +1,61 @@ -{ +{ + "editor.fontFamily": "MonoLisa, Dank Mono, Operator Mono Book, Fira Code, Menlo, Consolas", "editor.fontSize": 14, "terminal.integrated.fontSize": 15, - "editor.lineHeight": 30, - "window.title": "${activeEditorMedium}${separator}${rootName}${separator}${profileName}", - "window.titleBarStyle": "custom", + + "editor.lineHeight": 22, // increase vertical space between lines for more code readability. + + // Startup options "workbench.startupEditor": "none", // Start with an empty screen - "editor.fontFamily": "MonoLisa, Dank Mono, Operator Mono Book, Fira Code, Menlo, Consolas", "window.restoreWindows": "none", // do not reopen everything when I launch. "workbench.settings.editor": "json", // Who uses that shitty slow UI ? - "workbench.panel.defaultLocation": "bottom", - "explorer.autoReveal": true, // Jump to current open file in explorer. + "terminal.integrated.macOptionIsMeta": true, - "security.workspace.trust.untrustedFiles": "open", // Disable minimap - "workbench.layoutControl.enabled": false, // Disable layout control buttons - "window.commandCenter": false, // Disable Command Center - "breadcrumbs.enabled": false, // Disable breadcrumbs - "editor.scrollbar.horizontal": "hidden", // No scroll bars - "editor.scrollbar.vertical": "hidden", // No scroll bars - "editor.cursorSmoothCaretAnimation": "off", // No caret animation, really nice when typing. + "security.workspace.trust.untrustedFiles": "open", + + // Cursor settings "editor.cursorBlinking": "phase", - "outline.icons": false, - "editor.stickyScroll.enabled": false, - "files.simpleDialog.enable": true, // Use vscode ui to open files instead of OS. - "workbench.editor.enablePreview": false, - "editor.bracketPairColorization.enabled": false, + "editor.cursorStyle": "block", + + "files.simpleDialog.enable": true, // Use vscode ui to open files instead of OS native one ( weird but vscode one is much faster). + "workbench.editor.editorActionsLocation": "titleBar", - "editor.wordWrap": "on", + "editor.wordWrap": "on", // Wrap long lines. "files.insertFinalNewline": true, "files.trimFinalNewlines": true, // Sidebar to right so it does not move our code. + // Disable useless ui elements + "outline.icons": false, + "workbench.editor.enablePreview": false, + "editor.bracketPairColorization.enabled": false, + "editor.stickyScroll.enabled": false, + "workbench.layoutControl.enabled": false, // Disable layout control buttons + "window.commandCenter": false, // Disable breadcrumbs "git.decorations.enabled": false, // No git GUI shenanigans in vscode UI. - "scm.diffDecorations": "none", // Don't pollute my editor with git change log. "workbench.tips.enabled": false, // No Tips "editor.lightbulb.enabled": "off", // No lightbulbs for fixes "workbench.statusBar.visible": false, // No statusbar - "editor.guides.indentation": false, + "editor.guides.indentation": false, // No indentation guides + "editor.minimap.enabled": false, // no minimap + "breadcrumbs.enabled": false, // no breadcrumbs "workbench.editor.wrapTabs": true, // Who uses tabs other than NOOBS ? "editor.autoClosingQuotes": "never", // No fucking auto pairs "editor.autoClosingBrackets": "never", // No fucking auto pairs "editor.autoClosingComments": "never", // No fucking auto pairs - "diffEditor.renderSideBySide": false, // Render diffs inline, side by side is awful on this tiny laptop - "gitProjectManager.baseProjectsFolders": [ "~/w" ], - - // // Disable Autocomplete + "diffEditor.renderSideBySide": false, + "workbench.activityBar.location": "bottom", + + "editor.multiCursorModifier": "ctrlCmd", // Sublime text habbits + + // No confirmation for explorer actions. + "explorer.confirmDelete": false, + "explorer.confirmDragAndDrop": false, + "explorer.confirmPasteNative": false, + + // Titlebar + "workbench.editor.showTabs": "none", + "window.titleBarStyle": "cusomt", + + // Disable Autocomplete // "editor.quickSuggestions": { // "other": false, // "comments": false, @@ -53,6 +67,8 @@ "editor.semanticHighlighting.enabled": false, "editor.occurrencesHighlight": "off", "problems.visibility": false, // Disable annoying squiggles throughout the editor. + + // Golang "[go]": { "editor.formatOnSave": true }, @@ -60,12 +76,19 @@ "options": "" }, "go.toolsManagement.autoUpdate": true, + //Git "git.confirmSync": false, - "explorer.confirmDelete": false, - "editor.minimap.enabled": false, + "scm.diffDecorations": "none", // Don't pollute my editor with git change log. "git.openRepositoryInParentFolders": "never", - "workbench.activityBar.location": "hidden", - "workbench.colorCustomizations": {}, - "workbench.colorTheme": "Catppuccin Macchiato", - "workbench.editor.showTabs": "none" + "workbench.iconTheme": null, + "update.mode": "manual", + "workbench.colorCustomizations": { + "[Visual Studio Dark]": { + "editor.background": "#1e1e1e", + "titleBar.activeBackground": "#1e1e1e", + "sideBar.background": "#181818" + } + }, + "extensions.ignoreRecommendations": true, + "workbench.colorTheme": "Visual Studio Light" }