4 Commits

Author SHA1 Message Date
burkkyy 8fba51c881 Merge pull request 'laptop prompt' (#7) from active/laptop into laptop
Reviewed-on: #7
2026-07-13 20:55:56 -07:00
burkkyy a3c1b3522f laptop prompt 2026-07-14 03:54:12 +00:00
burkkyy 96be324781 Merge pull request 'Adding in more files' (#3) from pc into laptop
Reviewed-on: #3
2026-07-13 19:29:20 -07:00
burkkyy 9c170cc24e Merge pull request 'Adding config from main PC' (#2) from pc into main
Reviewed-on: #2
2026-07-13 19:10:14 -07:00
3 changed files with 7 additions and 9 deletions
+5 -6
View File
@@ -2,19 +2,19 @@
"git.confirmSync": false, "git.confirmSync": false,
"explorer.confirmDelete": false, "explorer.confirmDelete": false,
"[markdown]": { "[markdown]": {
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint", "editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
}, },
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.minimap.enabled": false, "editor.minimap.enabled": false,
"[json]": { "[json]": {
"editor.defaultFormatter": "vscode.json-language-features", "editor.defaultFormatter": "vscode.json-language-features"
}, },
"explorer.confirmDragAndDrop": false, "explorer.confirmDragAndDrop": false,
"editor.indentSize": "tabSize", "editor.indentSize": "tabSize",
"editor.tabSize": 2, "editor.tabSize": 2,
"[cpp]": { "[cpp]": {
"editor.defaultFormatter": "ms-vscode.cpptools", "editor.defaultFormatter": "ms-vscode.cpptools"
}, },
"claudeCode.preferredLocation": "sidebar", "claudeCode.preferredLocation": "sidebar",
"git.suggestSmartCommit": false, "git.suggestSmartCommit": false,
@@ -22,7 +22,6 @@
"diffEditor.ignoreTrimWhitespace": false, "diffEditor.ignoreTrimWhitespace": false,
"workbench.colorTheme": "Dark Modern", "workbench.colorTheme": "Dark Modern",
"[java]": { "[java]": {
"editor.defaultFormatter": "redhat.java", "editor.defaultFormatter": "redhat.java"
}, }
"window.confirmSaveUntitledWorkspace": false,
} }
-1
View File
@@ -1 +0,0 @@
# `~/.config`
+2 -2
View File
@@ -5,10 +5,10 @@ CLEAR_COLOR="\[\e[0m\]"
# Default value # Default value
prompt="<Please set prompt in ~/.bash/bash_prompt> % " prompt="<Please set prompt in ~/.bash/bash_prompt> % "
prompt="$CLEAR_COLOR[\[\033[1;38m\]\w$CLEAR_COLOR]$CLEAR_COLOR " #prompt="$CLEAR_COLOR[\[\033[1;38m\]\w$CLEAR_COLOR]$CLEAR_COLOR "
# My custom prompt # My custom prompt
#prompt="\[\033[32m\]\u\[\033[36m\]@\[\033[32m\]\h \[\033[37m\]\W\[\033[36m\]$\[\e[0m\] " prompt="\[\033[32m\]\u\[\033[36m\]@\[\033[32m\]\h \[\033[37m\]\W\[\033[36m\]$\[\e[0m\] "
# ParrotOS prompt # ParrotOS prompt
# prompt="\[\033[0;31m\]\342\224\214\342\224\200\$([[ \$? != 0 ]] && echo \"[\[\033[0;31m\]\342\234\227\[\033[0;37m\]]\342\224\200\")[$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]root\[\033[01;33m\]@\[\033[01;96m\]\h'; else echo '\[\033[0;39m\]\u\[\033[01;33m\]@\[\033[01;96m\]\h'; fi)\[\033[0;31m\]]\342\224\200[\[\033[0;32m\]\w\[\033[0;31m\]]\n\[\033[0;31m\]\342\224\224\342\224\200\342\224\200\342\225\274 \[\033[0m\]\[\e[01;33m\]\\$\[\e[0m\]" # prompt="\[\033[0;31m\]\342\224\214\342\224\200\$([[ \$? != 0 ]] && echo \"[\[\033[0;31m\]\342\234\227\[\033[0;37m\]]\342\224\200\")[$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]root\[\033[01;33m\]@\[\033[01;96m\]\h'; else echo '\[\033[0;39m\]\u\[\033[01;33m\]@\[\033[01;96m\]\h'; fi)\[\033[0;31m\]]\342\224\200[\[\033[0;32m\]\w\[\033[0;31m\]]\n\[\033[0;31m\]\342\224\224\342\224\200\342\224\200\342\225\274 \[\033[0m\]\[\e[01;33m\]\\$\[\e[0m\]"