From 282be1f4646563f4d0004e8b05443cb7adfab14d Mon Sep 17 00:00:00 2001
From: Pratik Tripathy <mail@pratik.live>
Date: Thu, 22 Jun 2023 21:18:08 +0530
Subject: [PATCH] VSCode Settings changed

---
 .config/Code/User/settings.json | 50 ++++++++++++++++-----------------
 .gitconfig                      | 10 ++++++-
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json
index a40c4cd..7620017 100755
--- a/.config/Code/User/settings.json
+++ b/.config/Code/User/settings.json
@@ -10,13 +10,16 @@
     "extensions.ignoreRecommendations": true,
     //
     // Editor
-    // "editor.cursorSmoothCaretAnimation": true,
+    "editor.cursorSmoothCaretAnimation": "on",
     "editor.cursorWidth": 4,
     "editor.minimap.enabled": false,
     "editor.wordWrap": "on",
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
     "editor.copyWithSyntaxHighlighting": true,
+    "editor.acceptSuggestionOnEnter": "smart",
+    "editor.snippetSuggestions": "top",
+    "editor.guides.indentation": true,
     "editor.tabSize": 4,
     "prettier.tabWidth": 4,
     "editor.insertSpaces": true,
@@ -25,7 +28,7 @@
     "files.trimTrailingWhitespace": true,
     "files.autoSave": "afterDelay",
     "files.autoSaveDelay": 1000,
-    "diffEditor.renderSideBySide": false,
+    "diffEditor.renderSideBySide": true,
     "diffEditor.ignoreTrimWhitespace": false,
     //
     // Editor Font
@@ -116,7 +119,7 @@
         "unmount"
     ],
     //
-    // Shell check plgin
+    // Shell check plugin
     "shellcheck.run": "onSave",
     "shellcheck.exclude": ["2181", "2039"],
     //
@@ -125,56 +128,54 @@
     "eslint.packageManager": "yarn",
     "eslint.run": "onSave",
     //
-    //Path Intellisense
-    "typescript.suggest.paths": false,
-    //
     // JavaScript
     "es6-css-minify.minifyOnSave": "yes",
     "es6-css-minify.onSaveDelay": 10,
+    "typescript.suggest.paths": false,
     //
     // Git
     "git.enableSmartCommit": true,
     "git.autofetch": true,
     "git.confirmSync": false,
     "gitlens.hovers.currentLine.over": "line",
+    // GetLens
     "gitlens.advanced.telemetry.enabled": false,
-    "gitlens.codeLens.enabled": false,
     "gitlens.statusBar.reduceFlicker": true,
     "gitlens.blame.avatars": false,
-    "projectManager.git.baseFolders": [
-        "/media/pratik/Personal_Projects/Code/",
-        "/media/pratik/Office/Squbix/Code"
-    ],
+    "gitlens.currentLine.uncommittedChangesFormat": "✏️ ${ago}",
+    "gitlens.codeLens.enabled": false,
+    "gitlens.currentLine.enabled": false,
+    "gitlens.views.branches.branches.layout": "list",
     //
     // Golang
     "go.useLanguageServer": true,
     "go.formatTool": "gofmt",
-    //
     // Markdown
-    "markdown.extension.italic.indicator": "_",
     "markdown.extension.print.imgToBase64": true,
     "markdown.extension.print.theme": "dark",
     "markdown.extension.toc.githubCompatibility": true,
     "markdownlint.run": "onType",
+    "markdown.extension.toc.orderedList": true,
+    "markdown.extension.tableFormatter.normalizeIndentation": true,
+    "markdown.extension.list.indentationSize": "inherit",
     "markdownlint.config": {
         "default": true,
-        "MD030": false,
         "MD007": false,
-        "MD029": false,
         "MD024": false,
+        "MD029": false,
+        "MD030": false,
+        "MD033": false,
+        "MD046": false,
         "no-hard-tabs": false,
         "line-length": false
     },
     "[markdown]": {
         "editor.defaultFormatter": "yzhang.markdown-all-in-one"
     },
-
-    "markdown.extension.toc.orderedList": true,
     //
     // Python
     "python.jediEnabled": false,
-    "terminal.integrated.shell.linux": "/bin/zsh",
-    "prettier.packageManager": "yarn",
+    "python.languageServer": "Pylance",
     //
     //
     // Themes
@@ -183,15 +184,11 @@
         "*": "GitHub Dark",
         "markdown": "Community Material Theme Darker High Contrast"
     },
-    "python.languageServer": "Pylance",
 
     // Rust
     // "rust.build_on_save": true,
     "rust.clippy_preference": "on",
     "rust.full_docs": true,
-    "[rust]": {
-        "editor.defaultFormatter": "matklad.rust-analyzer"
-    },
     "rust-analyzer.assist.importMergeBehavior": "last",
     "rust-analyzer.cargo.loadOutDirsFromCheck": true,
     "rust-analyzer.procMacro.enable": true,
@@ -200,11 +197,12 @@
     "rust-analyzer.completion.postfix.enable": false,
     "rust-analyzer.inlayHints.enable": false,
     "rust-analyzer.inlayHints.typeHints": false,
+    "[rust]": {
+        "editor.defaultFormatter": "matklad.rust-analyzer"
+    },
 
     //
-    "editor.acceptSuggestionOnEnter": "smart",
-    "editor.snippetSuggestions": "top",
     "workbench.colorTheme": "GitHub Dark Dimmed",
-    "editor.guides.indentation": true
+    "terminal.integrated.shell.linux": "/bin/zsh"
     //
 }
diff --git a/.gitconfig b/.gitconfig
index 78275f0..b946d31 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,4 +3,12 @@
 	name = Pratik Tripathy
 [core]
 	autocrlf = input
-	editor = subl --wait
+	editor = code --wait
+[diff]
+	tool = vscode
+[difftool "vscode"]
+	cmd = "code --wait --diff $LOCAL $REMOTE"
+[alias]
+	ll = log --pretty=format:'%Cblue%cn (%ce)%Creset commited %Cred%h%Creset %Cgreen%cr%Creset:%n%B'
+	unstage = restore --staged .
+