summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.vimrc3
-rw-r--r--.xinitrc2
-rw-r--r--.zsh/rc/50options4
3 files changed, 5 insertions, 4 deletions
diff --git a/.vimrc b/.vimrc
index f8b1012..ebff2d3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -7,7 +7,7 @@ set nocompatible
set encoding=utf-8 " unicode encoding
set t_Co=256
set nobackup
-set noexpandtab
+set expandtab
set tabstop=2
set shiftwidth=2
set softtabstop=2
@@ -35,6 +35,7 @@ inoremap <C-s> <esc>:w<cr>a
nnoremap <C-s> :w<cr>
autocmd FileType make setlocal noexpandtab
+au FileType python set ts=4 sw=4 et
"colorscheme gardener
"colorscheme desert256
diff --git a/.xinitrc b/.xinitrc
index 7ba6c3b..e64e6f4 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -13,7 +13,7 @@ source $HOME/bin/gpg-agent.sh
xbindkeys &
urxvtd -o -f -q
xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 5 &
-$HOME/bin/irssi_notify.sh &
+sh $HOME/bin/irssi_notify.sh &
chat_terminal () {
urxvt -g 125x+45+0+0 -e ssh mistral
diff --git a/.zsh/rc/50options b/.zsh/rc/50options
index d822e39..859efe8 100644
--- a/.zsh/rc/50options
+++ b/.zsh/rc/50options
@@ -3,8 +3,8 @@
#--------------------
export HISTFILE=~/.zsh/histfile
# for some odd reason allocating RAM to save the histfile takes ages..
-export HISTSIZE=4000
-export SAVEHIST=4000
+export HISTSIZE=20000
+export SAVEHIST=$HISTSIZE
#--------------------
# Other ZSH options