diff --git a/config/shared/bin/dev-tmux-wrapper.sh b/config/shared/bin/dev-tmux-wrapper.sh index d6870e6..1ef744d 100755 --- a/config/shared/bin/dev-tmux-wrapper.sh +++ b/config/shared/bin/dev-tmux-wrapper.sh @@ -1,6 +1,6 @@ #!/bin/bash -/home/tomas/bin/dev "$@" 2>&1 +/home/tomas/bin/flow "$@" 2>&1 exit_code=$? if [ $exit_code -ne 0 ]; then diff --git a/config/shared/bin/flow b/config/shared/bin/flow index c322108..e956bf4 100755 --- a/config/shared/bin/flow +++ b/config/shared/bin/flow @@ -97,6 +97,7 @@ DEFAULT_REGISTRY="registry.tomastm.com" DEFAULT_TAG="latest" PROJECT_DIR="$HOME/projects" PROJECT_ABBR="p" +CONTAINER_HOME="/home/dev" fail() { printf 'Error: %b\n' "$*" >&2 diff --git a/config/shared/git b/config/shared/git index b3527ed..4fdaa21 100644 --- a/config/shared/git +++ b/config/shared/git @@ -14,6 +14,13 @@ [remote] pushDefault = origin [alias] - amend = commit -a --amend --no-edit + amend = commit --amend --no-edit rename = branch -m + st = status + lg = log --oneline --graph --decorate --all + lga = log --oneline --graph --decorate --all --author=you + unstage = reset HEAD + last = log -1 HEAD + tags = tag -l + undo = reset --mixed HEAD~1 diff --git a/config/shared/nvim b/config/shared/nvim index 4419f2e..70486dd 160000 --- a/config/shared/nvim +++ b/config/shared/nvim @@ -1 +1 @@ -Subproject commit 4419f2e5f3e693b0eac260c588c2cceaaeb6b1e1 +Subproject commit 70486dda84d1841379272e44a0560d3ee9b3291c diff --git a/config/shared/tmux b/config/shared/tmux index 2bf9ef3..81dca8d 100644 --- a/config/shared/tmux +++ b/config/shared/tmux @@ -63,6 +63,6 @@ bind r source-file ~/.tmux.conf \; display "Reloaded!" unbind d bind e detach -bind d command-prompt -I "dev " 'run-shell "/home/tomas/bin/dev-tmux-wrapper.sh %1 --from #{session_name}"' +bind d command-prompt -I "flow " 'run-shell "/home/tomas/bin/dev-tmux-wrapper.sh %1 --from #{session_name}"' diff --git a/config/shared/zsh b/config/shared/zsh index c785a10..339c281 100644 --- a/config/shared/zsh +++ b/config/shared/zsh @@ -49,3 +49,7 @@ alias ll='ls -lF' alias lla='ll -a' alias ld='ls -ld */' +alias ga='git add' +alias gcm='git commit -m' +alias gp='git push' +alias gst='git status'