Improve configs

janwirth · Aug 21, 2019 · 63bcb6a · 63bcb6a
1 parent 8f3889a
commit 63bcb6a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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 )<left>'

diff --git 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
@@ -182,6 +182,7 @@ function gcol {
 }
 
 
+alias uglycopy="uglifyjs | pbcopy"
 
 
 # source ~/dotfiles/pomodoro/pomodoro.sh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -182,6 +182,7 @@ function gcol {
		}


		alias uglycopy="uglifyjs \| pbcopy"


		# source ~/dotfiles/pomodoro/pomodoro.sh
Expand Down