summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <f-p@gmx.at>2009-07-30 12:30:08 +0200
committerFlorian Pritz <f-p@gmx.at>2009-07-30 12:30:08 +0200
commit397fe8198c01e97b7b5835432af47cbbbeab97ee (patch)
tree909dfed89395fa9906206cc7f439ce80e1cde1c5
parent895c87acf2af6ead40ba226a4fca62eab9f12dd6 (diff)
downloaddotfiles-397fe8198c01e97b7b5835432af47cbbbeab97ee.tar.gz
dotfiles-397fe8198c01e97b7b5835432af47cbbbeab97ee.tar.xz
misc changes
-rw-r--r--.vimrc22
-rw-r--r--.xinitrc7
-rw-r--r--.zshrc8
3 files changed, 27 insertions, 10 deletions
diff --git a/.vimrc b/.vimrc
index d62afd9..c912ee9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -25,10 +25,25 @@ set laststatus=2
set mouse=a
set nopaste
set foldmethod=marker
-
+set autoindent
set scrolloff=3
+set showcmd
+set display=uhex
+
+syntax on
+
+filetype plugin indent on
-filetype plugin on
+autocmd FileType text setlocal textwidth=78
+autocmd BufReadPost *
+ \ if line("'\"") > 1 && line("'\"") <= line("$") |
+ \ exe "normal! g`\"" |
+ \ endif
+
+if !exists(":DiffOrig")
+ command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
+ \ | wincmd p | diffthis
+endif
set runtimepath+=/usr/share/vim
@@ -61,7 +76,8 @@ au FileType python set ts=4 sw=4 softtabstop=4 et
"colorscheme desert256
"colorscheme candycode
"colorscheme jellybeans
-colorscheme inkpot
+"colorscheme inkpot
+colorscheme mustang
" Toggle dark/light default colour theme for shitty terms
"map <F2> :let &background = ( &background == "dark" ? "light" : "dark" )<CR>
diff --git a/.xinitrc b/.xinitrc
index 56f79f9..91d7fc6 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -15,15 +15,12 @@ urxvtd -o -f -q
xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 5 &
sh $HOME/bin/irssi_notify.sh < /dev/null & # also in ~/bin/suspend-resume.sh
-chat_terminal () {
- urxvt -g 125x+45+1051+260 -e ssh mistral &
-}
-
autostart () {
+ urxvt -g 125x+45+1051+260 -e ssh mistral &
stalonetray -w -p &
for f in $XDG_CONFIG_HOME/conky/*; do
conky -c "$f" &
- done
+ done
gajim &
chat_terminal &
/opt/Samsung/SmartPanel/bin/smartpanel &
diff --git a/.zshrc b/.zshrc
index 8e8b58a..44afd90 100644
--- a/.zshrc
+++ b/.zshrc
@@ -564,7 +564,11 @@ function _ssh-mount () {
}
compdef _ssh-mount ssh-mount.sh
-# vim: set ft=zsh:
+function _wake () {
+ compadd $(wake)
+}
+compdef _wake wake
+
# machine dependent stuff
. $HOME/.private_stuff.zsh
# }}}
@@ -583,4 +587,4 @@ echo
# Show again
stty echo
-# vim: set ft=zsh:
+# vim: set ft=sh: