1. David Wolever
  2. dotfiles

Commits

David Wolever  committed 1915b87

Moar changes

  • Participants
  • Parent commits 5d7d3b1
  • Branches default

Comments (0)

Files changed (15)

File Xmodmap

View file
  • Ignore whitespace
 keysym Caps_Lock = Control_L
 ! add Lock = Caps_Lock
 add Control = Control_L
+
+clear Mod1
+clear Mod2
+keycode 63 = Mode_switch
+keycode 66 = Meta_L
+add Mod1 = Meta_L
+add Mod2 = Mode_switch
+

File ackrc

View file
  • Ignore whitespace
 --type-set=xmsl=.xmsl
 --type-set=mako=.mako
 --type-set=less=.less
+--type-set=txt=.txt
+--type-set=as=.as
 
 --follow
 --ignore-dir=env

File bashrc

View file
  • Ignore whitespace
 # Make sure the profile gets loaded first
-export JOBS="\`[[ \j -gt 0 ]] && echo [\j job\$([[ \j -gt 1 ]] && echo 's')]\  \`"
-export PS1="$JOBS\[\e[32m\][\[\e[0;31m\]\u\[\e[0;32m\]@\[\e[0;34m\]\h\[\e[0;32m\]] \[\e[0;33m\]\w\[\e[0m\] ";
+__ps1_jobs="\`[[ \j -gt 0 ]] && echo [\j job\$([[ \j -gt 1 ]] && echo 's')]\  \`"
+export PS1="$__ps1_jobs\[\e[32m\][\[\e[0;31m\]\u\[\e[0;32m\]@\[\e[0;34m\]\h\[\e[0;32m\]] \[\e[0;33m\]\w\[\e[0m\] ";
 
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.

File hgrc

View file
  • Ignore whitespace
 #hgext.hgk =
 progress =
 #pbranch = ~/.mercurial/extensions/hg-pbranch/hgext/pbranch.py
-hgsubversion =
+#hgsubversion =
 
 [ui]
 username = David Wolever <david@wolever.net>

File inkscape/preferences.xml

View file
  • Ignore whitespace
        state="1" />
     <group
        id="scrollbars"
-       state="1" />
+       state="0" />
   </group>
   <group
      id="fullscreen">
          id="rect"
          style="fill:blue;"
          usecurrent="1"
-         width="198.74575805664062"
-         height="175.96978759765625"
+         width="160"
+         height="40"
          rx="0"
          ry="0" />
       <eventcontext
       <eventcontext
          id="arc"
          style="fill:red;"
-         end="0"
+         end="3.1798301057856966"
          start="0"
-         usecurrent="1" />
+         usecurrent="1"
+         open="1" />
       <eventcontext
          id="star"
          magnitude="5"
          mode="drag"
          selcue="1"
          style="stroke-width:1px;"
-         usecurrent="0" />
+         usecurrent="0"
+         freehand-mode="2" />
     </group>
     <eventcontext
        id="calligraphic"
        thinning="10"
        flatness="90"
        cap_rounding="0"
-       usecurrent="1"
+       usecurrent="0"
        tracebackground="0"
        usepressure="1"
        usetilt="0"
   </group>
   <group
      id="colorselector"
-     page="0" />
+     page="3" />
   <group
      id="embedded">
     <group
        panel_ratio="100"
        panel_mode="1"
        panel_wrap="0"
-       x="356"
+       x="1280"
        y="0"
-       w="732"
-       h="463" />
+       w="862"
+       h="378" />
     <group
        id="gradienteditor" />
     <group
        default=""
        append_extension="1"
        path=""
-       x="1208"
-       y="317"
+       x="1599"
+       y="324"
        w="356"
        h="391">
       <group
     <group
        id="open"
        enable_preview="1"
-       path="" />
+       path="/Users/wolever/" />
     <group
        id="import"
        enable_preview="1"
        on-focus="1.0"
        on-blur="0.50"
        animate-time="100" />
