m/dotfiles
1
0
Fork 0
mirror of https://github.com/kremalicious/dotfiles.git synced 2024-11-24 02:52:06 +01:00
Code Releases Activity

cleanup

Browse Source
This commit is contained in:
Matthias Kretschmann 2018-11-25 17:38:26 +01:00
parent bdfc8c0257
commit 5fd7a65e34
Signed by: m
GPG Key ID: 606EEEF3C479A91F
5 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bash_aliases
View File

@ -11,8 +11,6 @@ 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 .'
# Update All The Things

12
bash_paths
View File

@ -6,7 +6,7 @@
declare -a dirs_to_prepend=(
"/usr/local/sbin"
"/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
# "$GOPATH/bin"
# "$GOROOT/bin"
@ -43,13 +43,3 @@ export PATH
# define CDPATHs which are autocompleted from when doing cd
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
View File

@ -61,13 +61,12 @@ shopt -s checkwinsize
PROMPT_DIRTRIM=4
# Add tab completion for many Bash commands
if which brew &> /dev/null && [ -f "$(brew --prefix)/share/bash-completion/bash_completion" ]; then
# shellcheck source=/dev/null
source "$(brew --prefix)/share/bash-completion/bash_completion";
elif [ -f /etc/bash_completion ]; then
# shellcheck disable=SC1091
source /etc/bash_completion;
fi;
if type brew 2&>/dev/null; then
for completion_file in $(brew --prefix)/etc/bash_completion.d/*; do
# shellcheck disable=SC1091
source "$completion_file"
done
fi
# Perform file completion in a case insensitive fashion
bind "set completion-ignore-case on"

2
editorconfig
View File

@ -8,7 +8,7 @@ charset = utf-8
indent_style = space
indent_size = 4
[{**.json,.travis.yml}]
[.{json,yml,yaml}]
indent_style = space
indent_size = 2

9
gitconfig
View File

@ -74,9 +74,14 @@
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
tool = Kaleidoscope
[mergetool]
prompt = false
[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
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process