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

Merge branch 'master' of gitosis@majnematic.com:davesdots

Browse source
This commit is contained in:
David Alexander Majnemer 2010-09-18 04:05:22 -05:00
commit 07fa5a5790
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
git-info
View file

@ -1,18 +1,13 @@
#! /bin/sh #! /bin/sh
# based on a script by Duane Johnson with some simplifications # based on a script by Duane Johnson with some simplifications
CDPATH=`git rev-parse --show-cdup` GIT_DIR=`git rev-parse --git-dir`
# not a valid git repo? leave # not a valid git repo? leave
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
exit exit
fi fi
# switch to the directory holding .git
if [ -n "${CDPATH}" ] ; then
cd "${CDPATH}"
fi
# Show various information about this git directory # Show various information about this git directory
echo "== Remote URL: `git remote -v`" echo "== Remote URL: `git remote -v`"
@ -25,7 +20,7 @@ git branch
echo echo
echo "== Configuration (.git/config)" echo "== Configuration (.git/config)"
cat .git/config cat "${GIT_DIR}/config"
echo echo
echo "== Most Recent Commit" echo "== Most Recent Commit"

10
vimrc
View file

@ -208,9 +208,9 @@ if has('eval')
exe "tag " . expand("<cword>") exe "tag " . expand("<cword>")
endif endif
endfun endfun
endif
nmap <C-]> :call GoDefinition()<CR> nmap <C-]> :call GoDefinition()<CR>
endif
if has('autocmd') if has('autocmd')
" Shortcuts " Shortcuts
@ -304,6 +304,12 @@ if has('eval')
inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR> inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR>
endif endif
" w!! for sudo w!
cmap w!! w !sudo tee % >/dev/null
" clear search
nnoremap <esc> :noh<return><esc>
" Disable q and Q " Disable q and Q
map q <Nop> map q <Nop>
map Q <Nop> map Q <Nop>

2
xmonad.hs
View file

@ -57,9 +57,7 @@ main = do
, ("M-S-a", windowPromptGoto defaultXPConfig { position = Top }) , ("M-S-a", windowPromptGoto defaultXPConfig { position = Top })
, ("M-a", windowPromptBring defaultXPConfig { position = Top }) , ("M-a", windowPromptBring defaultXPConfig { position = Top })
, ("M-S-l", spawn "~/bin/lock") , ("M-S-l", spawn "~/bin/lock")
, ("M-<Left>", moveTo Prev HiddenNonEmptyWS)
, ("M-S-<Left>", shiftToPrev) , ("M-S-<Left>", shiftToPrev)
, ("M-<Right>", moveTo Next HiddenNonEmptyWS)
, ("M-S-<Right>", shiftToNext) , ("M-S-<Right>", shiftToNext)
, ("M-<Up>", windows W.focusUp) , ("M-<Up>", windows W.focusUp)
, ("M-S-<Up>", windows W.swapUp) , ("M-S-<Up>", windows W.swapUp)