diff --git a/.config/git/config b/.config/git/config index 239c49a..28b0b17 100644 --- a/.config/git/config +++ b/.config/git/config @@ -24,6 +24,7 @@ [alias] df = difftool + lg = !lazygit log -sm full [filter "lfs"] required = true diff --git a/.zshrc b/.zshrc index 451a499..bd33efb 100644 --- a/.zshrc +++ b/.zshrc @@ -301,7 +301,3 @@ function git_branch_cache_clear() { add-zsh-hook chpwd maybe_nvm_after_cd add-zsh-hook chpwd git_branch_cache_clear -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$HOME/.sdkman" -[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" - diff --git a/Library/Application Support/VSCodium/User/settings.json b/Library/Application Support/VSCodium/User/settings.json index 3e45617..e105f26 100644 --- a/Library/Application Support/VSCodium/User/settings.json +++ b/Library/Application Support/VSCodium/User/settings.json @@ -12,5 +12,8 @@ }, "explorer.confirmDelete": false, "git.blame.editorDecoration.enabled": true, - "git.openRepositoryInParentFolders": "always" + "git.openRepositoryInParentFolders": "always", + "git.blame.statusBarItem.enabled": true, + "explorer.confirmDragAndDrop": false, + "javascript.updateImportsOnFileMove.enabled": "never" }