mirror of
https://github.com/kremalicious/dotfiles.git
synced 2024-06-30 21:52:00 +02:00
cleanup
This commit is contained in:
parent
bdfc8c0257
commit
5fd7a65e34
|
@ -11,8 +11,6 @@ alias ..="cd .."
|
||||||
alias ...="cd ../.."
|
alias ...="cd ../.."
|
||||||
alias ~="cd ~"
|
alias ~="cd ~"
|
||||||
|
|
||||||
alias a='atom-beta .'
|
|
||||||
alias s='/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl .'
|
|
||||||
alias c='/Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/code .'
|
alias c='/Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/code .'
|
||||||
|
|
||||||
# Update All The Things
|
# Update All The Things
|
||||||
|
|
12
bash_paths
12
bash_paths
|
@ -6,7 +6,7 @@
|
||||||
declare -a dirs_to_prepend=(
|
declare -a dirs_to_prepend=(
|
||||||
"/usr/local/sbin"
|
"/usr/local/sbin"
|
||||||
"/usr/local/bin" # Ensure that this bin always takes precedence over `/usr/bin`
|
"/usr/local/bin" # Ensure that this bin always takes precedence over `/usr/bin`
|
||||||
"$(brew --prefix node)/bin" # Add npm/yarn-installed package bin
|
# "$(brew --prefix node)/bin" # Add npm/yarn-installed package bin
|
||||||
"$(brew --prefix openssl)/bin" # Add newer OpenSSL
|
"$(brew --prefix openssl)/bin" # Add newer OpenSSL
|
||||||
# "$GOPATH/bin"
|
# "$GOPATH/bin"
|
||||||
# "$GOROOT/bin"
|
# "$GOROOT/bin"
|
||||||
|
@ -43,13 +43,3 @@ export PATH
|
||||||
|
|
||||||
# define CDPATHs which are autocompleted from when doing cd
|
# define CDPATHs which are autocompleted from when doing cd
|
||||||
export CDPATH=$CDPATH:~/Code
|
export CDPATH=$CDPATH:~/Code
|
||||||
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Google Cloud SDK
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# if [ -s "$HOME/Code/google-cloud-sdk/" ]; then
|
|
||||||
# source "$HOME/Code/google-cloud-sdk/path.bash.inc"
|
|
||||||
# source "$HOME/Code/google-cloud-sdk/completion.bash.inc"
|
|
||||||
# fi
|
|
||||||
|
|
13
bash_profile
13
bash_profile
|
@ -61,13 +61,12 @@ shopt -s checkwinsize
|
||||||
PROMPT_DIRTRIM=4
|
PROMPT_DIRTRIM=4
|
||||||
|
|
||||||
# Add tab completion for many Bash commands
|
# Add tab completion for many Bash commands
|
||||||
if which brew &> /dev/null && [ -f "$(brew --prefix)/share/bash-completion/bash_completion" ]; then
|
if type brew 2&>/dev/null; then
|
||||||
# shellcheck source=/dev/null
|
for completion_file in $(brew --prefix)/etc/bash_completion.d/*; do
|
||||||
source "$(brew --prefix)/share/bash-completion/bash_completion";
|
# shellcheck disable=SC1091
|
||||||
elif [ -f /etc/bash_completion ]; then
|
source "$completion_file"
|
||||||
# shellcheck disable=SC1091
|
done
|
||||||
source /etc/bash_completion;
|
fi
|
||||||
fi;
|
|
||||||
|
|
||||||
# Perform file completion in a case insensitive fashion
|
# Perform file completion in a case insensitive fashion
|
||||||
bind "set completion-ignore-case on"
|
bind "set completion-ignore-case on"
|
||||||
|
|
|
@ -8,7 +8,7 @@ charset = utf-8
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|
||||||
[{**.json,.travis.yml}]
|
[.{json,yml,yaml}]
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
|
|
|
@ -74,9 +74,14 @@
|
||||||
[difftool "Kaleidoscope"]
|
[difftool "Kaleidoscope"]
|
||||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||||
[merge]
|
[merge]
|
||||||
tool = Kaleidoscope
|
tool = Kaleidoscope
|
||||||
[mergetool]
|
[mergetool]
|
||||||
prompt = false
|
prompt = false
|
||||||
[mergetool "Kaleidoscope"]
|
[mergetool "Kaleidoscope"]
|
||||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||||
trustExitCode = true
|
trustExitCode = true
|
||||||
|
[filter "lfs"]
|
||||||
|
required = true
|
||||||
|
clean = git-lfs clean -- %f
|
||||||
|
smudge = git-lfs smudge -- %f
|
||||||
|
process = git-lfs filter-process
|
||||||
|
|
Loading…
Reference in New Issue
Block a user