Skip to content

Commit 5a5bf45

Browse files
committedMar 30, 2021
bump
1 parent b6a105f commit 5a5bf45

File tree

8 files changed

+56
-15
lines changed

8 files changed

+56
-15
lines changed
 

‎bin/.zshmarks

100644100755
File mode changed.

‎bin/_envrc

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env zsh
2+
3+
if [[ $USER == "yed" ]] && [[ -z $MC_SID ]]; then
4+
dotenv
5+
6+
eval "$(pyenv init - --no-rehash)"
7+
eval "$(pyenv virtualenv-init - bash)"
8+
pyenv activate ${ENV_NAME}
9+
fi

‎home/_aliasrc

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ alias l="showmarks"
66

77
#generic
88
alias cal="gcal"
9-
alias tunnel="ssh -q -N -f -D 9999 vanyli.net"
9+
alias tunnel="ssh -q -C -N -f -D 9999 vanyli.net"
1010
alias flushdns="sudo dscacheutil -flushcache;sudo killall -HUP mDNSResponder"
1111

1212
#git
@@ -54,7 +54,5 @@ x86(){
5454
#python
5555
alias delpyc="find . -name '*.py[co]' -delete"
5656

57-
alias ibrew='arch -x86_64 /usr/local/bin/brew'
58-
5957
#alias keymap='hidutil property --set \'{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x700000012}]}\''
6058

‎home/_gitconfig

+3-12
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
[alias]
1919
co = checkout
2020
cp = cherry-pick
21-
slog = log --pretty=oneline --abbrev-commit
22-
glog = log --graph --decorate --pretty=oneline --abbrev-commit
23-
gloga = log --graph --decorate --pretty=oneline --abbrev-commit --all
24-
ls = ls-files
25-
lb = !git reflog show --pretty=format:'%gs ~ %gd' --date=relative | grep 'checkout:' | grep -oE '[^ ]+ ~ .*' | awk -F~ '!seen[$1]++' | head -n 10 | awk -F' ~ HEAD@{' '{printf(\" \\033[33m%s: \\033[37m %s\\033[0m\\n\", substr($2, 1, length($2)-1), $1)}'
21+
lb = !git reflog show --pretty=format:'%gs ~ %gd' --date=relative | grep 'checkout:' | grep -oE '[^ ]+ ~ .*' | awk -F~ '!seen[$1]++' | head -n 10 | awk -F' ~ HEAD@{' '{printf(\" \\033[33m%s: \\033[37m %s\\033[0m\\n\", substr($2, 1, length($2)-1), $1)}'
2622
[push]
2723
default = current
2824

@@ -31,18 +27,13 @@
3127

3228
[branch]
3329
autosetuprebase = always
34-
[http]
35-
sslVerify = false
36-
[difftool "sourcetree"]
37-
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
38-
path =
3930

4031
[filter "lfs"]
4132
clean = git-lfs clean -- %f
4233
smudge = git-lfs smudge -- %f
4334
process = git-lfs filter-process
4435
required = true
45-
[gpg]
46-
program = gpg
4736
[rerere]
4837
enabled = true
38+
[pull]
39+
rebase = false

‎home/_zshrc

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#source /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc
2+
#source /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc
13
# If you come from bash you might have to change your $PATH.
24
#export PATH="/usr/local/opt/openssl/bin:/usr/local/opt/coreutils/libexec/gnubin:$HOME/bin:/usr/local/sbin:/usr/local/opt/openssl/bin/:/opt/homebrew/bin/:/usr/local/bin/:$PATH"
35
export PATH="$HOME/bin:/usr/local/sbin:/usr/local/bin/:/opt/homebrew/bin/:$PATH"
@@ -104,3 +106,14 @@ export PYTHONSTARTUP=~/bin/pythonstartup.py
104106
export PYENV_VIRTUALENV_DISABLE_PROMPT=1
105107
export PIP_REQUIRE_VIRTUALENV=true
106108

109+
110+
export PATH="/opt/homebrew/opt/postgresql@12/bin:$PATH"
111+
export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/"
112+
113+
114+
function _vanyli_prompt {
115+
PS1="$(goshell $?)"
116+
}
117+
118+
#precmd() { _vanyli_prompt }
119+

‎install.py

+3
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,15 @@ def install():
3030

3131
path_to = join(target_dir, phile)
3232
if islink(path_to):
33+
print("skipping symlink %s" % path_to)
3334
continue
3435

3536
if exists(path_to):
37+
print("renaming existing %s" % path_to)
3638
os.rename(path_to, "%s_" % path_to)
3739

3840
os.symlink(path_from, path_to)
41+
print("installing %s" % path_to)
3942

4043
if __name__ == '__main__':
4144
install()

‎launch_agents/.target

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
~/Library/LaunchAgents/
+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>Label</key>
6+
<string>com.local.KeyRemapping</string>
7+
<key>ProgramArguments</key>
8+
<array>
9+
<string>/usr/bin/hidutil</string>
10+
<string>property</string>
11+
<string>--set</string>
12+
<string>{"UserKeyMapping":[
13+
{
14+
"HIDKeyboardModifierMappingSrc": 0xC000000CF,
15+
"HIDKeyboardModifierMappingDst": 0xFF00000009
16+
},
17+
{
18+
"HIDKeyboardModifierMappingSrc": 0x10000009B,
19+
"HIDKeyboardModifierMappingDst": 0xFF00000008
20+
}
21+
]}</string>
22+
</array>
23+
<key>RunAtLoad</key>
24+
<true/>
25+
</dict>
26+
</plist>

0 commit comments

Comments
 (0)
Please sign in to comment.