.vim/syntax/git-diff.vim .vim/syntax/git-log.vim .vim/syntax/git-status.vim .vim/syntax/snippet.vim @@ -11,7 +11,7 @@ Xcursor.size: 10 ! {{{ URxvt URxvt*termName: rxvt-256color URxvt*imLocale: en_AU.UTF-8 -URxvt*loginShell: true +URxvt*loginShell: true URxvt*saveLines: 32767 URxvt*scrollBar: false @@ -27,8 +27,8 @@ URxvt*depth: 32 URxvt*transparent: false URxvt*inheritPixmap: true URxvt*shading: 30 -!URxvt*fadeColor: black -!URxvt*tintColor: #555555 +URxvt*fadeColor: black +URxvt*tintColor: #555555 URxvt*dynamicColors: on URxvt*visualBell: true @@ -72,7 +72,7 @@ URxvt*boldItalicFont: -*-terminus-medium-r-*-*-12-120-*-*-*-*-*-* !URxvt*foreground: #dcdccc ! Daisuke -URxvt*background: #000000 +URxvt*background: #1c1c1c URxvt*foreground: #dcdccc !black URxvt*color0: #1e1e1e .Xdefaults @@ -1,5 +1,5 @@ # -- THEME AUTO-WRITTEN DO NOT EDIT -include "/home/stxza/.themes/Murrine-Gray/gtk-2.0/gtkrc" +include "/home/stxza/.themes/AuroraSmooth1/gtk-2.0/gtkrc" include "/home/stxza/.gtkrc.mine" .gtkrc-2.0 @@ -2,7 +2,7 @@ # /home/stxza/.nvidia-settings-rc # # Configuration file for nvidia-settings - the NVIDIA X Server Settings utility -# Generated on Fri Feb 20 05:52:37 2009 +# Generated on Thu Aug 6 02:07:11 2009 # # ConfigProperties: @@ -12,7 +12,7 @@ ToolTips = Yes DisplayStatusBar = Yes SliderTextEntries = Yes IncludeDisplayNameInConfigFile = No -ShowQuitDialog = Yes +ShowQuitDialog = No Timer = PowerMizer_Monitor_(GPU_0),Yes,1000 Timer = Thermal_Monitor_(GPU_0),Yes,1000 @@ -46,8 +46,8 @@ Timer = Thermal_Monitor_(GPU_0),Yes,1000 0/DigitalVibrance[DFP-0]=989 0/GPUScaling[DFP-0]=131075 0/XVideoTextureBrightness=0 -0/XVideoTextureContrast=4096 +0/XVideoTextureContrast=0 0/XVideoTextureHue=0 -0/XVideoTextureSaturation=4096 +0/XVideoTextureSaturation=0 0/XVideoTextureSyncToVBlank=1 0/XVideoSyncToDisplay=65536 .nvidia-settings-rc @@ -2,10 +2,12 @@ " Original Maintainer: Anders Korte <anderskorte@eml.cc> " Modified: by entheon <jazzworksweb@yahoo.com> -" by Gigamo <gigamo@gmail.com> -" Last Change: 30 Mar 2008 +" Last Change: 13 Sept 2005 -" Gardener v1.2 +" Modified: by Christian Wills <chipmonk010@gmail.com> +" Last Change: 28 Mar 2008 + +" Gardener v1.1 " A modification of the Guardian colorscheme v1.2 " 'For code surgeons and web gardeners everywhere' @@ -36,8 +38,6 @@ " should have been in the first place esp considering the " name Gardener, now all vimsters can truly frolic in " their Vim Gardens -" removed background color, changed statuslike to -" something more dark " Options: " g:gardener_light_comments @@ -57,6 +57,13 @@ " " g:gardener_setnum " turns the background of the line numbers black +" +" g:gardener_transbg +" Sets a transparent background. The background color +" of vim becomes whatever your terminal background is. +" Works nice with pseudo transparent terminals. Without +" this you get a solid background color that matches the +" scheme. " Using The Options: " To enable a feature add the line @@ -87,7 +94,8 @@ if has("gui_running") else hi Normal guibg=black guifg=white gui=none endif - hi NonText guibg=#445566 guifg=#ffeecc gui=bold +" hi NonText guibg=#445566 guifg=#ffeecc gui=bold + hi NonText guibg=bg guifg=#ffeecc gui=bold hi Visual guibg=#557799 guifg=white gui=none hi Directory guibg=bg guifg=#337700 gui=none @@ -161,6 +169,7 @@ if has("gui_running") hi Underlined guibg=bg guifg=#99ccff gui=underline hi Title guibg=#445566 guifg=white gui=bold +" hi Title guibg=bg guifg=white gui=bold hi Ignore guibg=bg guifg=#cccccc gui=italic hi Error guibg=#ff0000 guifg=white gui=bold hi Todo guibg=#556677 guifg=#ff0000 gui=bold @@ -183,17 +192,27 @@ else exec "hi Cursor cterm=BOLD ctermfg=255 ctermbg=167" + exec "hi CursorLine cterm=none ctermbg=238" exec "hi CursorIM cterm=BOLD ctermfg=255 ctermbg=167" - exec "hi Normal cterm=NONE ctermfg=255" - exec "hi NonText cterm=NONE ctermfg=230" + if exists("g:gardener_transbg") + exec "hi Normal cterm=NONE ctermfg=255 ctermbg=NONE" + exec "hi NonText cterm=NONE ctermfg=230 ctermbg=NONE" + exec "hi linenr cterm=BOLD ctermfg=244 ctermbg=NONE" + else + exec "hi Normal cterm=NONE ctermfg=255 ctermbg=233" + exec "hi NonText cterm=NONE ctermfg=230 ctermbg=233" +" exec "hi NonText cterm=NONE ctermfg=230 ctermbg=60" + endif + exec "hi Visual cterm=NONE ctermfg=255 ctermbg=68" exec "hi Linear cterm=NONE ctermfg=248 ctermbg=NONE" exec "hi Directory cterm=NONE ctermfg=64 ctermbg=NONE" - exec "hi IncSearch cterm=NONE ctermfg=255 ctermbg=25" + exec "hi IncSearch cterm=NONE ctermfg=255 ctermbg=240" + exec "hi link Search IncSearch" exec "hi ErrorMsg cterm=BOLD ctermfg=196 ctermbg=NONE" exec "hi WarningMsg cterm=BOLD ctermfg=196 ctermbg=NONE" @@ -228,7 +247,7 @@ else exec "hi Function cterm=BOLD ctermfg=229 ctermbg=NONE" exec "hi Statement cterm=BOLD ctermfg=230 ctermbg=NONE" - exec "hi Define cterm=BOLD ctermfg=68 ctermbg=NONE" + exec "hi Define cterm=BOLD ctermfg=68 ctermbg=NONE" exec "hi Conditional cterm=BOLD ctermfg=149 ctermbg=NONE" exec "hi Repeat cterm=BOLD ctermfg=208 ctermbg=NONE" @@ -271,4 +290,3 @@ endif let g:colors_name = "gardener" let colors_name = "gardener" - .vim/colors/gardener.vim @@ -44,7 +44,8 @@ hi link htmlTag xmlTag hi link htmlTagName xmlTagName hi link htmlEndTag xmlEndTag -hi Normal guifg=#E6E1DC guibg=#111111 +hi Normal guifg=#E6E1DC guibg=#111111 +hi NonText guifg=#888888 ctermfg=244 hi Cursor guifg=#000000 ctermfg=0 guibg=#FFFFFF ctermbg=15 hi CursorLine guibg=#000000 ctermbg=236 cterm=NONE hi CursorColumn guibg=#262626 @@ -52,8 +53,8 @@ hi TabLine guifg=black guibg=#b0b8c0 gui=italic hi TabLineFill guifg=#9098a0 hi TabLineSel guifg=black guibg=#f0f0f0 gui=italic,bold hi Pmenu guifg=white guibg=#808080 -hi StatusLine guifg=#f0f0f0 guibg=#101010 gui=italic -hi StatusLineNC guifg=#a0a0a0 guibg=#181818 gui=italic +hi StatusLine guifg=#f0f0f0 guibg=#444444 gui=italic +hi StatusLineNC guifg=#a0a0a0 guibg=#333333 gui=italic hi Folded guibg=#384048 guifg=#a0a8b0 gui=italic hi FoldColumn guibg=#384048 guifg=#a0a8b0 hi SignColumn guibg=#384048 guifg=#a0a8b0 @@ -83,10 +84,10 @@ hi Special guifg=#DA4939 ctermfg=167 hi pythonBuiltin guifg=#6D9CBE ctermfg=73 gui=NONE cterm=NONE hi rubyBlockParameter guifg=#FFFFFF ctermfg=73 -hi rubyClass guifg=#FFFFFF ctermfg=73 +"hi rubyClass guifg=#FFFFFF ctermfg=73 hi rubyConstant guifg=#DA4939 ctermfg=167 hi rubyInstanceVariable guifg=#D0D0FF ctermfg=73 -hi rubyInterpolation guifg=#519F50 ctermfg=107 +"hi rubyInterpolation guifg=#519F50 ctermfg=107 hi rubyLocalVariableOrMethod guifg=#D0D0FF ctermfg=189 hi rubyPredefinedConstant guifg=#DA4939 ctermfg=167 hi rubyPseudoVariable guifg=#FFC66D ctermfg=221 .vim/colors/railscasts.vim @@ -14,36 +14,36 @@ let colors_name = "wombat" " Vim >= 7.0 specific colors if version >= 700 - hi CursorLine guibg=#2d2d2d - hi CursorColumn guibg=#2d2d2d - hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold - hi Pmenu guifg=#f6f3e8 guibg=#444444 - hi PmenuSel guifg=#000000 guibg=#cae682 + hi CursorLine guibg=#2d2d2d ctermbg=236 cterm=none + hi CursorColumn guibg=#2d2d2d ctermbg=236 + hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold ctermfg=230 ctermbg=144 cterm=bold + hi Pmenu guifg=#f6f3e8 guibg=#444444 ctermfg=230 ctermbg=238 + hi PmenuSel guifg=#000000 guibg=#cae682 ctermfg=232 ctermbg=191 endif " General colors -hi Cursor guifg=NONE guibg=#656565 gui=none -hi Normal guifg=#f6f3e8 guibg=#242424 gui=none -hi NonText guifg=#808080 guibg=#303030 gui=none -hi LineNr guifg=#857b6f guibg=#000000 gui=none -hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=none -hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none -hi VertSplit guifg=#444444 guibg=#444444 gui=none -hi Folded guibg=#384048 guifg=#a0a8b0 gui=none -hi Title guifg=#f6f3e8 guibg=NONE gui=bold -hi Visual guifg=#f6f3e8 guibg=#444444 gui=none -hi SpecialKey guifg=#808080 guibg=#343434 gui=none +hi Cursor guifg=NONE guibg=#656565 gui=none ctermfg=NONE ctermbg=242 cterm=none +hi Normal guifg=#f6f3e8 guibg=#242424 gui=none ctermfg=252 ctermbg=235 cterm=none +hi NonText guifg=#808080 guibg=#303030 gui=none ctermfg=244 ctermbg=236 cterm=none +hi LineNr guifg=#857b6f guibg=#000000 gui=none ctermfg=240 ctermbg=232 cterm=none +hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=none ctermfg=230 ctermbg=238 cterm=none +hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none ctermfg=144 ctermbg=238 cterm=none +hi VertSplit guifg=#444444 guibg=#444444 gui=none ctermfg=238 ctermbg=238 cterm=none +hi Folded guibg=#384048 guifg=#a0a8b0 gui=none ctermfg=237 ctermbg=247 cterm=none +hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=230 ctermbg=NONE cterm=bold +hi Visual guifg=#f6f3e8 guibg=#444444 gui=none ctermfg=230 ctermbg=238 cterm=none +hi SpecialKey guifg=#808080 guibg=#343434 gui=none ctermfg=244 ctermbg=236 cterm=none " Syntax highlighting -hi Comment guifg=#99968b gui=none -hi Todo guifg=#8f8f8f gui=none -hi Constant guifg=#e5786d gui=none -hi String guifg=#95e454 gui=none -hi Identifier guifg=#cae682 gui=none -hi Function guifg=#cae682 gui=none -hi Type guifg=#cae682 gui=none -hi Statement guifg=#8ac6f2 gui=none -hi Keyword guifg=#8ac6f2 gui=none -hi PreProc guifg=#e5786d gui=none -hi Number guifg=#e5786d gui=none -hi Special guifg=#e7f6da gui=none +hi Comment guifg=#99968b gui=none ctermfg=246 cterm=none +hi Todo guifg=#8f8f8f gui=none ctermfg=245 cterm=none ctermbg=238 +hi Constant guifg=#e5786d gui=none ctermfg=167 cterm=none +hi String guifg=#95e454 gui=none ctermfg=113 cterm=none ctermbg=237 +hi Identifier guifg=#cae682 gui=none ctermfg=150 cterm=none +hi Function guifg=#cae682 gui=none ctermfg=150 cterm=none +hi Type guifg=#cae682 gui=none ctermfg=150 cterm=none +hi Statement guifg=#8ac6f2 gui=none ctermfg=111 cterm=none +hi Keyword guifg=#8ac6f2 gui=none ctermfg=111 cterm=none +hi PreProc guifg=#e5786d gui=none ctermfg=167 cterm=none +hi Number guifg=#e5786d gui=none ctermfg=167 cterm=none +hi Special guifg=#e7f6da gui=none ctermfg=225 cterm=none .vim/colors/wombat.vim @@ -1,11 +1,10 @@ " Vim syntax file " Language: Python " Maintainer: Dmitry Vasiliev <dima@hlabs.spb.ru> -" URL: http://www.hlabs.spb.ru/vim/python.vim -" Last Change: $Date: 2007-02-04 16:43:14 +0300 (Вс, 04 фев 2007) $ +" URL: http://www.hlabs.spb.ru/vim/python3.0.vim +" Last Change: 2008-12-07 " Filenames: *.py -" Version: 2.5.6 -" $Rev: 632 $ +" Version: 3.0.0 " " Based on python.vim (from Vim 6.1 distribution) " by Neil Schemenauer <nas@python.ca> @@ -13,10 +12,12 @@ " Thanks: " " Jeroen Ruigrok van der Werven -" for the idea of highlighting for erroneous operators +" for the idea to highlight erroneous operators " Pedro Algarvio " for the patch to enable spell checking only for the right spots " (strings and comments) +" John Eikenberry +" for the patch fixing small typo " " Options: @@ -35,6 +36,12 @@ " For highlight string formatting: " python_highlight_string_formatting " +" For highlight str.format syntax: +" python_highlight_string_format +" +" For highlight string.Template syntax: +" python_highlight_string_templates +" " For highlight indentation errors: " python_highlight_indent_errors " @@ -44,13 +51,12 @@ " For highlight doc-tests: " python_highlight_doctests " -" If you want all possible Python highlighting: -" (This option not override previously set options) +" If you want all Python highlightings above: " python_highlight_all +" (This option not override previously set options) " " For fast machines: " python_slow_sync -" " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -71,6 +77,12 @@ if exists("python_highlight_all") && python_highlight_all != 0 if !exists("python_highlight_string_formatting") let python_highlight_string_formatting = 1 endif + if !exists("python_highlight_string_format") + let python_highlight_string_format = 1 + endif + if !exists("python_highlight_string_templates") + let python_highlight_string_templates = 1 + endif if !exists("python_highlight_indent_errors") let python_highlight_indent_errors = 1 endif @@ -84,16 +96,17 @@ endif " Keywords syn keyword pythonStatement break continue del -syn keyword pythonStatement exec return -syn keyword pythonStatement pass print raise +syn keyword pythonStatement exec return as +syn keyword pythonStatement pass raise syn keyword pythonStatement global assert syn keyword pythonStatement lambda yield -syn keyword pythonStatement with +syn keyword pythonStatement with nonlocal +syn keyword pythonStatement False None True syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite -syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" display contained +syn match pythonFunction "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained syn keyword pythonRepeat for while syn keyword pythonConditional if elif else -syn keyword pythonImport import from as +syn keyword pythonImport import from syn keyword pythonException try except finally syn keyword pythonOperator and in is not or @@ -103,19 +116,19 @@ syn match pythonDecorator "@" display nextgroup=pythonFunction skipwhite " Comments syn match pythonComment "#.*$" display contains=pythonTodo,@Spell syn match pythonRun "\%^#!.*$" -syn match pythonCoding "\%^.*\(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$" +syn match pythonCoding "\%^.*\%(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$" syn keyword pythonTodo TODO FIXME XXX contained " Errors -syn match pythonError "\<\d\+\D\+\>" display +" syn match pythonError "\<\d\+\D\+\>" display syn match pythonError "[$?]" display -syn match pythonError "[-+&|]\{2,}" display +syn match pythonError "[&|]\{2,}" display syn match pythonError "[=]\{3,}" display " TODO: Mixing spaces and tabs also may be used for pretty formatting multiline " statements. For now I don't know how to work around this. if exists("python_highlight_indent_errors") && python_highlight_indent_errors != 0 - syn match pythonIndentError "^\s*\( \t\|\t \)\s*\S"me=e-1 display + syn match pythonIndentError "^\s*\%( \t\|\t \)\s*\S"me=e-1 display endif " Trailing space errors @@ -129,25 +142,18 @@ syn region pythonString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+ syn region pythonString start=+"""+ end=+"""+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest2,pythonSpaceError,@Spell syn region pythonString start=+'''+ end=+'''+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest,pythonSpaceError,@Spell -syn match pythonEscape +\\[abfnrtv'"\\]+ display contained -syn match pythonEscape "\\\o\o\=\o\=" display contained +syn match pythonEscape +\\[abfnrtv'"\\]+ display contained +syn match pythonEscape "\\\o\o\=\o\=" display contained syn match pythonEscapeError "\\\o\{,2}[89]" display contained -syn match pythonEscape "\\x\x\{2}" display contained +syn match pythonEscape "\\x\x\{2}" display contained syn match pythonEscapeError "\\x\x\=\X" display contained -syn match pythonEscape "\\$" - -" Unicode strings -syn region pythonUniString start=+[uU]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,@Spell -syn region pythonUniString start=+[uU]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,@Spell -syn region pythonUniString start=+[uU]"""+ end=+"""+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell -syn region pythonUniString start=+[uU]'''+ end=+'''+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell - -syn match pythonUniEscape "\\u\x\{4}" display contained -syn match pythonUniEscapeError "\\u\x\{,3}\X" display contained -syn match pythonUniEscape "\\U\x\{8}" display contained -syn match pythonUniEscapeError "\\U\x\{,7}\X" display contained -syn match pythonUniEscape "\\N{[A-Z ]\+}" display contained -syn match pythonUniEscapeError "\\N{[^A-Z ]\+}" display contained +syn match pythonEscape "\\$" +syn match pythonEscape "\\u\x\{4}" display contained +syn match pythonEscapeError "\\u\x\{,3}\X" display contained +syn match pythonEscape "\\U\x\{8}" display contained +syn match pythonEscapeError "\\U\x\{,7}\X" display contained +syn match pythonEscape "\\N{[A-Z ]\+}" display contained +syn match pythonEscapeError "\\N{[^A-Z ]\+}" display contained " Raw strings syn region pythonRawString start=+[rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell @@ -157,19 +163,39 @@ syn region pythonRawString start=+[rR]'''+ end=+'''+ keepend contains=pythonDocT syn match pythonRawEscape +\\['"]+ display transparent contained -" Unicode raw strings -syn region pythonUniRawString start=+[uU][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell -syn region pythonUniRawString start=+[uU][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell -syn region pythonUniRawString start=+[uU][rR]"""+ end=+"""+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest2,pythonSpaceError,@Spell -syn region pythonUniRawString start=+[uU][rR]'''+ end=+'''+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest,pythonSpaceError,@Spell +" Bytes +syn region pythonBytes start=+[bB]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesContent,pythonBytesError,pythonBytesEscape,pythonBytesEscapeError,@Spell +syn region pythonBytes start=+[bB]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesContent,pythonBytesError,pythonBytesEscape,pythonBytesEscapeError,@Spell +syn region pythonBytes start=+[bB]"""+ end=+"""+ keepend contains=pythonBytesContent,pythonBytesError,pythonBytesEscape,pythonBytesEscapeError,pythonDocTest2,pythonSpaceError,@Spell +syn region pythonBytes start=+[bB]'''+ end=+'''+ keepend contains=pythonBytesContent,pythonBytesError,pythonBytesEscape,pythonBytesEscapeError,pythonDocTest,pythonSpaceError,@Spell + +syn match pythonBytesContent "[\u0001-\u007f]\+" display contained +syn match pythonBytesError "[^\u0001-\u007f]\+" display contained -syn match pythonUniRawEscape "\([^\\]\(\\\\\)*\)\@<=\\u\x\{4}" display contained -syn match pythonUniRawEscapeError "\([^\\]\(\\\\\)*\)\@<=\\u\x\{,3}\X" display contained +syn match pythonBytesEscape +\\[abfnrtv'"\\]+ display contained +syn match pythonBytesEscape "\\\o\o\=\o\=" display contained +syn match pythonBytesEscapeError "\\\o\{,2}[89]" display contained +syn match pythonBytesEscape "\\x\x\{2}" display contained +syn match pythonBytesEscapeError "\\x\x\=\X" display contained +syn match pythonBytesEscape "\\$" if exists("python_highlight_string_formatting") && python_highlight_string_formatting != 0 " String formatting - syn match pythonStrFormat "%\(([^)]\+)\)\=[-#0 +]*\d*\(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString - syn match pythonStrFormat "%[-#0 +]*\(\*\|\d\+\)\=\(\.\(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString + syn match pythonStrFormatting "%\%(([^)]\+)\)\=[-#0 +]*\d*\%(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonRawString + syn match pythonStrFormatting "%[-#0 +]*\%(\*\|\d\+\)\=\%(\.\%(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonRawString +endif + +if exists("python_highlight_string_format") && python_highlight_string_format != 0 + " str.format syntax + syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonRawString + syn match pythonStrFormat "{\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_*\)\|\[\%(\d\+\|[^!:\}]\+\)\]\)*\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*\%(\.\d\+\)\=[bcdeEfFgGnoxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonRawString +endif + +if exists("python_highlight_string_templates") && python_highlight_string_templates != 0 + " String templates + syn match pythonStrTemplate "\$\$" contained containedin=pythonString,pythonRawString + syn match pythonStrTemplate "\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonRawString + syn match pythonStrTemplate "\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonRawString endif if exists("python_highlight_doctests") && python_highlight_doctests != 0 @@ -179,42 +205,51 @@ if exists("python_highlight_doctests") && python_highlight_doctests != 0 endif " Numbers (ints, longs, floats, complex) -syn match pythonHexNumber "\<0[xX]\x\+[lL]\=\>" display -syn match pythonHexNumber "\<0[xX]\>" display -syn match pythonNumber "\<\d\+[lLjJ]\=\>" display -syn match pythonFloat "\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>" display +syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\x*\>" display + +syn match pythonHexNumber "\<0[xX]\x\+\>" display +syn match pythonOctNumber "\<0[oO]\o\+\>" display +syn match pythonBinNumber "\<0[bB][01]\+\>" display + +syn match pythonNumber "\<\d\>" display +syn match pythonNumber "\<[1-9]\d\+\>" display +syn match pythonNumber "\<\d\+[jJ]\>" display +syn match pythonNumberError "\<0\d\+\>" display + +syn match pythonFloat "\.\d\+\%([eE][+-]\=\d\+\)\=[jJ]\=\>" display syn match pythonFloat "\<\d\+[eE][+-]\=\d\+[jJ]\=\>" display -syn match pythonFloat "\<\d\+\.\d*\([eE][+-]\=\d\+\)\=[jJ]\=" display +syn match pythonFloat "\<\d\+\.\d*\%([eE][+-]\=\d\+\)\=[jJ]\=" display -syn match pythonOctalError "\<0\o*[89]\d*[lL]\=\>" display -syn match pythonHexError "\<0[xX]\X\+[lL]\=\>" display +syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*\>" display +syn match pythonBinError "\<0[bB][01]*[2-9]\d*\>" display if exists("python_highlight_builtins") && python_highlight_builtins != 0 " Builtin functions, types and objects - syn keyword pythonBuiltinObj True False Ellipsis None NotImplemented + syn keyword pythonBuiltinObj Ellipsis NotImplemented + syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__ - syn keyword pythonBuiltinFunc __import__ abs all any apply - syn keyword pythonBuiltinFunc basestring bool buffer callable - syn keyword pythonBuiltinFunc chr classmethod cmp coerce compile complex + syn keyword pythonBuiltinFunc __import__ abs all any ascii + syn keyword pythonBuiltinFunc bin bool bytearray bytes + syn keyword pythonBuiltinFunc chr classmethod cmp compile complex syn keyword pythonBuiltinFunc delattr dict dir divmod enumerate eval - syn keyword pythonBuiltinFunc execfile file filter float frozenset getattr - syn keyword pythonBuiltinfunc globals hasattr hash help hex id - syn keyword pythonBuiltinFunc input int intern isinstance - syn keyword pythonBuiltinFunc issubclass iter len list locals long map max - syn keyword pythonBuiltinFunc min object oct open ord pow property range - syn keyword pythonBuiltinFunc raw_input reduce reload repr - syn keyword pythonBuiltinFunc reversed round set setattr + syn keyword pythonBuiltinFunc exec filter float format frozenset getattr + syn keyword pythonBuiltinFunc globals hasattr hash hex id + syn keyword pythonBuiltinFunc input int isinstance + syn keyword pythonBuiltinFunc issubclass iter len list locals map max + syn keyword pythonBuiltinFunc memoryview min next object oct open ord + syn keyword pythonBuiltinFunc pow print property range + syn keyword pythonBuiltinFunc repr reversed round set setattr syn keyword pythonBuiltinFunc slice sorted staticmethod str sum super tuple - syn keyword pythonBuiltinFunc type unichr unicode vars xrange zip + syn keyword pythonBuiltinFunc type vars zip endif if exists("python_highlight_exceptions") && python_highlight_exceptions != 0 " Builtin exceptions and warnings syn keyword pythonExClass BaseException - syn keyword pythonExClass Exception StandardError ArithmeticError + syn keyword pythonExClass Exception ArithmeticError syn keyword pythonExClass LookupError EnvironmentError - syn keyword pythonExClass AssertionError AttributeError EOFError + syn keyword pythonExClass AssertionError AttributeError BufferError EOFError syn keyword pythonExClass FloatingPointError GeneratorExit IOError syn keyword pythonExClass ImportError IndexError KeyError syn keyword pythonExClass KeyboardInterrupt MemoryError NameError @@ -224,12 +259,12 @@ if exists("python_highlight_exceptions") && python_highlight_exceptions != 0 syn keyword pythonExClass SystemError SystemExit TypeError syn keyword pythonExClass UnboundLocalError UnicodeError syn keyword pythonExClass UnicodeEncodeError UnicodeDecodeError - syn keyword pythonExClass UnicodeTranslateError ValueError + syn keyword pythonExClass UnicodeTranslateError ValueError VMSError syn keyword pythonExClass WindowsError ZeroDivisionError - syn keyword pythonExClass Warning UserWarning DeprecationWarning + syn keyword pythonExClass Warning UserWarning BytesWarning DeprecationWarning syn keyword pythonExClass PendingDepricationWarning SyntaxWarning - syn keyword pythonExClass RuntimeWarning FutureWarning OverflowWarning + syn keyword pythonExClass RuntimeWarning FutureWarning syn keyword pythonExClass ImportWarning UnicodeWarning endif @@ -271,27 +306,32 @@ if version >= 508 || !exists("did_python_syn_inits") HiLink pythonSpaceError Error HiLink pythonString String - HiLink pythonUniString String HiLink pythonRawString String - HiLink pythonUniRawString String - HiLink pythonEscape Special HiLink pythonEscapeError Error - HiLink pythonUniEscape Special - HiLink pythonUniEscapeError Error - HiLink pythonUniRawEscape Special - HiLink pythonUniRawEscapeError Error - HiLink pythonStrFormat Special + HiLink pythonBytes String + HiLink pythonBytesContent String + HiLink pythonBytesError Error + HiLink pythonBytesEscape Special + HiLink pythonBytesEscapeError Error + + HiLink pythonStrFormatting Special + HiLink pythonStrFormat Special + HiLink pythonStrTemplate Special HiLink pythonDocTest Special HiLink pythonDocTest2 Special HiLink pythonNumber Number HiLink pythonHexNumber Number + HiLink pythonOctNumber Number + HiLink pythonBinNumber Number HiLink pythonFloat Float - HiLink pythonOctalError Error + HiLink pythonNumberError Error + HiLink pythonOctError Error HiLink pythonHexError Error + HiLink pythonBinError Error HiLink pythonBuiltinObj Structure HiLink pythonBuiltinFunc Function .vim/syntax/python.vim @@ -7,6 +7,9 @@ set background=dark set encoding=utf-8 set termencoding=utf-8 set shell=/bin/zsh +set tf " Improves redrawing for newer computers +set splitbelow + filetype on set complete=k " global autocompletion set completeopt+=longest @@ -28,32 +31,36 @@ set incsearch " increment search set ignorecase " case-insensitive search set smartcase " upper-case sensitive search +set wildchar=<tab> +set wildmenu +set wildmode=longest:full,full + set laststatus=2 " occasions to show status line, 2=always. " set cmdheight=1 " command line height set ruler " ruler display in status line set showmode " show mode at bottom of screen -" set previewheight=5 + +" common save shortcuts +inoremap <C-s> <esc>:w<cr>a +nnoremap <C-s> :w<cr> + +" MiniBufExplorer +let g:miniBufExplMapWindowNavVim = 1 +let g:miniBufExplMapWindowNavArrows = 1 +let g:miniBufExplMapCTabSwitchBufs = 1 +let g:miniBufExplModSelTarget = 0 " Set taglist plugin options let Tlist_Use_Right_Window = 1 let Tlist_Exit_OnlyWindow = 1 -let Tlist_Enable_Fold_Column = 0 let Tlist_Compact_Format = 1 -let Tlist_File_Fold_Auto_Close = 0 -let Tlist_Inc_Winwidth = 1 - -" Toggle taglist script -map <F7> :Tlist<CR> +let Tlist_Show_Menu = 1 +map <F7> :TlistToggle<CR> -" VTreeExplorer -map <F12> :VSTreeExplore <CR> -let g:treeExplVertical=1 -let g:treeExplWinSize=35 -let g:treeExplDirSort=1 - -" common save shortcuts -" inoremap <C-s> <esc>:w<cr>a -" nnoremap <C-s> :w<cr> +" NERDTree +let NERDTreeHijackNetrw=1 +let NERDTreeMouseMode=1 +map <F12> :NERDTreeToggle<CR> " Set bracket matching and comment formats set matchpairs+=<:> @@ -64,11 +71,9 @@ set comments+=b:\" set comments+=n:: " Fix filetype detection -au BufNewFile,BufRead .torsmorc* set filetype=rc au BufNewFile,BufRead *.inc set filetype=php au BufNewFile,BufRead *.sys set filetype=php au BufNewFile,BufRead grub.conf set filetype=grub -au BufNewFile,BufRead *.dentry set filetype=dentry au BufNewFile,BufRead *.blog set filetype=blog " C file specific options @@ -77,14 +82,22 @@ au FileType c,cpp set formatoptions+=ro " HTML abbreviations au FileType html,xhtml,php,eruby imap bbb <br /> -au FileType html,xhtml,php,eruby imap aaa <a href=""><left><left> +au FileType html,xhtml,php,eruby imap aaa <a href=""></a><left><left><left><left><left><left> au FileType html,xhtml,php,eruby imap iii <img src="" /><left><left><left><left> -au FileType html,xhtml,php,eruby imap ddd <div class=""><left><left> +au FileType html,xhtml,php,eruby imap ddd <div id=""></div><left><left><left><left><left><left><left><left> + +" MS Word document reading +au BufReadPre *.doc set ro +au BufReadPre *.doc set hlsearch! +au BufReadPost *.doc %!antiword "%" + +" Reload vimrc when we edit it +au! BufWritePost .vimrc source % " Session Settings set sessionoptions=blank,buffers,curdir,folds,help,resize,tabpages,winsize map <c-q> :mksession! ~/.vim/.session <cr> -map <c-s> :source ~/.vim/.session <cr> +map <c-l> :source ~/.vim/.session <cr> " Set up the status line fun! <SID>SetStatusLine() @@ -109,8 +122,8 @@ set t_vb= " ^ if has('gui_running') let &guicursor = &guicursor . ",a:blinkon0" - colorscheme candycode - set guifont=Monaco\ 9 + colorscheme railscasts + set guifont=Monaco\ 8 set guioptions-=T "set guioptions+=g "set guioptions-=t @@ -130,6 +143,6 @@ elseif (&term =~ 'linux') else set t_Co=256 set mouse=a - colorscheme jellybeans - set termencoding=utf-8 + colorscheme candycode + set termencoding=utf-8 endif .vimrc @@ -4,7 +4,7 @@ xrdb -merge $HOME/.Xresources & # wall -feh --bg-scale pics/Walls/hi-definition.png & +feh --bg-scale pics/Walls/1897_colorsofparis_1280x800.jpg & # Trayer icon tray -> try different heights trayer --edge top --align right --SetDockType true --SetPartialStrut true \ @@ -24,6 +24,6 @@ urxvtd -q -o -f & # D-bus -> fixed in xmonad-darcs? if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then - eval `dbus-launch --sh-syntax --exit-with-session` + eval `dbus-launch --sh-syntax --exit-with-session` fi exec xmonad > $HOME/.xmonad.log 2>&1 .xinitrc @@ -30,10 +30,10 @@ own_window_transparent no double_buffer yes # Minimum size of text area -minimum_size 480 14 +minimum_size 500 14 # Maximum width -maximum_width 480 +maximum_width 620 # Draw shades? draw_shades no @@ -60,9 +60,9 @@ draw_graph_borders no default_color ffffff default_shade_color red default_outline_color green -color1 a3c5e7 +color1 9094ee color2 bbbbbb -color3 c8c8c8 +color3 777777 color4 c7dff7 color5 e9e9e9 @@ -75,7 +75,7 @@ alignment top_right # Gap between borders of screen and text # same thing as passing -x at command line -gap_x 80 +gap_x 650 gap_y 2 # Subtract file system buffers from used memory? @@ -91,7 +91,9 @@ cpu_avg_samples 4 # Force UTF8? note that UTF8 support required XFT override_utf8_locale yes +if_up_strictness address + # variable is given either in format $variable or in ${variable} TEXT -${color FBDCA4}CPU$color ${cpu cpu1}% ${color1}${execi 20 echo $[$(sensors coretemp-isa-0000 | grep 'Core 0' | awk '{print $3}' | sed '{s/[^.0-9]//g}' | cut -d'.' -f1)-16]}${color}C ${cpu cpu2}% ${color1}${execi 20 echo $[$(sensors coretemp-isa-0001 | grep 'Core 1' | awk '{print $3}' | sed '{s/[^.0-9]//g}' | cut -d'.' -f1)-16]}${color}C ${color3}:: ${color B2FBA4}GPU$color ${execi 20 nvidia-settings -q GPUCurrentClockFreqs | grep Attribute | awk '{print $4}' | cut -c1-7} ${color1}${execi 20 nvidia-settings -q gpucoretemp | grep Attribute | awk '{print $4}' | cut -c1-2}${color}C ${color3}:: ${color BDA4FB}RAM$color ${memperc}% ${color3}::$color ${color FBA4A8}DiskF${color} ${color1}R${color}${fs_free /} ${color1}H${color}${fs_free /home/seynthantx} +${color1}CPU$color ${cpu cpu1}% ${color1}${execi 20 echo $(sensors coretemp-isa-0000 | grep 'Core 0' | awk '{print $3}' | sed '{s/[^.0-9]//g}' | cut -d'.' -f1)}${color}C ${cpu cpu2}% ${color1}${execi 20 echo $(sensors coretemp-isa-0001 | grep 'Core 1' | awk '{print $3}' | sed '{s/[^.0-9]//g}' | cut -d'.' -f1)}${color}C ${color3}| ${color1}GPU$color ${execi 20 nvidia-settings -q gpucoretemp | grep Attribute | awk '{print $4}' | cut -c1-2}C ${color3}| ${color1}RAM$color ${memperc}% ${color3}| ${color1}DF R${color}${fs_free /} ${color1}H${color}${fs_free /home/stxza} ${color3}| ${color1}V${color} ${exec amixer get Master | awk '/Mono:/ {print $4}' | tr '[]' ' ' | awk '{print $1}'} ${color3}| ${color1}BAT$color ${execi 60 ~/bin/battery.pl} ${color3}| ${color1}${time %k:%M.%d/%m} .xmonad/conkyrc @@ -1,7 +1,9 @@ -- $HOME/.xmonad/xmonad.hs -- original author: Øyvind 'Mr.Elendig' Heggstad <mrelendig AT har-ikkje DOT net> -- modifier: STxza/ST.x <seynthan DOT tx AT gmail DOT com> --- version: Arch Linux | xmonad-darcs & xmonad-contrib-darcs & haskell-x11-darcs & dzen2-gadgets-svn +-- version: Arch Linux(lappy) | non-darcs (05/08/09) +-- old: xmonad-darcs & xmonad-contrib-darcs +-- & haskell-x11-darcs & dzen2-gadgets-svn -- validate syntax: xmonad --recompile -- vim :fdm=marker sw=4 sts=4 ts=4 et ai: @@ -22,12 +24,11 @@ import XMonad.Prompt.Shell -- hooks import XMonad.Hooks.ManageDocks -import XMonad.Hooks.DynamicLog +import XMonad.Hooks.DynamicLog hiding (xmobar, xmobarPP, xmobarColor, sjanssenPP, byorgeyPP) import XMonad.Hooks.UrgencyHook import XMonad.Hooks.SetWMName -- layouts -import XMonad.Layout.Gaps import XMonad.Layout.ResizableTile import XMonad.Layout.Spiral import XMonad.Layout.PerWorkspace @@ -41,14 +42,13 @@ import XMonad.Actions.CycleWS import XMonad.Actions.RotSlaves import qualified XMonad.Actions.FlexibleManipulate as Flex (Flex.mouseWindow, Flex.linear) import XMonad.Actions.CopyWindow -import XMonad.Actions.GridSelect (defaultGSConfig, goToSelected) +--import XMonad.Actions.GridSelect (defaultGSConfig, goToSelected) --}}} -------------------------------------------------------------------------------------- --{{{ Main main = do dzenSbar <- spawnPipe sBarCmd - dzenConkyTop <- spawnPipe topBarCmd - dzenConkyBot <- spawnPipe botBarCmd + dzenConky <- spawnPipe topBarCmd xmonad $ myUrgencyHook $ defaultConfig { workspaces = workspaces' , modMask = modMask' @@ -57,7 +57,7 @@ main = do , focusedBorderColor = focusedBorderColor' , terminal = terminal' , keys = keys' - , focusFollowsMouse = True + , focusFollowsMouse = False , mouseBindings = mouseBindings' , logHook = logHook' dzenSbar , layoutHook = layoutHook' @@ -72,28 +72,26 @@ myManageHook = composeAll . concat $ [ [ className =? c --> doFloat | c <- myFloats ] , [ title =? t --> doFloat | t <- myOtherFloats ] , [ resource =? r --> doIgnore | r <- myIgnores ] - , [ className =? "Firefox" --> doF (W.shift "2:www") ] - , [ className =? "Gimp" --> doF (W.shift "8:gfx") <+> doF (W.swapUp) ] - , [ className =? "Gvim" --> doF (W.shift "4:dev") ] - , [ className =? "Geany" --> doF (W.shift "4:dev") <+> doF (W.swapUp) ] - , [ className =? "OpenOffice.org 3.0" --> doF (W.shift "7:OOo") ] - , [ className =? "Smplayer" --> doF (W.shift "6:vid") ] - , [ className =? "Transmission" --> doF (W.shift "2:www") ] - , [ className =? "Controller.py" --> doF (W.shift "3:chat") ] - , [ (className =? "Controller.py" <&&> resource =? "chat") --> doF (W.shift "3:chat") ] - , [ className =? "Easytag" --> doF (W.swapDown) ] - , [ className =? "Eclipse" --> doF (W.shift "4:dev") ] - , [ (title =? "ncmpcpp" <&&> className =? "URxvt") --> doF (W.shift "5:mus" ) ] + , [ className =? "Firefox" --> doF (W.shift "w") ] + , [ className =? "Gimp" --> doF (W.shift "gfx") <+> doF (W.swapUp) ] + , [ className =? "Gvim" --> doF (W.shift "dev") ] + , [ className =? "Geany" --> doF (W.shift "dev") <+> doF (W.swapUp) ] + , [ className =? "OpenOffice.org 3.0" --> doF (W.shift "OOo") ] + , [ className =? "Transmission" --> doF (W.shift "w") ] + , [ className =? "Controller.py" --> doF (W.shift "im") ] + , [ (className =? "Controller.py" <&&> resource =? "chat") --> doF (W.shift "im") ] + , [ className =? "Eclipse" --> doF (W.shift "dev+") ] + , [ className =? "FlashMagic.exe" --> doF (W.shift "rand()") ] ] where - myIgnores = ["panel", "trayer", "xfce4-notifyd"] - myFloats = ["feh", "Gimp", "Xmessage", "Qalculate", "Nvidia-settings"] + myIgnores = ["panel", "trayer"] + myFloats = ["feh", "Gimp", "Xmessage", "Qalculate", "Nvidia-settings", "Gtk-chtheme"] myOtherFloats = ["alsamixer", "Firefox Preferences", "Session Manager - Mozilla Firefox", - "Firefox Add-on Updates", "Clear Private Data" + "Firefox Add-on Updates", "Clear Private Data", "Dialog" ] manageHook' :: ManageHook -manageHook' = (doF W.swapDown) <+> manageDocks <+> manageHook defaultConfig <+> myManageHook +manageHook' = manageDocks <+> manageHook defaultConfig <+> myManageHook logHook' :: Handle -> X () logHook' dzenSbar = dynamicLogWithPP $ myDzenPP dzenSbar @@ -104,34 +102,33 @@ layoutHook' = customLayout --{{{ Looks -- dzen bars -sBarCmd = "dzen2 -e 'onstart=lower' -x '0' -y '0' -h '16' -w '1368' -ta 'l' -fg '#f0f0f0' -bg '#000000' -fn '-*-profont-*-*-*-*-12-*-*-*-*-*-*-*'" -topBarCmd = "conky -c ~/.xmonad/conkyrc | dzen2 -e 'onstart=lower' -h '16' -w '480' -ta 'r'" -botBarCmd = "conky -c ~/.xmonad/conky_botrc | dzen2 -e 'onstart=lower' -h '16' -w '1440' -ta 'r'" +sBarCmd = "dzen2 -e 'onstart=lower' -x '0' -y '0' -h '16' -w '1229' -ta 'l' -fg '#f0f0f0' -bg '#000000' -fn '-*-profont-*-*-*-*-12-*-*-*-*-*-*-*'" +topBarCmd = "conky -c ~/.xmonad/conkyrc | dzen2 -e 'onstart=lower' -h '16' -w '500' -ta 'r'" myDzenPP dzenSbar = defaultPP - { ppCurrent = wrap "^p()[^fg(#a3c5e7)" "^fg()]^p()" - , ppVisible = wrap "^p()[^fg()" "^fg()]^p()" - , ppHidden = wrap "" "^fg()^p()" + { ppCurrent = wrap "^p()[^fg(#f87a7d)" "^fg()]^p()" + , ppVisible = wrap "^p(2)[^fg()" "^fg()]^p(2)" + , ppHidden = wrap "" "^fg()^p(2)" --, ppHiddenNoWindows = wrap "^fg(#555555)" "^fg()" , ppUrgent = wrap "!^fg(#e9c789)^p()" "^fg()^p()" , ppSep = " " - , ppWsSep = " " + , ppWsSep = "" , ppTitle = dzenColor "#ffffff" "" . wrap "< " " >" , ppLayout = dzenColor "#777777" "" . (\x -> case x of - "Full" -> "^fg(#777777)^i(/home/seynthantx/.dzen/full.xbm)" - "ResizableTall" -> "^fg(#777777)^i(/home/seynthantx/.dzen/tall.xbm)" - "Mirror ResizableTall" -> "^fg(#777777)^i(/home/seynthantx/.dzen/mtall.xbm)" - "Hinted Mirror ResizableTall" -> "^fg(#777777)^i(/home/seynthantx/.dzen/layout-mirror-bottom.xbm)" + "Full" -> "^fg(#777777)^i(/home/stxza/.dzen/full.xbm)" + "ResizableTall" -> "^fg(#777777)^i(/home/stxza/.dzen/tall.xbm)" + "Mirror ResizableTall" -> "^fg(#777777)^i(/home/stxza/.dzen/mtall.xbm)" + "Hinted Mirror ResizableTall" -> "^fg(#777777)^i(/home/stxza/.dzen/layout-mirror-bottom.xbm)" "Spiral" -> "[sP]" - "Grid" -> "^fg(#777777)^i(/home/seynthantx/.dzen/grid.xbm)" + "Grid" -> "^fg(#777777)^i(/home/stxza/.dzen/grid.xbm)" "IM Grid" -> "[iM]" "SimplestFloat" -> "[sfL]" _ -> x ) , ppOutput = hPutStrLn dzenSbar } - + -- Urgency hint options: myUrgencyHook = withUrgencyHook NoUrgencyHook --myUrgencyHook = withUrgencyHook dzenUrgencyHook @@ -139,20 +136,19 @@ myUrgencyHook = withUrgencyHook NoUrgencyHook -- borders borderWidth' :: Dimension -borderWidth' = 2 +borderWidth' = 1 normalBorderColor', focusedBorderColor' :: String normalBorderColor' = "#2a2a2a" -focusedBorderColor' = "#0093ff" +focusedBorderColor' = "#9094ee" -- workspaces workspaces' :: [WorkspaceId] -workspaces' = ["1:main", "2:www", "3:chat", "4:dev", "5:mus", "6:vid", "7:OOo", "8:gfx", "9:rand"] +workspaces' = ["m", "w", "im", "dev", "dev+", "OOo", "gfx", "rand()"] -- layouts -customLayout = gaps [(U,16), (D,16), (L,0), (R,0)] $ avoidStruts $ onWorkspace "3:chat" lc $ tiled - ||| Mirror tiled ||| Full ||| spiral (6/7) - ||| Grid ||| simplestFloat +customLayout = (avoidStruts (onWorkspace "im" lc $ tiled + ||| Mirror tiled ||| Full ||| spiral (6/7) ||| Grid ||| simplestFloat)) where tiled = ResizableTall nmaster delta ratio [] -- The default number of windows in the master pane @@ -161,16 +157,16 @@ customLayout = gaps [(U,16), (D,16), (L,0), (R,0)] $ avoidStruts $ onWorkspace " ratio = toRational (2/(1+sqrt(5)::Double)) -- golden -- Percent of screen to increment by when resizing panes delta = 0.03 - -- For emesene in "chat" + --For pidgin in "chat" lc = withIM (1%7) (And (ClassName "Controller.py") (Role "main")) Grid -- XPConfig options: myXPConfig = defaultXPConfig { font = "-*-profont-*-*-*-*-12-*-*-*-*-*-*-*" - , bgColor = "#222222" + , bgColor = "#2a2a2a" , fgColor = "#ffffff" - , fgHLight = "#ffffff" - , bgHLight = "#0066ff" + , fgHLight = "#9094ee" + , bgHLight = "#000000" , borderColor = "#ffffff" , promptBorderWidth = 1 , position = Bottom @@ -195,14 +191,14 @@ keys' conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ -- launching and killing programs [ ((modMask, xK_x ), spawn $ XMonad.terminal conf) , ((modMask .|. controlMask, xK_x ), shellPrompt myXPConfig) - , ((modMask, xK_r ), spawn "dmenu_run -fn \"-*-profont-*-*-*-*-12-*-*-*-*-*-*-*\" -nb \"#000000\" -nf \"#888888\" -sb \"#2A2A2A\" -sf \"#ADD8E6\"") - , ((modMask, xK_a ), spawn "urxvtc -e alsamixer") + , ((modMask, xK_r ), spawn "dmenu_run -fn \"-*-profont-*-*-*-*-12-*-*-*-*-*-*-*\" -nb \"#000000\" -nf \"#888888\" -sb \"#2A2A2A\" -sf \"#9094ee\"") + , ((modMask, xK_a ), spawn "urxvtc -e alsamixer") , ((modMask, xK_f ), spawn "firefox") - , ((modMask, xK_t ), spawn "thunar") + , ((modMask, xK_t ), spawn "pcmanfm") , ((modMask, xK_g ), spawn "geany") , ((modMask, xK_e ), spawn "emesene") , ((modMask, xK_v ), spawn "transmission") - , ((modMask, xK_Print ), spawn "scrot -q90 /home/seynthantx/Pictures/Screenshots/%Y-%m-%d.png") + , ((modMask, xK_Print ), spawn "scrot -q90 /home/stxza/pics/Screens/%Y-%m-%d.png") , ((modMask .|. shiftMask, xK_c ), kill1) -- Close the focused window -- Java hack @@ -249,7 +245,7 @@ keys' conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ , ((modMask, xK_Left ), prevWS) -- GridSelect - , ((modMask .|. shiftMask, xK_g ), goToSelected defaultGSConfig) + --, ((modMask .|. shiftMask, xK_g ), goToSelected defaultGSConfig) -- quit, or restart , ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) .xmonad/xmonad.hs @@ -56,19 +56,19 @@ zstyle ':completion:*:options' auto-description '%d' # {{{ Window Title case $TERM in *xterm*|rxvt|rxvt-unicode|rxvt-256color|(dt|k|E)term) - precmd () { print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~]\a" } - preexec () { print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~] ($1)\a" } - ;; + precmd () { print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~]\a" } + preexec () { print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~] ($1)\a" } + ;; screen) - precmd () { - print -Pn "\e]83;title \"$1\"\a" - print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~]\a" - } - preexec () { - print -Pn "\e]83;title \"$1\"\a" - print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~] ($1)\a" - } - ;; + precmd () { + print -Pn "\e]83;title \"$1\"\a" + print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~]\a" + } + preexec () { + print -Pn "\e]83;title \"$1\"\a" + print -Pn "\e]0;$TERM - (%L) [%n@%M]%# [%~] ($1)\a" + } + ;; esac # }}} @@ -89,8 +89,8 @@ setprompt () { } PROMPT='%{$fg_bold[grey]%}[%{$fg_bold[cyan]%}%~%{$reset_color%}%{$fg_bold[grey]%}]%{$reset_color%}%{$fg_bold[yellow]%}$(parse_git_branch)%{$reset_color%} --%{$fg_bold[red]%}>%{$reset_color%} ' - RPROMPT='%{$fg[cyan]%}%D{%H:%M}%{$reset_color%}' + %{$fg_bold[blue]%}»%{$reset_color%} ' + RPROMPT='« %{$fg[cyan]%}%D{%H:%M}%{$reset_color%}' } setprompt # }}} @@ -125,7 +125,9 @@ bindkey "\e[7~" beginning-of-line # {{{ Aliases #alias startx='SHELL=/bin/sh startx' +alias ls='ls -ahl --color' alias ll='ls -ahl --color | more; echo "\e[1;32m --[\e[1;34m Dirs:\e[1;36m `ls -al | egrep \"^drw\" | wc -l` \e[1;32m|\e[1;35m Files: \e[1;31m`ls -al | egrep -v \"^drw\" | grep -v total | wc -l` \e[1;32m]--"' +alias grep='grep --color=auto' alias egrep='egrep --color=auto' alias shutdownhome='sudo netcfg2 -d wifihome && sleep 3 && sudo shutdown -hP now' alias reboothome='sudo netcfg2 -d wifihome && sleep 3 && sudo reboot' @@ -135,7 +137,10 @@ alias screenie='cd ~/bin/ && ./info.pl' alias pacman='sudo pacman-color' alias xpop='xprop | grep --color=none "WM_WINDOW_ROLE\|WM_CLASS" | xmessage -file - -center' alias nvtemp='echo "$(nvidia-settings -q gpucoretemp | grep Attribute | sed "s/ //g")"' -alias matlab='cd /home/seynthantx/matlabr2008a/bin/ && ./matlab' +alias matlab='cd /home/stxza/matlabr2008a/bin/ && ./matlab' +alias aurbuildpkg="sudo env EDITOR=\$EDITOR aurbuild -smc" +alias aurupd="sudo env EDITOR=\$EDITOR aurbuild -su" +alias aursearch="aurbuild -S" # }}} # {{{ URXVT workaround - stop first line completion bug in tiling WMs .zshrc @@ -55,7 +55,7 @@ Section "Device" Option "OnDemandVBlankInterrupts" "True" #Option "Coolbits" "1" # on battery - max power saving, on AC - adaptive strategy - Option "RegistryDwords" "PowerMizerEnable=0x1; PerfLevelSrc=0x2233; PowerMizerDefault=0x3" + #Option "RegistryDwords" "PowerMizerEnable=0x1; PerfLevelSrc=0x2233; PowerMizerDefault=0x3" EndSection Section "Screen" system/etc/X11/XF86Config_lappy @@ -26,11 +26,12 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" -#-- Exclusive: will only run on -march=x86-64 +#-- Exclusive: will only run on x86_64 # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family CFLAGS="-march=native -O2 -pipe" CXXFLAGS="${CFLAGS}" +#LDFLAGS="" #-- Make Flags: change this for DistCC/SMP systems MAKEFLAGS="-j3" @@ -38,16 +39,15 @@ MAKEFLAGS="-j3" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache !xdelta) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation -#-- xdelta: Generate delta patch from previous to current package # -BUILDENV=(fakeroot !distcc color !ccache !xdelta) +BUILDENV=(fakeroot !distcc color !ccache) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. @@ -58,23 +58,28 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc and info directories +#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manpages with gzip +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS # -OPTIONS=(strip docs libtool emptydirs zipman) +OPTIONS=(strip docs libtool emptydirs zipman purge) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) -#-- Info and doc directories to remove (if option set correctly above) -DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) -#-- Directories to be searched for the strip option (if option set correctly above) +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Directories to be searched for the strip option (if strip is specified) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) ######################################################################### # PACKAGE OUTPUT @@ -90,16 +95,13 @@ STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib, PACKAGER="Seynthan Thanapalan <seynthan.tx@gmail.com>" ######################################################################### -# BUILDSCRIPT/EXTENSION DEFAULTS +# EXTENSION DEFAULTS ######################################################################### # # WARNING: Do NOT modify these variables unless you know what you are # doing. # -BUILDSCRIPT='PKGBUILD' PKGEXT='.pkg.tar.gz' SRCEXT='.src.tar.gz' -DB_COMPRESSION='gz' -DB_CHECKSUMS=(md5) # vim: set ft=sh ts=2 sw=2 et: system/etc/makepkg.conf @@ -36,7 +36,7 @@ USECOLOR="yes" # MOD_AUTOLOAD="yes" #MOD_BLACKLIST=() #deprecated -MODULES=(acpi-cpufreq cpufreq_ondemand tg3 snd-mixer-oss snd-pcm-oss snd-hwdep snd-page-alloc snd-pcm snd-timer snd snd-hda-intel soundcore !pcspkr !snd_pcsp !ohci1394 !ieee1394 !uvcvideo) +MODULES=(acpi-cpufreq cpufreq_ondemand tg3 snd-mixer-oss snd-pcm-oss snd-hwdep snd-page-alloc snd-pcm snd-timer snd snd-hda-intel soundcore loop !pcspkr !snd_pcsp !ohci1394 !ieee1394 !uvcvideo) # Scan for LVM volume groups at startup, required if you use LVM USELVM="no" system/etc/rc_lappy.conf .config/awesome/functions.lua .config/awesome/functions.stable.lua .config/awesome/icons/accordion.png .config/awesome/icons/alt/ac.png .config/awesome/icons/alt/ac_01.png .config/awesome/icons/alt/arch.png .config/awesome/icons/alt/arch_10x10.png .config/awesome/icons/alt/bat_empty_01.png .config/awesome/icons/alt/bat_empty_02.png .config/awesome/icons/alt/bat_full_01.png .config/awesome/icons/alt/bat_full_02.png .config/awesome/icons/alt/bat_low_01.png .config/awesome/icons/alt/bat_low_02.png .config/awesome/icons/alt/bluetooth.png .config/awesome/icons/alt/bug_01.png .config/awesome/icons/alt/bug_02.png .config/awesome/icons/alt/cat.png .config/awesome/icons/alt/clock.png .config/awesome/icons/alt/cpu.png .config/awesome/icons/alt/dish.png .config/awesome/icons/alt/diskette.png .config/awesome/icons/alt/down.png .config/awesome/icons/alt/empty.png .config/awesome/icons/alt/eye_l.png .config/awesome/icons/alt/eye_r.png .config/awesome/icons/alt/fox.png .config/awesome/icons/alt/fs_01.png .config/awesome/icons/alt/fs_02.png .config/awesome/icons/alt/full.png .config/awesome/icons/alt/fwd.png .config/awesome/icons/alt/half.png .config/awesome/icons/alt/info_01.png .config/awesome/icons/alt/info_02.png .config/awesome/icons/alt/info_03.png .config/awesome/icons/alt/load.png .config/awesome/icons/alt/mail.png .config/awesome/icons/alt/mem.png .config/awesome/icons/alt/mouse_01.png .config/awesome/icons/alt/mpd.png .config/awesome/icons/alt/net-wifi.png .config/awesome/icons/alt/net-wifi3.png .config/awesome/icons/alt/net-wifi4.png .config/awesome/icons/alt/net-wifi5.png .config/awesome/icons/alt/net-wired.png .config/awesome/icons/alt/net-wired2.png .config/awesome/icons/alt/net_down_01.png .config/awesome/icons/alt/net_down_02.png .config/awesome/icons/alt/net_down_03.png .config/awesome/icons/alt/net_up_01.png .config/awesome/icons/alt/net_up_02.png .config/awesome/icons/alt/net_up_03.png .config/awesome/icons/alt/net_wired.png .config/awesome/icons/alt/next.png .config/awesome/icons/alt/note.png .config/awesome/icons/alt/pacman.png .config/awesome/icons/alt/pause.png .config/awesome/icons/alt/phones.png .config/awesome/icons/alt/play.png .config/awesome/icons/alt/plug.png .config/awesome/icons/alt/plus.png .config/awesome/icons/alt/power-ac.png .config/awesome/icons/alt/power-bat.png .config/awesome/icons/alt/power-bat2.png .config/awesome/icons/alt/prev.png .config/awesome/icons/alt/rwd.png .config/awesome/icons/alt/scorpio.png .config/awesome/icons/alt/shroom.png .config/awesome/icons/alt/spkr_01.png .config/awesome/icons/alt/spkr_02.png .config/awesome/icons/alt/spkr_03.png .config/awesome/icons/alt/stop.png .config/awesome/icons/alt/temp.png .config/awesome/icons/alt/test.png .config/awesome/icons/alt/up.png .config/awesome/icons/alt/usb.png .config/awesome/icons/alt/usb_02.png .config/awesome/icons/alt/vol-hi.png .config/awesome/icons/alt/vol-mute.png .config/awesome/icons/alt/wifi_01.png .config/awesome/icons/alt/wifi_02.png .config/awesome/icons/arch.png .config/awesome/icons/arch2.png .config/awesome/icons/arch_10x10.png .config/awesome/icons/arch_grey.png .config/awesome/icons/awesome.png .config/awesome/icons/awesome16.png .config/awesome/icons/awesome16_black.png .config/awesome/icons/awesome16_gray.png .config/awesome/icons/awesome16_gray_darker.png .config/awesome/icons/awesome16_white.png .config/awesome/icons/awesome_blk.png .config/awesome/icons/awesome_grey.png .config/awesome/icons/bat.png .config/awesome/icons/cpu.png .config/awesome/icons/down.png .config/awesome/icons/fs.png .config/awesome/icons/im.png .config/awesome/icons/layouts/floating.png .config/awesome/icons/layouts/floatingw.png .config/awesome/icons/layouts/max.png .config/awesome/icons/layouts/mtall.png .config/awesome/icons/layouts/tall.png .config/awesome/icons/layouts/tile.png .config/awesome/icons/layouts/tilebottom.png .config/awesome/icons/mem.png .config/awesome/icons/pacman.png .config/awesome/icons/plus.png .config/awesome/icons/separators/link14.png .config/awesome/icons/separators/link15.png .config/awesome/icons/separators/link16.png .config/awesome/icons/submenu.png .config/awesome/icons/temp.png .config/awesome/icons/up.png .config/awesome/icons/vol.png .config/awesome/icons/wifi.png .config/awesome/rc.lua .config/awesome/rc.stable.lua .config/awesome/themes/stxza 0de75ac3183709da6662af95e0854bd54356cd41 stxza seynthan.tx@gmail.com http://github.com/stxza/arch-linux-configs/commit/207f901b48151c8115836350fa8d9015b209da0c 207f901b48151c8115836350fa8d9015b209da0c 2009-08-07T04:17:50-07:00 2009-08-07T04:17:50-07:00 long time no see =) 0ad0021a22311a6ee23677fc6f207e94515d957f stxza seynthan.tx@gmail.com