Skip to content

Commit

Permalink
fix(): :)
Browse files Browse the repository at this point in the history
  • Loading branch information
kud committed Oct 2, 2019
1 parent 3e9a300 commit 59b7b18
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 4 additions & 2 deletions core/brew
Expand Up @@ -76,7 +76,6 @@ brewinstall less # because the macOS built-in version is old
brewinstall p7zip
brewinstall autojump
brewinstall brightness
brewinstall monitorcontrol
brewinstall z
brewinstall ripgrep

Expand Down Expand Up @@ -153,7 +152,6 @@ if [ ! -d "$HOME/Sync" ]; then
fi

caskinstall java # sorry my love :(
# caskinstall alfred
caskinstall flux
# caskinstall iterm2
caskinstall iterm2-nightly
Expand Down Expand Up @@ -184,6 +182,7 @@ caskinstall monodraw
caskinstall github-beta
caskinstall gitkraken
caskinstall gitup
caskinstall lazygit
caskinstall xrg
caskinstall molotov
caskinstall insomnia # REST Client β€” https://insomnia.rest/
Expand Down Expand Up @@ -305,6 +304,9 @@ caskinstall steermouse # http://plentycom.jp/en/steermouse/
caskinstall background-music-pre
caskinstall fliqlo
caskinstall tyke
caskinstall sip
caskinstall alfred
# caskinstall monitorcontrol
# caskinstall cheatsheet

source $MY/profiles/$OS_PROFILE/core/brew 2> /dev/null
Expand Down
7 changes: 5 additions & 2 deletions dotfiles/.gitconfig
Expand Up @@ -41,6 +41,8 @@
kraken = "!open -na 'GitKraken' --args -p $(pwd)"
gu = "!gitup open ."
sm = "!'/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge' ."
tig = "!tig"
lazy = "!lazygit"
lg = log -p
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
Expand All @@ -58,11 +60,10 @@
rmdf = "!git rm $(git ls-files --deleted)"
# export = "!git clone --depth 1 $1 && rm -rf \"$(basename $1 .git)/.git\" -"
branches = branch -avv
lazy = "!git add -A && git commit -m '🌬' && git push"
wip = "!git add -A && git commit -m '🚧 WIP 🚧'"
unwip = "!git reset --soft HEAD~1 && git unstage"
polish = "!git add -A && git commit -m 'πŸ’…'"
fix-it = "!git add -A && git commit -m 'πŸš’'"
hotfix = "!git add -A && git commit -m 'πŸš’'"
refresh = "!git fetch && git rebase origin/master"
rewrite = "!git fetch && git rebase -i $(git merge-base origin/master HEAD)"
finalise = "!git fetch && git rebase origin/master && git rebase -i $(git merge-base origin/master HEAD)"
Expand All @@ -88,3 +89,5 @@
prune = true
[rebase]
autosquash = true
[commit]
verbose = true
1 change: 1 addition & 0 deletions dotfiles/.zpreztorc
Expand Up @@ -76,6 +76,7 @@ zstyle ':prezto:module:editor' dot-expansion 'yes'

# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
# zstyle ':prezto:module:git:status:ignore' submodules 'all'
# zstyle ':prezto:module:git:alias' skip 'yes'

#
# GNU Utility
Expand Down

0 comments on commit 59b7b18

Please sign in to comment.