+    <group
+       h="239"
+       w="266"
+       y="0"
+       x="0"
+       state="2"
+       panel_wrap="0"
+       panel_mode="1"
+       panel_ratio="100"
+       panel_size="1"
+       id="livepatheffect" />
   </group>
   <group
      id="printing">
        value="0" />
     <group
        id="switchonextinput"
-       value="0" />
+       value="1" />
     <group
        id="useextinput"
        value="1" />
        value="15" />
     <group
        id="wheelscroll"
-       value="40" />
+       value="2" />
     <group
        id="spacepans"
        value="0" />
      org.inkscape.input.gdkpixbuf.png.link="embed" />
   <group
      id="desktop"
-     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;-inkscape-font-specification:Sans;font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:20px;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%">
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:1, 1;-inkscape-font-specification:Sans;font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:20px;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%;stroke-dashoffset:0;opacity:0.99000000000000021;fill-opacity:1">
     <group
-       width="618"
-       height="562"
+       width="483"
+       height="430"
        x="1280"
-       y="246"
+       y="0"
        fullscreen="0"
        id="geometry"
        maximized="0" />

File profile

View file
  • Ignore whitespace
 
 alias glog="hg glog | less"
 alias viq="vim \$(hg root)/.hg/patches/series"
-for HGCMD in tip qser qpo qpop qpu qpush qfin qref qnew qrm qmv di ci qdi st rebase pull nudge sum co
+for HGCMD in tip qimport qser qpo qpop qpu qpush qfin qref qnew qrm qmv di ci qdi st rebase pull nudge sum co
 do
     alias $HGCMD="hg $HGCMD"
 done

File profile.laptop.local

View file
  • Ignore whitespace
 export FLEX_HOME="/Applications/eclipse/Adobe Flex Builder 3 Plug-in/sdks/3.5/"
-export PATH="/Users/wolever/.vcslog/bin:/usr/local/vim73/bin/:/usr/local/bin:/usr/local/sbin:$PATH:/Users/wolever/bin:$FLEX_HOME/bin:/usr/local/python32/bin/:/usr/local/python27/bin/:/usr/local/google_appengine/"
+export PATH="/Users/wolever/.vcslog/bin:/usr/local/vim73/bin/:/usr/local/bin:/usr/local/sbin:/Developer/usr/bin/:$PATH:/Users/wolever/bin:$FLEX_HOME/bin:/usr/local/python32/bin/:/usr/local/python26/bin/:/usr/local/google_appengine/:/usr/local/mysql-5.5.19-osx10.6-x86_64/bin/"
 export MANPATH=/opt/local/share/man:$MANPATH
 export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.flac=01;35:*.mp3=01;35:*.mpc=01;35:*.ogg=01;35:*.wav=01;35:'
 export CDPATH="$CDPATH:~/EnSi/repos/:~/Verso/repos/"
+export DYLD_LIBRARY_PATH="/usr/local/mysql-5.5.19-osx10.6-x86_64/lib/"
+
 # Load macports bash completion
 . /usr/local/etc/bash_completion
 
 
 #export PYTHONPATH=/Users/wolever/code/software/hg-stable
 
-test -r /sw/bin/init.sh && . /sw/bin/init.sh
-
 export PAGER="$HOME/bin/vimpager"
 alias less="$PAGER"
 

File vim/.netrwhist

View file
  • Ignore whitespace
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =7
-let g:netrw_dirhist_1='/Users/wolever/EnSi/repos/web/env/web/lib/python2.6/site-packages/django'
-let g:netrw_dirhist_2='/private/tmp/b/.hg/attic'
-let g:netrw_dirhist_3='/Users/wolever/code/sandbox/pydhcplib-0.6.2/pydhcplib'
-let g:netrw_dirhist_4='/Users/wolever/EnSi/repos/common/env/common/bin'
-let g:netrw_dirhist_5='/Users/wolever/EnSi/repos/common/explode'
-let g:netrw_dirhist_6='/Users/wolever/Sites/massuni-wiki/conf'
-let g:netrw_dirhist_7='/Users/wolever/Verso/Repos/web/apps/style'
+let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_1='/Users/wolever/EnSi/repos/web/deploy'
+let g:netrw_dirhist_2='/Users/wolever/EnSi/repos/pycommon/init.d'
+let g:netrw_dirhist_3='/Users/wolever/code/sandbox/env/sandbox/lib/python2.6/distutils'

