Merge pull request 'laptop prompt' (#7) from active/laptop into laptop

Reviewed-on: #7

.gitignore

@@ -29,6 +29,16 @@ dunst/*
 !mimeapps.list
 !pavucontrol.ini
 
+# flameshot
+!flameshot/
+flameshot/*
+!flameshot/flameshot.ini
+
+# git (global gitignore, not credentials/config)
+!git/
+git/*
+!git/ignore
+
 # VS Code user settings only (not Cookies/Cache/Local State/etc.)
 !Code/
 Code/*

Code/User/settings.json

@@ -2,19 +2,19 @@
   "git.confirmSync": false,
   "explorer.confirmDelete": false,
   "[markdown]": {
-    "editor.defaultFormatter": "DavidAnson.vscode-markdownlint",
+    "editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "editor.minimap.enabled": false,
   "[json]": {
-    "editor.defaultFormatter": "vscode.json-language-features",
+    "editor.defaultFormatter": "vscode.json-language-features"
   },
   "explorer.confirmDragAndDrop": false,
   "editor.indentSize": "tabSize",
   "editor.tabSize": 2,
   "[cpp]": {
-    "editor.defaultFormatter": "ms-vscode.cpptools",
+    "editor.defaultFormatter": "ms-vscode.cpptools"
   },
   "claudeCode.preferredLocation": "sidebar",
   "git.suggestSmartCommit": false,
@@ -22,6 +22,6 @@
   "diffEditor.ignoreTrimWhitespace": false,
   "workbench.colorTheme": "Dark Modern",
   "[java]": {
-    "editor.defaultFormatter": "redhat.java",
+    "editor.defaultFormatter": "redhat.java"
-  },
+  }
 }

bash/aliases.sh

@@ -29,12 +29,11 @@ alias gs='git status'
 alias ga='git add'
 
 # Single letter aliases
+alias c='claude'
 alias d='du_color'
+alias e='nvim'
 alias g=_git
 alias l='ls -alh'
-alias n='neofetch --config ~/.config/neofetch.conf'
-alias p='pacman'
-alias r='ranger'
 alias t='tmux'
 alias v='nvim'
 

bash/env.sh

@@ -29,4 +29,3 @@ eval "$(direnv hook bash)"
 
 export DENO_CONFIG="/home/caleb/.config/deno"
 export PATH="$DENO_CONFIG/bin:$PATH"
-

bash/prompt.sh

@@ -5,10 +5,10 @@ CLEAR_COLOR="\[\e[0m\]"
 # Default value
 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
-#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
 # 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\]"

flameshot/flameshot.ini

@@ -0,0 +1,2 @@
+[General]
+savePath=/home/caleb/downloads

git/ignore

@@ -0,0 +1 @@
+.envrc

pavucontrol.ini

@@ -1,6 +1,6 @@
 [window]
 width=1920
-height=1050
+height=1048
 sinkInputType=1
 sourceOutputType=1
 sinkType=0