diff --git a/gitconfig b/gitconfig index dcccbaf..c58dbb2 100644 --- a/gitconfig +++ b/gitconfig @@ -9,3 +9,9 @@ smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true +[difftool "sourcetree"] + cmd = opendiff \"$LOCAL\" \"$REMOTE\" + path = +[mergetool "sourcetree"] + cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" + trustExitCode = true diff --git a/kakrc b/kakrc index 9c58585..e332365 100644 --- a/kakrc +++ b/kakrc @@ -1,5 +1,5 @@ -hook global WinCreate .* %{set global indentwidth 2} -hook global WinCreate .* %{set global tabstop 2} +hook global WinCreate .* %{set global indentwidth 4} +hook global WinCreate .* %{set global tabstop 4} hook global WinCreate .* %{hook window InsertChar \t %{ exec -draft h@}} hook global InsertChar \( 'exec )' diff --git a/skhdrc b/skhdrc index 57218a0..9543aec 100644 --- a/skhdrc +++ b/skhdrc @@ -127,7 +127,10 @@ fn - x : chunkc tiling::desktop --mirror horizontal fn - a : chunkc tiling::desktop --toggle offset # toggle window fullscreen -fn - f : chunkc tiling::window --toggle fullscreen +# 0x38 - f : chunkc tiling::window --toggle fullscreen +# fn - f : chunkc tiling::window --toggle fullscreen +shift - 0x0A: chunkc tiling::window --toggle fullscreen + # toggle window native fullscreen # shift + fn - f : chunkc tiling::window --toggle native-fullscreen diff --git a/zshrc b/zshrc index d41c1b0..1727785 100644 --- a/zshrc +++ b/zshrc @@ -182,6 +182,7 @@ function gcol { } +alias uglycopy="uglifyjs | pbcopy" # source ~/dotfiles/pomodoro/pomodoro.sh