File vim/autoload/scss_indent.vim

View file
  • Ignore whitespace
+" usage:
+" set indentexpr=scss_indent#GetIndent(v:lnum)
+fun! scss_indent#GetIndent(lnum)
+  " { -> increase indent
+  " } -> decrease indent
+  if a:lnum == 1
+    " start at 0 indentation
+    return 0
+  endif
+
+  " try to find last line ending with { or }
+  " ignoring // comments
+  let regex = '\([{}]\)\%(\/\/.*\)\?$'
+  let nr = search(regex, 'bnW')
+  if nr > 0
+    let last = indent(nr)
+    let m = matchlist(getline(nr), regex)
+    let m_curr = matchlist(getline(a:lnum), regex)
+    echoe string(m).string(m_curr)
+    if !empty(m_curr) && m_curr[1] == '}' && m[1] == '{'
+      " last was open, current is close, use same indent
+      return last
+    elseif !empty(m_curr) && m_curr[1] == '}' && m[1] == '}'
+      " } line and last line was }: decrease
+      return last - &sw
+    endif
+    if m[1] == '{'
+      " line after {: increase indent
+      return last + &sw
+    else
+      " line after } or { - same indent
+      return last
+    endif
+  else
+    return 0
+  endif
+endfun

File vim/ftdetect/scss.vim

View file
  • Ignore whitespace
+au BufRead,BufNewFile *.scss	set filetype=scss

File vim/ftplugin/scss.vim

View file
  • Ignore whitespace
+if exists('b:did_indent') && b:did_indent
+  " be kind. allow users to override this. Does it work?
+  finish
+endif
+
+setlocal indentexpr=scss_indent#GetIndent(v:lnum)

File vim/spell/en.utf-8.add

View file
  • Ignore whitespace
 BitBucket
 StackOverflow
 Reddit
+wifi
+ethernet
+APs
+WPA2
+DHCP
+SSID
+AP's
+IPs
+UI
+uploader
+Silverlight
+tarballs
+PyPI
+pip2pi
+pip2pi
+pip
+txt
+pip2tgz
+gz
+dir2pypi

File vim/spell/en.utf-8.add.spl

  • Ignore whitespace
Binary file modified.

File vim/syntax/scss.vim

View file
  • Ignore whitespace
