summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xdefaults3
-rw-r--r--vimrc3
2 files changed, 4 insertions, 2 deletions
diff --git a/Xdefaults b/Xdefaults
index 7995717..037a693 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -5,6 +5,5 @@ URxvt*background: #000000
URxvt*font: xft:Monospace:size=10
URxvt*searchable-scrollback: CM-s
-URxvt*geometry: 80x24
URxvt*scrollBar: false
-URxvt*saveLines: 50000
+URxvt*saveLines: 10000
diff --git a/vimrc b/vimrc
index a27b4fe..ed570d0 100644
--- a/vimrc
+++ b/vimrc
@@ -24,5 +24,8 @@ set ignorecase
set incsearch
set nohlsearch
+set foldenable
+
autocmd FileType haml setlocal expandtab tabstop=2 shiftwidth=2
autocmd FileType ruby setlocal expandtab tabstop=2 shiftwidth=2 textwidth=79
+autocmd FileType sh setlocal expandtab