diff options
| -rwxr-xr-x | .config/herbstluftwm/autostart | 8 | ||||
| -rw-r--r-- | .config/ranger/rifle.conf | 7 | ||||
| -rw-r--r-- | .config/user-dirs.dirs | 6 | ||||
| -rw-r--r-- | .vimrc | 43 | ||||
| -rw-r--r-- | .zshrc | 2 |
5 files changed, 42 insertions, 24 deletions
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart index 7d06bab..1b714e6 100755 --- a/.config/herbstluftwm/autostart +++ b/.config/herbstluftwm/autostart @@ -1,10 +1,6 @@ #!/bin/bash -# define colours -bg_normal='#333333' -fg_normal='#dcdcdc' -bg_focus='#a25136' -fg_focus='#fcfcfc' +source ~/.config/herbstluftwm/colours.sh hc() { herbstclient "$@" @@ -177,7 +173,7 @@ hc rule focus=on hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK)' manage=off # set apppropriate things to pseudotile hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on focus=on -hc rule class~'(freeciv-sdl|milkytracker|FTL|Tegaki-recognize|Pcsx2|Tilem2)' pseudotile=on focus=on +hc rule class~'(freeciv-sdl|milkytracker|FTL|Tegaki-recognize|Pcsx2|Tilem2|Wine)' pseudotile=on focus=on # unlock, just to be sure hc unlock diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf index cdd34ca..ee189c7 100644 --- a/.config/ranger/rifle.conf +++ b/.config/ranger/rifle.conf @@ -74,9 +74,7 @@ ext x?html?, has w3m, terminal = w3m "$@" #------------------------------------------- # Define the "editor" for text files as first action mime ^text, label editor = "$EDITOR" -- "$@" -mime ^text, label pager = "$PAGER" -- "$@" !mime ^text, label editor, ext xml|csv|tex|py|pl|rb|sh|php = "$EDITOR" -- "$@" -!mime ^text, label pager, ext xml|csv|tex|py|pl|rb|sh|php = "$PAGER" -- "$@" ext 1 = man "$1" ext exe = wine "$1" @@ -122,6 +120,8 @@ ext xcf, X, flag f = gimp -- "$@" #------------------------------------------- ext pdf|ps, has zathura, X, flag f = zathura -- "$@" +ext tex, has latex = latex -- "-output-format=pdf" "$@" + ext docx?, has catdoc, terminal = catdoc -- "$@" | "$PAGER" ext sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric, X, flag f = gnumeric -- "$@" @@ -167,7 +167,6 @@ label wallpaper, number 12, mime ^image, X = feh --bg-tile "$1" label wallpaper, number 13, mime ^image, X = feh --bg-center "$1" label wallpaper, number 14, mime ^image, X = feh --bg-fill "$1" -# Define the editor for non-text files + pager as last action +# Define the editor for non-text files as last action !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php = ask label editor, !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php = "$EDITOR" -- "$@" -label pager, !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php = "$PAGER" -- "$@" diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index 389de85..cc8eabf 100644 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -6,10 +6,10 @@ # absolute path. No other format is supported. # XDG_DESKTOP_DIR="$HOME/desktop" -XDG_DOWNLOAD_DIR="$HOME/downloads" XDG_DOCUMENTS_DIR="$HOME/documents" +XDG_DOWNLOAD_DIR="$HOME/downloads" XDG_MUSIC_DIR="$HOME/music" XDG_PICTURES_DIR="$HOME/images" +XDG_PUBLICSHARE_DIR="$HOME/shared" +XDG_TEMPLATES_DIR="$HOME/templates" XDG_VIDEOS_DIR="$HOME/videos" -XDG_TEMPLATES_DIR="$HOME/Templates" -XDG_PUBLICSHARE_DIR="$HOME/Public" @@ -1,5 +1,5 @@ syntax on -filetype plugin on +filetype plugin indent on "set omnifunc=syntaxcomplete#Complete set autoindent @@ -28,10 +28,9 @@ nnoremap <C-n> :tabn<CR> nnoremap <C-p> :tabp<CR> nnoremap <C-t> <C-w>s<C-w>T -"insert lines above and below with (=|+) -"very hackish, but i couldn't think of a better way +"insert lines below +nnoremap ++ == nnoremap = Oa<C-u><Esc>j -nnoremap + oa<C-u><Esc>k "folds! nnoremap fo zO @@ -72,44 +71,66 @@ let g:c_no_if0_fold = 1 autocmd FileType asm call Settings_asm() autocmd FileType c call Settings_c() autocmd FileType cpp call Settings_cpp() +autocmd FileType tex call Settings_tex() autocmd FileType haskell call Settings_haskell() autocmd FileType make call Settings_script() autocmd FileType perl call Settings_script() autocmd FileType python call Settings_script() autocmd FileType sh call Settings_script() autocmd FileType vim call Settings_vim() +autocmd FileType zsh call Settings_script() function! Settings_asm() - setlocal cindent + "settings setlocal foldmethod=syntax + "mappings nnoremap -- A<Tab>;<Space> endfunction function! Settings_c() - setlocal cindent + "settings setlocal foldmethod=syntax + "mappings + nnoremap <Leader>c :!make<CR> nnoremap -- O<Space>*/<Esc>hhi/*<Space> endfunction function! Settings_cpp() - setlocal cindent + "settings setlocal foldmethod=syntax setlocal shiftwidth=4 setlocal tabstop=4 + "mappings + nnoremap <Leader>c :!make<CR> nnoremap -- O<Space>*/<Esc>hhi/*<Space> endfunction function! Settings_haskell() - setlocal smartindent + "settings + "mappings nnoremap -- O--<Space> endfunction function! Settings_script() - setlocal smartindent + "settings + setlocal shiftwidth=4 + setlocal tabstop=4 + "mappings nnoremap -- O#<Space> endfunction +function! Settings_tex() + "settings + setlocal shiftwidth=4 + setlocal tabstop=4 + "mappings + nnoremap -- O%<Space> + nnoremap <Leader>c :!latex -output-format=pdf %<CR><CR> + nnoremap <Leader>C :!latex -output-format=pdf %<CR> +endfunction + function! Settings_vim() - setlocal smartindent - nnoremap -- A<Space>" + "settings + "mappings + nnoremap -- O" endfunction @@ -70,10 +70,12 @@ alias ls='ls --color=auto' alias grep='grep --color=auto' alias diff='colordiff' alias less='less -R' +alias latex='latex -output-format=pdf' alias vmount='udevil mount' alias vumount='udevil umount' alias def='sdcv' +alias thesaurus='aiksaurus' export EDITOR="vim" export PAGER="less -R" |