+" Vim syntax file
+" Language: SCSS (Sassy CSS)
+" Author: Daniel Hofstetter (daniel.hofstetter@42dh.com)
+" Inspired by the syntax files for sass and css. Thanks to the authors of
+" those files!
+
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/css.vim
+
+syn case ignore
+
+syn region scssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssUrl,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,scssDefinition,scssComment,scssIdChar,scssClassChar,scssAmpersand,scssVariable,scssInclude,scssExtend,scssDebug,scssWarn,@scssControl,scssInterpolation,scssNestedSelector,scssReturn
+
+syn region scssInterpolation start="#{" end="}" contains=scssVariable
+
+syn match scssVariable "$[[:alnum:]_-]\+" nextgroup=scssVariableAssignment
+syn match scssVariableAssignment ":" contained nextgroup=scssVariableValue
+syn match scssVariableValue ".*;"me=e-1 contained contains=scssVariable,scssOperator,scssDefault "me=e-1 means that the last char of the pattern is not highlighted
+syn match scssMixin "^@mixin" nextgroup=scssMixinName
+syn match scssMixinName " [[:alnum:]_-]\+" contained nextgroup=scssDefinition
+syn match scssFunction "^@function" nextgroup=scssFunctionName
+syn match scssFunctionName " [[:alnum:]_-]\+" contained nextgroup=scssDefinition
+syn match scssReturn "@return" contained
+syn match scssInclude "@include" nextgroup=scssMixinName
+syn match scssExtend "@extend .*[;}]"me=e-1 contains=cssTagName,scssIdChar,scssClassChar
+
+syn match scssColor "#[0-9A-Fa-f]\{3\}\>" contained
+syn match scssColor "#[0-9A-Fa-f]\{6\}\>" contained
+
+syn match scssIdChar "#[[:alnum:]_-]\@=" nextgroup=scssId contains=scssColor
+syn match scssId "[[:alnum:]_-]\+" contained
+syn match scssClassChar "\.[[:alnum:]_-]\@=" nextgroup=scssClass
+syn match scssClass "[[:alnum:]_-]\+" contained
+syn match scssAmpersand "&" nextgroup=cssPseudoClass
+
+syn match scssOperator "+" contained
+syn match scssOperator "-" contained
+syn match scssOperator "/" contained
+syn match scssOperator "*" contained
+
+syn match scssNestedSelector "[^/]* {"me=e-1 contained contains=cssTagName,cssAttributeSelector,scssIdChar,scssClassChar,scssAmpersand,scssVariable,scssMixin,scssFunction,@scssControl,scssInterpolation,scssNestedProperty
+syn match scssNestedProperty "[[:alnum:]]\+:"me=e-1 contained
+
+syn match scssDebug "@debug"
+syn match scssWarn "@warn"
+syn match scssDefault "!default" contained
+
+syn match scssIf "@if"
+syn match scssElse "@else"
+syn match scssElseIf "@else if"
+syn match scssWhile "@while"
+syn match scssFor "@for" nextgroup=scssVariable
+syn match scssFrom " from "
+syn match scssTo " to "
+syn match scssThrough " through "
+syn match scssEach "@each" nextgroup=scssVariable
+syn match scssIn " in "
+syn cluster scssControl contains=scssIf,scssElse,scssElseIf,scssWhile,scssFor,scssFrom,scssTo,scssThrough,scssEach,scssIn
+
+syn match scssComment "//.*$" contains=@Spell
+
+hi def link scssVariable  Identifier
+hi def link scssVariableValue Constant
+hi def link scssMixin     PreProc
+hi def link scssMixinName Function
+hi def link scssFunction  PreProc
+hi def link scssFunctionName Function
+hi def link scssReturn    Statement
+hi def link scssInclude   PreProc
+hi def link scssExtend    PreProc
+hi def link scssComment   Comment
+hi def link scssColor     Constant
+hi def link scssIdChar    Special
+hi def link scssClassChar Special
+hi def link scssId        Identifier
+hi def link scssClass     Identifier
+hi def link scssAmpersand Character
+hi def link scssNestedProperty Type
+hi def link scssDebug     Debug
+hi def link scssWarn      Debug
+hi def link scssDefault   Special
+hi def link scssIf        Conditional
+hi def link scssElse      Conditional
+hi def link scssElseIf    Conditional
+hi def link scssWhile     Repeat
+hi def link scssFor       Repeat
+hi def link scssFrom      Repeat
+hi def link scssTo        Repeat
+hi def link scssThrough   Repeat
+hi def link scssEach      Repeat
+hi def link scssIn        Repeat
+hi def link scssInterpolation Delimiter
+
+let b:current_syntax = "scss"

File vimrc

View file
  • Ignore whitespace
 set statusline=%f%m%r%h%w\ [%Y]\ [0x\%02.2B]%<\ %F%=%4v,%4l\ %3p%%\ of\ %L
 set laststatus=2    " Always show status line
 set modelines=5     " Allow modelines within 5 lines of top/bottom
-set relativenumber  " Relative jump numbers up the side
+" set relativenumber  " Relative jump numbers up the side
 
 " Folding options
 set foldmethod=marker