Compare commits

7 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 a8af5ad3f3 Adding in more files 2026-07-13 19:17:15 -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
burkkyy 1d8b9c0666 Computer Stuff 2026-07-13 19:09:25 -07:00
burkkyy 4d9e3c7dea Merge pull request 'Adding all my config from laptop' (#1) from laptop into main
Reviewed-on: #1
2026-07-13 19:02:04 -07:00
7 changed files with 45 additions and 6 deletions
+10
View File
@@ -29,6 +29,16 @@ dunst/*
!mimeapps.list !mimeapps.list
!pavucontrol.ini !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.) # VS Code user settings only (not Cookies/Cache/Local State/etc.)
!Code/ !Code/
Code/* Code/*
+26 -2
View File
@@ -1,3 +1,27 @@
{ {
"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"
}
}
+2 -2
View File
@@ -18,6 +18,7 @@ alias grep='grep --color=auto'
alias '..'='cd ../' alias '..'='cd ../'
alias '...'='cd ../..' alias '...'='cd ../..'
alias google='google-chrome-stable' alias google='google-chrome-stable'
alias shotcut='QT_OPENGL=software shotcut'
# special aliases # special aliases
alias 'ff'='nvim $(fzf)' alias 'ff'='nvim $(fzf)'
@@ -33,9 +34,8 @@ alias d='du_color'
alias e='nvim' alias e='nvim'
alias g=_git alias g=_git
alias l='ls -alh' alias l='ls -alh'
alias p='pacman'
alias t='tmux' alias t='tmux'
alias v='nvim' alias v='nvim'
# Load in any secret aliases if there may be # 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
+2 -2
View File
@@ -27,5 +27,5 @@ eval "$(direnv hook bash)"
#source ~/sdks/vulkan/1.4.313.0/setup-env.sh #source ~/sdks/vulkan/1.4.313.0/setup-env.sh
# export DENO_CONFIG="/home/caleb/.config/deno" export DENO_CONFIG="/home/caleb/.config/deno"
# export PATH="$DENO_CONFIG/bin:$PATH" export PATH="$DENO_CONFIG/bin:$PATH"
+2
View File
@@ -0,0 +1,2 @@
[General]
savePath=/home/caleb/downloads
+1
View File
@@ -0,0 +1 @@
.envrc
+2
View File
@@ -5,4 +5,6 @@ x-scheme-handler/http=google-chrome.desktop
x-scheme-handler/https=google-chrome.desktop x-scheme-handler/https=google-chrome.desktop
x-scheme-handler/about=google-chrome.desktop x-scheme-handler/about=google-chrome.desktop
x-scheme-handler/unknown=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 x-scheme-handler/claude-cli=claude-code-url-handler.desktop