Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,6 @@
[submodule "home/.vim/bundle/vim-ember-hbs"]
path = home/.vim/bundle/vim-ember-hbs
url = https://github.com/joukevandermaas/vim-ember-hbs.git
[submodule "home/.pyenv"]
path = home/.pyenv
url = https://github.com/pyenv/pyenv.git
8 changes: 4 additions & 4 deletions home/.bin-services/git_repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ def validate_for_hotfix!
raise GitError, "Please pull --rebase master and develop"
end

puts "Checking for existing hotfix branch"
if has_existing_branch_name?("hotfix")
raise GitFlowError, "You already have an existing hotfix branch"
end
#puts "Checking for existing hotfix branch"
#if has_existing_branch_name?("hotfix")
# raise GitFlowError, "You already have an existing hotfix branch"
#end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think @jnimety cleaned this up. Could you rebase/merge, please?

end

def validate_for_feature!
Expand Down
1 change: 1 addition & 0 deletions home/.pyenv
Submodule .pyenv added at 5603eb
10 changes: 5 additions & 5 deletions home/.thymerc
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ option :t, :today, 'open today sheet' do
end

option :p, :break, 'start a break' do
run
@run = true
end

option :b, :break, 'start a break' do
set :timer, 5*60
run
@run = true
end

option :l, :long_break, 'start a long break' do
set :timer, 10*60
run
@run = true
end

option :s, 'seconds num', 'run with custom seconds' do |num|
@timer = num.to_i
run
@run = true
end

option :m, 'minutes num', 'run with custom minutes' do |num|
@timer = num.to_i * 60
run
@run = true
end

option :r, :reset, 'reset status bar' do
Expand Down
6 changes: 6 additions & 0 deletions home/.zshenv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export PYENV_ROOT=~/.pyenv
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I seem to recall there are reasons to prefer this. (Haven't looked this up recently.)

Suggested change
export PYENV_ROOT=~/.pyenv
export PYENV_ROOT=$HOME/.pyenv

export PATH=$PYENV_ROOT/bin:$PATH

if command -v pyenv 1>/dev/null 2>&1; then
eval "$(pyenv init -)"
fi