Skip to content

Commit

Permalink
updating all dotfiles to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
jack.ramey committed Jul 24, 2023
1 parent d106c0c commit b023d3d
Show file tree
Hide file tree
Showing 10 changed files with 763 additions and 177 deletions.
74 changes: 74 additions & 0 deletions gitconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
[user]
name = jack.ramey
email = [email protected]
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[alias]
cleanup = "!f() { \
if [[ -n $(git status -s) ]]; then \
echo \"Uncommitted changes on current branch, halting cleanup\" ; \
exit 1; \
fi; \
read -r -p 'Confirm cleanup current branch [Y/n]? ' choice ; \
if ! [[ $choice =~ ^[Yy]$ ]]; then \
echo "Skipping cleanup." ; \
exit 1 ; \
fi; \
branch=`git rev-parse --abbrev-ref HEAD` ; \
echo $branch ; \
if [[ $branch == 'master' ]]; then \
echo "Cannot delete master branch" ; \
echo "Exiting" ; \
exit 1 ; \
fi; \
git co master ; \
git b -D ${branch} ; \
git pull -r ; \
}; \
f"
review = "!f() { \
if [ -z $1 ]; then \
echo \"Usage: git review <branch> <topic>\"; \
else \
if [ -z $2 ]; then \
git push origin HEAD:refs/for/$1; \
else \
git push origin HEAD:refs/for/$1/$2; \
fi; \
fi; \
}; \
f"
sync = "!f() { \
echo \"Syncing main branch\" ; \
git fetch origin main:main; \
}; \
f"
presvnci = !git rebase -i `git rev-list -n1 --grep=git-svn-id HEAD`
plog = log --pretty=tformat:'%h %Cred%cr%Creset %an %Cgreen%s%Creset'
changes = diff-tree --no-commit-id --name-only -r HEAD
co = checkout
st = status
[color]
ui = auto
[merge]
tool = opendiff
[core]
editor = vim
excludesfile = /Users/jackramey/.gitignore
[push]
default = simple
[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
[credential]
helper = osxkeychain
[pager]
branch = false
[url "[email protected]:"]
insteadOf = https://bitbucket.org/
[pull]
ff = only
12 changes: 11 additions & 1 deletion gitignore_global
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
*.orig
*.bak

# serverless output
.serverless/

# VIM #
.*.un~

Expand All @@ -18,4 +21,11 @@
.mage

# Repl directories
cmd/repl/
cmd/repl/
repl/

# Tendo specific configurations
tendo.zsh



72 changes: 36 additions & 36 deletions hammerspoon/init.lua
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
-- Remove animations
hs.window.animationDuration=0

HyperKey = {"cmd", "alt", "ctrl"}
VyperKey = {"cmd", "alt", "ctrl", "shift"}
MehKey = {"cmd", "alt", "ctrl"}
HyperKey = {"cmd", "alt", "ctrl", "shift"}

---------------------
-- Resize Bindings --
Expand Down Expand Up @@ -193,12 +193,12 @@ end
switcher = hs.window.switcher.new(hs.window.filter.new():setCurrentSpace(true):setDefaultFilter{})
switcher.ui.showTitles = true
switcher.ui.showThumbnails = false
switcher.ui.fontName = 'Hack'
-- switcher.ui.fontName = 'Hack'
switcher.ui.backgroundColor = {0.0,0.0,0.0,0}
switcher.ui.showSelectedTitle = false


hs.hotkey.bind(HyperKey,'tab','',function()
hs.hotkey.bind(MehKey,'tab','',function()
switcher:next()
end)

Expand All @@ -217,63 +217,63 @@ end)
-- end
-- end

-- hs.hotkey.bind(HyperKey, 'down', changeVolume(-5))
-- hs.hotkey.bind(HyperKey, 'up', changeVolume(5))
-- hs.hotkey.bind(MehKey, 'down', changeVolume(-5))
-- hs.hotkey.bind(MehKey, 'up', changeVolume(5))

-----------------------
-- Location Bindings --
-----------------------

-- Switch to next screen
hs.hotkey.bind(HyperKey, "R", NextScreen())
hs.hotkey.bind(MehKey, "R", NextScreen())

-- Center
hs.hotkey.bind(HyperKey, "space", Full())
hs.hotkey.bind(VyperKey, "space", Center(.6))
hs.hotkey.bind(MehKey, "space", Full())
hs.hotkey.bind(HyperKey, "space", Center(.6))
hs.hotkey.bind(HyperKey, "C", Center(.4))
hs.hotkey.bind(VyperKey, "C", Center(.8))
hs.hotkey.bind(HyperKey, "U", Top(.5))
hs.hotkey.bind(HyperKey, "I", Bottom(.5))
hs.hotkey.bind(MehKey, "C", Center(.8))
hs.hotkey.bind(MehKey, "U", Top(.5))
hs.hotkey.bind(MehKey, "I", Bottom(.5))

-- Left
hs.hotkey.bind(VyperKey, "H", Left(.3))
hs.hotkey.bind(HyperKey, "H", Left(.5))
hs.hotkey.bind(HyperKey, "J", Left(.6))
hs.hotkey.bind(VyperKey, "J", Left(.7))
hs.hotkey.bind(HyperKey, "H", Left(.3))
hs.hotkey.bind(MehKey, "H", Left(.5))
hs.hotkey.bind(MehKey, "J", Left(.6))
hs.hotkey.bind(HyperKey, "J", Left(.7))

-- Right
hs.hotkey.bind(VyperKey, "K", Right(.7))
hs.hotkey.bind(HyperKey, "K", Right(.6))
hs.hotkey.bind(HyperKey, "L", Right(.5))
hs.hotkey.bind(VyperKey, "L", Right(.3))
hs.hotkey.bind(HyperKey, "K", Right(.7))
hs.hotkey.bind(MehKey, "K", Right(.6))
hs.hotkey.bind(MehKey, "L", Right(.5))
hs.hotkey.bind(HyperKey, "L", Right(.3))

-- Left Quadrants
hs.hotkey.bind(VyperKey, "O", LeftTop(.3, .5))
hs.hotkey.bind(HyperKey, "O", LeftTop(.5, .5))
hs.hotkey.bind(HyperKey, "N", LeftBot(.5, .5))
hs.hotkey.bind(VyperKey, "N", LeftBot(.3, .5))
hs.hotkey.bind(HyperKey, "O", LeftTop(.3, .5))
hs.hotkey.bind(MehKey, "O", LeftTop(.5, .5))
hs.hotkey.bind(MehKey, "N", LeftBot(.5, .5))
hs.hotkey.bind(HyperKey, "N", LeftBot(.3, .5))

-- Right Quadrants
hs.hotkey.bind(VyperKey, "P", RightTop(.3, .5))
hs.hotkey.bind(HyperKey, "P", RightTop(.5, .5))
hs.hotkey.bind(HyperKey, "M", RightBot(.5, .5))
hs.hotkey.bind(VyperKey, "M", RightBot(.3, .5))
hs.hotkey.bind(HyperKey, "0", RightBot(.7, .7))
hs.hotkey.bind(HyperKey, "P", RightTop(.3, .5))
hs.hotkey.bind(MehKey, "P", RightTop(.5, .5))
hs.hotkey.bind(MehKey, "M", RightBot(.5, .5))
hs.hotkey.bind(HyperKey, "M", RightBot(.3, .5))
hs.hotkey.bind(MehKey, "0", RightBot(.7, .7))

-- Resize Window --

-- hs.hotkey.bind(HyperKey, "left", ExtendLeft(5), nil, ExtendLeft(5))
-- hs.hotkey.bind(VyperKey, "left", ShrinkRight(5), nil, ShrinkRight(5))
-- hs.hotkey.bind(HyperKey, "right", ExtendRight(5), nil, ExtendRight(5))
-- hs.hotkey.bind(VyperKey, "right", ShrinkLeft(5), nil, ShrinkLeft(5))
-- hs.hotkey.bind(MehKey, "left", ExtendLeft(5), nil, ExtendLeft(5))
-- hs.hotkey.bind(HyperKey, "left", ShrinkRight(5), nil, ShrinkRight(5))
-- hs.hotkey.bind(MehKey, "right", ExtendRight(5), nil, ExtendRight(5))
-- hs.hotkey.bind(HyperKey, "right", ShrinkLeft(5), nil, ShrinkLeft(5))

---------------
-- Shortcuts --
---------------

-- Lock Screen
hs.hotkey.bind(HyperKey, 'escape', function() hs.caffeinate.startScreensaver() end)
hs.hotkey.bind(VyperKey, 'escape', function() hs.caffeinate.systemSleep() end)
hs.hotkey.bind(MehKey, 'escape', function() hs.caffeinate.startScreensaver() end)
hs.hotkey.bind(HyperKey, 'escape', function() hs.caffeinate.systemSleep() end)

-- Reload Config
hs.hotkey.bind(HyperKey, "f5", function() hs.reload() end)
hs.hotkey.bind(MehKey, "f5", function() hs.reload() end)
Loading

0 comments on commit b023d3d

Please sign in to comment.