Updated bashrc

configs/bash/.bashrc.k

@@ -32,9 +32,9 @@ git_branch_tag() {
 
     # If we are in a git repository and there is a tag
     if [[ -n $branch && -n $tag ]]; then
-        echo -n "$branch:$tag"
+        echo -n " ($branch:$tag) "
     elif [[ -n $branch ]]; then
-        echo -n "$branch"
+        echo -n " ($branch) "
     fi
 }
 
@@ -139,5 +139,8 @@ alias n_ports='netstat -tulanp'
 
 # PS1
 # export PS1=" \[\033[38;5;220m\]кπ \[\033[38;5;192m\]\w\[\e[0m\]$ " # Old
-export PS1=" \[\033[38;5;220m\]кπ \[\033[38;5;192m\]\w\[\e[0m\]\$(__git_ps1 ' \[\e[38;5;87m\]%s\[\e[0m\]')\$ "
-export PS1=" \[\033[38;5;220m\]кπ \[\033[38;5;192m\]\w\[\e[0m\]\$(if [[ \$(git rev-parse --is-inside-work-tree 2>/dev/null) == 'true' ]]; then echo -n ' \[\e[38;5;87m\]'; git_branch_tag; echo -n '\[\e[0m\]'; fi)\$ "
+# export PS1=" \[\033[38;5;220m\]кπ \[\033[38;5;192m\]\w\[\e[0m\]\$(__git_ps1 ' \[\e[38;5;87m\]%s\[\e[0m\]')\$ "
+# export PS1=" \[\033[38;5;220m\]кπ \[\033[38;5;192m\]\w\[\e[0m\]\$(if [[ \$(git rev-parse --is-inside-work-tree 2>/dev/null) == 'true' ]]; then echo -n ' \[\e[38;5;87m\]'; git_branch_tag; echo -n '\[\e[0m\]'; fi)\$ "
+
+PS1='\\$ \[\e[38;5;186m\]\u \[\e[38;5;152m\](\[\e[38;5;149m\]\W\[\e[38;5;152m\])\ \[\e[38;5;117;1m\]~ \[\e[0m\]'
+PS1='\\$ \[\e[38;5;186m\]\u \[\e[38;5;152m\](\[\e[38;5;149m\]\W\[\e[38;5;152m\])\[\e[38;5;87m\]$(git_branch_tag)\[\e[38;5;117;1m\]~ \[\e[0m\]'

configs/vscode/settings.json

@@ -4,14 +4,14 @@
     "workbench.list.smoothScrolling": true,
     "editor.smoothScrolling": true,
     "editor.cursorSmoothCaretAnimation": "on",
-    "editor.cursorBlinking": "phase",
+    "editor.cursorBlinking": "smooth",
     "window.menuBarVisibility": "toggle",
     "window.titleBarStyle": "custom",
-    "editor.fontFamily": "'Graph 35+ pix', 'Monocraft', 'Fira Code', 'Pixel Code', 'Ark Pixel 10px ko', 'Droid Sans Mono', 'monospace', monospace",
+    "terminal.integrated.fontFamily": "'Kongtext', 'Hack Nerd Font'",
+    "editor.fontFamily": "'Kongtext', 'Graph 35+ pix', 'Monocraft', 'Fira Code', 'Pixel Code', 'Ark Pixel 10px ko', 'Droid Sans Mono', 'monospace', monospace, Hack Nerd Font",
     "editor.fontLigatures": true,
     "editor.mouseWheelZoom": true,
     "explorer.compactFolders": false,
-    "workbench.iconTheme": "vikings-icon-theme",
     "editor.selectionClipboard": false,
     "intelephense.format.braces": "k&r",
     "git.enableSmartCommit": true,
@@ -46,9 +46,8 @@
     "[php]": {
         "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
     },
-    "terminal.integrated.fontFamily": "monospace",
     "codetogether.userName": "Kato",
-    "workbench.colorTheme": "Gatito Theme",
+    "workbench.colorTheme": "Chalkboard",
     "typescript.updateImportsOnFileMove.enabled": "always",
     "git.ignoreRebaseWarning": true,
     "glassit.alpha": 255,
@@ -59,7 +58,7 @@
     "html.format.wrapAttributes": "preserve-aligned",
     "html.format.wrapLineLength": 0,
     "prettier.printWidth": 3000,
-    "window.zoomLevel": 2,
+    "window.zoomLevel": 1,
     "[vue]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
@@ -84,4 +83,10 @@
     "[css]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
+    "telemetry.telemetryLevel": "off",
+    "docker-explorer.enableTelemetry": false,
+    "dotnetAcquisitionExtension.enableTelemetry": false,
+    "gitlens.telemetry.enabled": false,
+    "intelephense.telemetry.enabled": false,
+    "terminal.integrated.smoothScrolling": true,
 }