naomi/dots
1
0
Fork 0
mirror of https://github.com/NaomiAmethyst/dots.git synced 2025-08-05 16:48:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes.

Browse source
This commit is contained in:
Jacobi Carter 2013-04-08 11:44:10 -07:00
commit 5f8599fee9
4 changed files with 120 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Xdefaults
View file

@ -1 +0,0 @@
Xresources

104
Xdefaults Normal file
View file

@ -0,0 +1,104 @@
/* XFT */
Xft*dpi: 96
Xft*antialias: true
/* XTerm */
XTerm*class: UXTerm
XTerm*utf8: 1
XTerm*faceSize: 9
XTerm*faceName: Monospace
XTerm*background: black
XTerm*foreground: #CCCCCC
XTerm*termName: xterm-256color
XTerm*eightBitInput: false
XTerm*eightBitOutput: true
XTerm*eightBitControl: false
XTerm*color0: #2E3436
XTerm*color1: #CC0000
XTerm*color2: #4E9A06
XTerm*color3: #C4A000
XTerm*color4: #3465A4
XTerm*color5: #75507B
XTerm*color6: #06989A
XTerm*color7: #D3D7CF
XTerm*color8: #555753
XTerm*color9: #EF2929
XTerm*color10: #8AE234
XTerm*color11: #FCE94F
XTerm*color12: #729FCF
XTerm*color13: #AD7FA8
XTerm*color14: #34E2E2
XTerm*color15: #EEEEEC
XTerm*toolBar: false
/* UXTerm */
UXTerm*faceSize: 9
UXTerm*faceName: Monospace
UXTerm*background: black
UXTerm*foreground: #CCCCCC
UXTerm*termName: xterm-256color
UXTerm*eightBitInput: false
UXTerm*eightBitOutput: true
UXTerm*eightBitControl: false
UXTerm*color0: #2E3436
UXTerm*color1: #CC0000
UXTerm*color2: #4E9A06
UXTerm*color3: #C4A000
UXTerm*color4: #3465A4
UXTerm*color5: #75507B
UXTerm*color6: #06989A
UXTerm*color7: #D3D7CF
UXTerm*color8: #555753
UXTerm*color9: #EF2929
UXTerm*color10: #8AE234
UXTerm*color11: #FCE94F
UXTerm*color12: #729FCF
UXTerm*color13: #AD7FA8
UXTerm*color14: #34E2E2
UXTerm*color15: #EEEEEC
UXTerm*toolBar: false
/* URxvt */
URxvt*font: xft:Monospace-9
URxvt*background: black
URxvt*foreground: #CCCCCC
URxvt*termName: rxvt-unicode
URxvt*color0: #2E3436
URxvt*color1: #CC0000
URxvt*color2: #4E9A06
URxvt*color3: #C4A000
URxvt*color4: #3465A4
URxvt*color5: #75507B
URxvt*color6: #06989A
URxvt*color7: #D3D7CF
URxvt*color8: #555753
URxvt*color9: #EF2929
URxvt*color10: #8AE234
URxvt*color11: #FCE94F
URxvt*color12: #729FCF
URxvt*color13: #AD7FA8
URxvt*color14: #34E2E2
URxvt*color15: #EEEEEC
/* Rxvt */
Rxvt*termName: rxvt
/* Aterm */
Aterm*termName: aterm
/* pterm */
pterm.TerminalType: putty-256color

3
gitconfig
View file

@ -23,7 +23,6 @@
ls = show ls = show
subup = submodule update --init --recursive subup = submodule update --init --recursive
bm = merge --no-ff --no-commit --log bm = merge --no-ff --no-commit --log
untrack-ignored = !git-untracked-ignored untrack-ignored = !git-untracked-ignored
info = !git-info info = !git-info
amend = commit --amend -C HEAD amend = commit --amend -C HEAD
@ -40,4 +39,4 @@
default = matching default = matching
[user] [user]
name = Jacobi Carter name = Jacobi Carter
email = cobi@jacobicarter.com email = jcarter@okta.com

1
mkshrc
View file

@ -1 +0,0 @@
shinit

11
mkshrc Normal file
View file

@ -0,0 +1,11 @@
if [ -d "${HOME}/.commonsh" ] ; then
for file in "${HOME}"/.commonsh/* ; do
. "${file}"
done
fi
if [ -d "${HOME}/.sh" ] ; then
for file in "${HOME}"/.sh/* ; do
. "${file}"
done
fi

8
zsh/prompt
View file

@ -105,7 +105,7 @@ git_prompt_status() {
} }
function updateprompt () { function updateprompt () {
if havegit ; then if havegit ; then
local gitdir="$(readlink -m $(git rev-parse --git-dir 2>/dev/null))" local gitdir="$(python -c 'import os,sys;print os.path.realpath(sys.argv[1])' $(git rev-parse --git-dir 2>/dev/null))"
local repodir="$(dirname "${gitdir}")" local repodir="$(dirname "${gitdir}")"
local reponame="$(basename "${repodir}")" local reponame="$(basename "${repodir}")"
local curdir="$(pwd)" local curdir="$(pwd)"
@ -147,19 +147,19 @@ function updateprompt () {
if [[ -n ${remote} ]] ; then if [[ -n ${remote} ]] ; then
# for git prior to 1.7 # for git prior to 1.7
# ahead=$(git rev-list origin/${hook_com[branch]}..HEAD | wc -l) # ahead=$(git rev-list origin/${hook_com[branch]}..HEAD | wc -l)
local ahead="$(git rev-list ${branch}@{upstream}..HEAD 2>/dev/null | wc -l)" local ahead="$(git rev-list ${branch}@{upstream}..HEAD 2>/dev/null | wc -l | xargs)"
gitstatus+=( "${GREEN}+${ahead}${GRAY}" ) gitstatus+=( "${GREEN}+${ahead}${GRAY}" )
# for git prior to 1.7 # for git prior to 1.7
# behind=$(git rev-list HEAD..origin/${hook_com[branch]} | wc -l) # behind=$(git rev-list HEAD..origin/${hook_com[branch]} | wc -l)
local behind="$(git rev-list HEAD..${branch}@{upstream} 2>/dev/null | wc -l)" local behind="$(git rev-list HEAD..${branch}@{upstream} 2>/dev/null | wc -l | xargs)"
gitstatus+=( "${RED}-${behind}${GRAY}" ) gitstatus+=( "${RED}-${behind}${GRAY}" )
remotepart="${RESETCOLOR}${GRAY}[${remote} ${(j:/:)gitstatus}]${RESETCOLOR}" remotepart="${RESETCOLOR}${GRAY}[${remote} ${(j:/:)gitstatus}]${RESETCOLOR}"
fi fi
local stashpart="" local stashpart=""
if [[ -s ${gitdir}/refs/stash ]] ; then if [[ -s ${gitdir}/refs/stash ]] ; then
stashes=$(git stash list 2>/dev/null | wc -l) stashes="$(git stash list 2>/dev/null | wc -l | xargs)"
stashpart="${RESETCOLOR}${GRAY}(${GREEN}${stashes}${GRAY} stashed)${RESETCOLOR}" stashpart="${RESETCOLOR}${GRAY}(${GREEN}${stashes}${GRAY} stashed)${RESETCOLOR}"
fi fi
local stats="$(git_prompt_status "${repodir}")" local stats="$(git_prompt_status "${repodir}")"