naomi/dots
1
0
Fork 0
mirror of https://github.com/NaomiAmethyst/dots.git synced 2025-04-13 09:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix.

Browse source
This commit is contained in:
Bryan Jowers 2012-10-21 16:49:41 -05:00
parent 1b4c0b59b4
commit 5b9d758d32
6 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitmodules vendored Normal file
View file

@ -0,0 +1,12 @@
[submodule "vim/bundle/vim-less"]
path = vim/bundle/vim-less
url = https://github.com/groenewege/vim-less.git
[submodule "vim/bundle/command-t"]
path = vim/bundle/command-t
url = git://git.wincent.com/command-t.git
[submodule "vim/bundle/vim-fugitive"]
path = vim/bundle/vim-fugitive
url = git://github.com/tpope/vim-fugitive.git
[submodule "vim/bundle/vim-javascript"]
path = vim/bundle/vim-javascript
url = https://github.com/pangloss/vim-javascript.git

1
gitconfig
View file

@ -21,6 +21,7 @@
cat = show
list = show
ls = show
subup = submodule update --init --recursive
untrack-ignored = !git-untracked-ignored
info = !git-info

2
vim/bundle/command-t

@ -1 +1 @@
Subproject commit 18686a82a2e4d015b877bf0b6867a269aa8a284f
Subproject commit 07087e16ba8fe0a87b1d1ccd03e158a0157dc1f8

2
vim/bundle/vim-fugitive

@ -1 +1 @@
Subproject commit 64716b9622e5c3fae0caec7e9589988a9da146cb
Subproject commit 05763df0ed8bfa8a6d4453d089e9d82530497ea1

1
vim/bundle/vim-less Submodule

@ -0,0 +1 @@
Subproject commit 0223dcdf0f4d3cb2b811a10c3673c0832b337415

6
zsh/prompt
View file

@ -68,6 +68,7 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="!"
ZSH_THEME_GIT_PROMPT_DELETED="-"
ZSH_THEME_GIT_PROMPT_UNMERGED="&"
ZSH_THEME_GIT_PROMPT_RENAMED=">"
ZSH_THEME_GIT_PROMPT_SUBMODULE="_"
git_prompt_status() {
INDEX=$(git status --porcelain 2> /dev/null)
STATUS=""
@ -97,6 +98,9 @@ git_prompt_status() {
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
fi
if $(cd "$1" ; git submodule status --recursive | egrep '^(\+|-)' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_SUBMODULE$STATUS"
fi
echo $STATUS
}
function updateprompt () {
@ -158,7 +162,7 @@ function updateprompt () {
stashes="$(git stash list 2>/dev/null | wc -l | xargs)"
stashpart="${RESETCOLOR}${GRAY}(${GREEN}${stashes}${GRAY} stashed)${RESETCOLOR}"
fi
local stats="$(git_prompt_status)"
local stats="$(git_prompt_status "${repodir}")"
PROMPT=${RESETCOLOR}${HOSTCOLOR}$'%n@'${LHOSTNAME}${BLACKCOLOR}':'${PATHCOLOR}"${reponame} ${RED}${branch}${YELLOW}${stats}${BLACKCOLOR}${additional} ${PATHCOLOR}"$'%45<...<'"${repopath}"' %(?..'${BOLDERRORCOLOR}$')%(!.#.$) '${RESETCOLOR}
RPROMPT=${RESETCOLOR}${stashpart}${remotepart}$'%1(j.'${JOBCOLOR}$'[%j].)%(?..'${ERRORCOLOR}$'[%?])'${CLOCKCOLOR}$'[%t]'${RESETCOLOR}
cdpath=( . "$repodir" ~ ~/Giftikigit ~/launchrockgit ~/loagit ~/git .. )