Merge pull request 'Merge pull request 'Adding config from main PC' (#2) from pc into main' (#6) from laptop into main

Reviewed-on: #6

.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

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

README.md

@@ -0,0 +1 @@
+# `~/.config`

bash/aliases.sh

@@ -18,6 +18,7 @@ alias grep='grep --color=auto'
 alias '..'='cd ../'
 alias '...'='cd ../..'
 alias google='google-chrome-stable'
+alias shotcut='QT_OPENGL=software shotcut'
 
 # special aliases
 alias 'ff'='nvim $(fzf)'
@@ -33,9 +34,8 @@ alias d='du_color'
 alias e='nvim'
 alias g=_git
 alias l='ls -alh'
-alias p='pacman'
 alias t='tmux'
 alias v='nvim'
 
 # Load in any secret aliases if there may be
-[ -f ~/config/bash/aliases.sh.secret ] && . ~/.config/bash/aliases.sh.secret
+[ -f ~/.config/bash/aliases.sh.secret ] && . ~/.config/bash/aliases.sh.secret

bash/env.sh

@@ -27,5 +27,5 @@ eval "$(direnv hook bash)"
 
 #source ~/sdks/vulkan/1.4.313.0/setup-env.sh
 
-# export DENO_CONFIG="/home/caleb/.config/deno"
-# export PATH="$DENO_CONFIG/bin:$PATH"
+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

mimeapps.list

@@ -5,4 +5,6 @@ x-scheme-handler/http=google-chrome.desktop
 x-scheme-handler/https=google-chrome.desktop
 x-scheme-handler/about=google-chrome.desktop
 x-scheme-handler/unknown=google-chrome.desktop
+inode/directory=code.desktop
+x-scheme-handler/mochi=mochi.desktop
 x-scheme-handler/claude-cli=claude-code-url-handler.desktop