Skip to content

Commit

Permalink
config chances
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaylor89 committed Feb 19, 2024
1 parent 359d348 commit 19b83e2
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 12 deletions.
17 changes: 12 additions & 5 deletions VSCode/settings.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
{
"telemetry.telemetryLevel": "off",
"files.autoSave": "afterDelay",
"workbench.colorTheme": "Community Material Theme Palenight High Contrast",
"vim.insertModeKeyBindings": [
{
"before": ["j", "k"],
"after": ["<Esc>"]
}
],
"editor.fontSize": 14,
"editor.fontLigatures": true,
"git.enableSmartCommit": true,
"terminal.external.osxExec": "Alacritty.app",
"terminal.integrated.cursorStyle": "line",
"terminal.integrated.fontFamily": "Anonymice Nerd Font Mono",
"terminal.integrated.fontWeightBold": "normal",
"editor.suggestSelection": "first",
"workbench.activityBar.visible": true,
"editor.minimap.enabled": true,
"terminal.integrated.fontSize": 16,
"git.autofetch": true,
Expand All @@ -25,7 +22,7 @@

},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "vscode.json-language-features"
},
"eslint.alwaysShowStatus": true,
"eslint.packageManager": "yarn",
Expand All @@ -35,7 +32,7 @@
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"editor.fontFamily": "Dank Mono",
"editor.fontFamily": "Jetbrains Mono",
"editor.codeActionsOnSave": [
"source.formatDocument",
"source.fixAll.eslint"
Expand Down Expand Up @@ -78,6 +75,16 @@
"rust-analyzer.trace.extension": true,
"typescript.updateImportsOnFileMove.enabled": "always",
"githubPullRequests.pullBranch": "never",
"redhat.telemetry.enabled": false,
"workbench.colorTheme": "Material Theme Darker High Contrast",
"github.copilot.enable": {
"*": true,
"yaml": true,
"plaintext": false,
"markdown": false,
"scminput": false
},
"extensions.ignoreRecommendations": true,
"window.zoomLevel": 1,
// "typescript.tsserver.experimental.enableProjectDiagnostics": true,
// "githubPullRequests.pullBranch": "never",
Expand Down
3 changes: 3 additions & 0 deletions bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
if [ -f $(brew --prefix)/etc/bash_completion ]; then source $(brew --prefix)/etc/bash_completion; fi

# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
export PATH="$PATH:$HOME/.rvm/bin"
6 changes: 3 additions & 3 deletions rc.d/aliases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ alias tmuxconf="vim ~/.tmux.conf"
alias vimrc="vim ~/.vimrc"

# abbr
alias la="exa -abghl --git"
alias ll="exa -bghl --git"
alias lt="exa --tree"
alias la="eza -abghl --git"
alias ll="eza -bghl --git"
alias lt="eza --tree"
alias cls="clear"
alias rmd="rm -rf"
alias r="ranger"
Expand Down
4 changes: 4 additions & 0 deletions starship.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ full_symbol = ""
charging_symbol = ""
discharging_symbol = ""

[docker_context]
disabled = true

[gcloud]
format = ""
disabled = true

[aws]
format = ""
Expand Down
4 changes: 2 additions & 2 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ nnoremap <S-Down> <C-E>

" Insert mode mappings ----------------------{{{
inoremap jk <esc>
inoremap ( ()<left>
inoremap { {}<left>
" inoremap ( ()<left>
" inoremap { {}<left>

" Use TAB to complete when typing words, else inserts TABs as usual. Uses
" dictionary, source files, and completor to find matching words to complete.
Expand Down
1 change: 1 addition & 0 deletions yabairc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ yabai -m rule --add app="^Simulator$" manage=off
yabai -m rule --add app="^JetBrains Toolbox$" manage=off
yabai -m rule --add app="^Neat$" manage=off
yabai -m rule --add app="^FaceTime$" manage=off
yabai -m rule --add app="^Loom$" manage=off

echo "yabai configuration loaded.."

25 changes: 25 additions & 0 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,28 @@ if [ -f "$HOME/Repos/google-cloud-sdk/path.zsh.inc" ]; then . "$HOME/Repos/googl

# The next line enables shell command completion for gcloud.
if [ -f "$HOME/Repos/google-cloud-sdk/completion.zsh.inc" ]; then . "$HOME/Repos/google-cloud-sdk/completion.zsh.inc"; fi

## [Completion]
## Completion scripts setup. Remove the following line to uninstall
[[ -f /Users/johannes/.dart-cli-completion/zsh-config.zsh ]] && . /Users/johannes/.dart-cli-completion/zsh-config.zsh || true
## [/Completion]


# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/Users/johannes/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/Users/johannes/miniconda3/etc/profile.d/conda.sh" ]; then
. "/Users/johannes/miniconda3/etc/profile.d/conda.sh"
else
export PATH="/Users/johannes/miniconda3/bin:$PATH"
fi
fi
unset __conda_setup
# <<< conda initialize <<<


# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
export PATH="$PATH:$HOME/.rvm/bin"
4 changes: 2 additions & 2 deletions zshrc.d/exports.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# All path locations
export PATH=$HOME/bin:/usr/local/bin:$HOME/.local/bin:$HOME/go/bin:$HOME/.cargo/bin:$HOME/flutter/bin:$HOME/Library/Python/3.9/bin:$HOME/google-cloud-sdk/bin:$HOME/.pub-cache/bin:$PATH

export PATH=$PATH:/opt/homebrew/bin

export PATH=$PATH:/Users/johannes/.spicetify
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
export PATH="/opt/homebrew/sbin:$PATH"
export PATH="/opt/homebrew/bin:$PATH"

# Path to your oh-my-zsh installation.
export ZSH=$HOME/.oh-my-zsh
Expand Down

0 comments on commit 19b83e2

Please sign in to comment.