Updated bashrc

This commit is contained in:
Daniel Legt 2023-12-26 16:57:04 +02:00
parent ed85e7fe02
commit bfff2af0b2
4 changed files with 18 additions and 10 deletions

View File

@ -32,9 +32,9 @@ git_branch_tag() {
# If we are in a git repository and there is a tag # If we are in a git repository and there is a tag
if [[ -n $branch && -n $tag ]]; then if [[ -n $branch && -n $tag ]]; then
echo -n "$branch:$tag" echo -n " ($branch:$tag) "
elif [[ -n $branch ]]; then elif [[ -n $branch ]]; then
echo -n "$branch" echo -n " ($branch) "
fi fi
} }
@ -139,5 +139,8 @@ alias n_ports='netstat -tulanp'
# PS1 # 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\]$ " # 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\]\$(__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\]\$(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\]'

View File

@ -4,14 +4,14 @@
"workbench.list.smoothScrolling": true, "workbench.list.smoothScrolling": true,
"editor.smoothScrolling": true, "editor.smoothScrolling": true,
"editor.cursorSmoothCaretAnimation": "on", "editor.cursorSmoothCaretAnimation": "on",
"editor.cursorBlinking": "phase", "editor.cursorBlinking": "smooth",
"window.menuBarVisibility": "toggle", "window.menuBarVisibility": "toggle",
"window.titleBarStyle": "custom", "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.fontLigatures": true,
"editor.mouseWheelZoom": true, "editor.mouseWheelZoom": true,
"explorer.compactFolders": false, "explorer.compactFolders": false,
"workbench.iconTheme": "vikings-icon-theme",
"editor.selectionClipboard": false, "editor.selectionClipboard": false,
"intelephense.format.braces": "k&r", "intelephense.format.braces": "k&r",
"git.enableSmartCommit": true, "git.enableSmartCommit": true,
@ -46,9 +46,8 @@
"[php]": { "[php]": {
"editor.defaultFormatter": "bmewburn.vscode-intelephense-client" "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
}, },
"terminal.integrated.fontFamily": "monospace",
"codetogether.userName": "Kato", "codetogether.userName": "Kato",
"workbench.colorTheme": "Gatito Theme", "workbench.colorTheme": "Chalkboard",
"typescript.updateImportsOnFileMove.enabled": "always", "typescript.updateImportsOnFileMove.enabled": "always",
"git.ignoreRebaseWarning": true, "git.ignoreRebaseWarning": true,
"glassit.alpha": 255, "glassit.alpha": 255,
@ -59,7 +58,7 @@
"html.format.wrapAttributes": "preserve-aligned", "html.format.wrapAttributes": "preserve-aligned",
"html.format.wrapLineLength": 0, "html.format.wrapLineLength": 0,
"prettier.printWidth": 3000, "prettier.printWidth": 3000,
"window.zoomLevel": 2, "window.zoomLevel": 1,
"[vue]": { "[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
@ -84,4 +83,10 @@
"[css]": { "[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "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,
} }

0
scripts/disable_all.sh Executable file → Normal file
View File

0
scripts/enable_all.sh Executable file → Normal file
View File