about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--awesome/.config/awesome/rc.lua1
-rwxr-xr-xvim/.vim/vimrc (renamed from vim/.vimrc)16
2 files changed, 9 insertions, 8 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 0eacf12..f88d3b1 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -636,6 +636,7 @@ awful.rules.rules = {
     --{rule = {class = "pinentry"}, properties = {floating = true}},
     --{rule = {class = "gimp"}, properties = {floating = true}},
     {rule = {class = "Gcolor2"}, properties = {floating = true}},
+    {rule = {class = "flare"}, properties = {floating = true}},
     {rule = {class = "Torbrowser-launcher"}, properties = {floating = true}},
     {rule = {class = "Twf"}, properties = {floating = true}},
     -- Set Firefox to always map on tags number 2 of screen 1.
diff --git a/vim/.vimrc b/vim/.vim/vimrc
index f55b7e3..260548b 100755
--- a/vim/.vimrc
+++ b/vim/.vim/vimrc
@@ -1,8 +1,12 @@
 execute pathogen#infect()
 filetype plugin indent on
 syntax enable
-set clipboard=exclude:cons\|linux
 set nocompatible
+set undodir=~/.cache/vim/undo
+set directory=~/.cache/vim/swap
+set backupdir=~/.cache/vim/backup
+set viminfo+=n~/.cache/vim/viminfo
+set clipboard=exclude:cons\|linux
 set hidden
 set wildmenu
 set showcmd
@@ -15,14 +19,10 @@ set tabstop=8 expandtab shiftwidth=4 softtabstop=4 smarttab
 set omnifunc=syntaxcomplete#Complete
 set tags+=~/.vim/systags
 set dictionary=/usr/share/dict/words
-set imdisable
-set keymap=vietnamese-telex
-set iminsert=0
-syntax keyword pythonBoolean False True None
+set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1
 autocmd BufNewFile,BufRead *.PAS set filetype=pascal
 autocmd FileType vim,pascal setlocal shiftwidth=2 tabstop=2
 autocmd FileType c setlocal noexpandtab shiftwidth=8 tabstop=8
-autocmd FileType markdown,asciidoc setlocal textwidth=79
+autocmd FileType markdown setlocal textwidth=79
+autocmd FileType python syntax keyword pythonBoolean False True None
 autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1)
-let mapleader = ' '
-let g:stime_table = "telex"