mirror of https://github.com/kastdeur/dotfiles.git
Compare commits
3 Commits
1f17382622
...
2decd7cbb2
Author | SHA1 | Date |
---|---|---|
Eric Teunis de Boone | 2decd7cbb2 | |
Eric Teunis de Boone | 97ab089316 | |
Eric Teunis de Boone | d5d0a168f5 |
|
@ -8,6 +8,7 @@
|
||||||
- link:
|
- link:
|
||||||
~/.bashrc: bash/bashrc
|
~/.bashrc: bash/bashrc
|
||||||
~/.bash_profile: bash/profile
|
~/.bash_profile: bash/profile
|
||||||
|
~/.config/git/attributes: git/attributes
|
||||||
~/.config/git/config: git/config
|
~/.config/git/config: git/config
|
||||||
~/.config/git/ignore_global: git/ignore
|
~/.config/git/ignore_global: git/ignore
|
||||||
~/.config/geany/keybindings.conf: geany/keybindings.conf
|
~/.config/geany/keybindings.conf: geany/keybindings.conf
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
# Automatically normalize line endings for all text-based files
|
||||||
|
#* text=auto
|
||||||
|
|
||||||
|
# Documents
|
||||||
|
*.doc diff=pandoc
|
||||||
|
*.DOC diff=pandoc
|
||||||
|
*.docx diff=pandoc
|
||||||
|
*.DOCX diff=pandoc
|
||||||
|
*.odt diff=pandoc
|
||||||
|
*.ODT diff=pandoc
|
||||||
|
*.pdf diff=pdf
|
||||||
|
*.PDF diff=pdf
|
11
git/config
11
git/config
|
@ -8,6 +8,7 @@
|
||||||
default = matching
|
default = matching
|
||||||
[core]
|
[core]
|
||||||
excludesfile = ~/.config/git/ignore
|
excludesfile = ~/.config/git/ignore
|
||||||
|
attributesfile = ~/.config/git/attributes
|
||||||
[color]
|
[color]
|
||||||
ui = auto
|
ui = auto
|
||||||
[color "status"]
|
[color "status"]
|
||||||
|
@ -20,7 +21,7 @@
|
||||||
[diff]
|
[diff]
|
||||||
mnemonicPrefix = true
|
mnemonicPrefix = true
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
[diff "rst"]
|
[diff "pandoc"]
|
||||||
textconv = pandoc --to=rst
|
textconv = pandoc --to=rst
|
||||||
[diff "pdf"]
|
[diff "pdf"]
|
||||||
textconv = pdf2txt
|
textconv = pdf2txt
|
||||||
|
@ -31,5 +32,13 @@
|
||||||
lg = !"git lg1"
|
lg = !"git lg1"
|
||||||
lga = !"git lg --all"
|
lga = !"git lg --all"
|
||||||
|
|
||||||
|
s = status --short
|
||||||
|
st = status
|
||||||
|
|
||||||
|
pushf = push --force-with-lease # Look mom, no --force
|
||||||
|
|
||||||
dif = diff
|
dif = diff
|
||||||
|
diffc = diff --cached
|
||||||
|
difc = diff --cached
|
||||||
|
|
||||||
alias = "! git config --get-regexp ^alias\\. "
|
alias = "! git config --get-regexp ^alias\\. "
|
||||||
|
|
|
@ -31,6 +31,7 @@ if has("patch-7.4.710")
|
||||||
else
|
else
|
||||||
set listchars=tab:→\ ,nbsp:␣,trail:•,eol:¶,precedes:«,extends:»
|
set listchars=tab:→\ ,nbsp:␣,trail:•,eol:¶,precedes:«,extends:»
|
||||||
endif
|
endif
|
||||||
|
set showbreak=\\
|
||||||
|
|
||||||
"Folding
|
"Folding
|
||||||
"augroup vimrc
|
"augroup vimrc
|
||||||
|
@ -39,10 +40,15 @@ endif
|
||||||
"augroup END
|
"augroup END
|
||||||
|
|
||||||
" search for visually hightlighted text
|
" search for visually hightlighted text
|
||||||
vnoremap <c-f> y<ESC>/<c-r>"<CR>
|
vnoremap <c-f> y<ESC>/<c-r>"<CR>
|
||||||
|
|
||||||
set grepprg=grep\ -nH\ $*
|
set grepprg=grep\ -nH\ $*
|
||||||
|
|
||||||
|
" Disable any mousing
|
||||||
|
if has("mouse")
|
||||||
|
set mouse=
|
||||||
|
endif
|
||||||
|
|
||||||
" Don't wake up system with blinking cursor:
|
" Don't wake up system with blinking cursor:
|
||||||
" http://www.linuxpowertop.org/known.php
|
" http://www.linuxpowertop.org/known.php
|
||||||
let &guicursor = &guicursor . ",a:blinkon0"
|
let &guicursor = &guicursor . ",a:blinkon0"
|
||||||
|
|
Loading…
Reference in New Issue