changeset 443:f909912442fb

Updated repo
author unexist
date Thu, 28 Feb 2013 15:04:53 +0100
parents 27627cd71aae
children b2d663ab8df1
files .config/subtle/subtle.rb .config/user-dirs.dirs .fakexinerama .hgsub .hgsubstate .pentadactylrc .vim/syntax/go.vim .zshrc
diffstat 8 files changed, 274 insertions(+), 132 deletions(-) [+]
line wrap: on
line diff
--- a/.config/subtle/subtle.rb	Fri Feb 22 02:35:43 2013 +0100
+++ b/.config/subtle/subtle.rb	Thu Feb 28 15:04:53 2013 +0100
@@ -34,26 +34,6 @@
 set :skip_pointer_warp, false
 # }}}
 
-# Screens {{{
-screen 1 do
-  top     [:tray, :title, :spacer, :views, :center, :clock, :fuzzytime, :separator, :cpu, :sublets, :center]
-  bottom  []
-  view    0
-end
-
-screen 2 do
-  top     [:mpd, :separator, :volume, :spacer, :title, :center, :views, :center]
-  bottom  []
-  view    1
-end
-
-screen 3 do
-  top     [:views, :spacer, :title, :center, :wifi, :jdownloader, :center]
-  bottom  []
-  view    2
-end
-# }}}
-
 # Styles {{{
 style :all do
   padding    2, 6, 2, 6
@@ -107,10 +87,16 @@
   margin   2
 end
 
-style :subtle do
-  panel      "#1a1a1a"
-  background "#595959"
-  stipple    "#595959"
+style :panel_top do
+  background "#1a1a1a"
+  screen     1, [ :tray, :title, :spacer, :views, :center, :clock, :fuzzytime, :separator, :cpu, :sublets, :center ]
+  screen     3, [ :mpd, :separator, :volume, :spacer, :title, :center, :views, :center ]
+  screen     4, [ :views, :spacer, :title, :center, :wifi, :jdownloader, :center ]
+end
+
+style :panel_bottom do
+  background "#333333"
+  screen     2, [ :title, :spacer, :views ]
 end
 # }}}
 
@@ -370,7 +356,15 @@
 tag "terms" do
   match    instance: "xterm|urxvt"
   gravity  :center
-  resize   true
+  set      :resize
+end
+
+tag "first",  "urxvt1"
+tag "second", "urxvt2"
+
+tag "three" do
+  match   instance: "urxvt2"
+  gravity :three
 end
 
 tag "scratch" do
@@ -381,7 +375,7 @@
 tag "browser" do
   match "navigator|(google\-)?chrom[e|ium]|firefox|dwb"
 
-  if "mockra" == host or "proteus" == host
+  if "mockra" == host
     gravity :top75
   else
     gravity :center
@@ -390,9 +384,9 @@
 
 tag "editor" do
   match  "[g]?vim"
-  resize true
+  set    :resize
 
-  if "mockra" == host or "proteus" == host
+  if "mockra" == host
     gravity :top75
   else
     gravity :center
@@ -410,68 +404,33 @@
 end
 
 tag "mplayer" do
-  match   "mplayer"
-  float   true
-  stick   1
+  match     "mplayer"
+  set       :floating
+  stick_to  2
 end
 
 tag "stickandfloat" do
   match  "dialog|subtly|python|gtk.rb|display|pychrom|skype|xev|exe|<unknown>|plugin-container|tester.rb"
-  stick  true
-  float  true
+  set    :sticky, :floating
 end
 
 tag "stick" do
   match "evince"
-  stick true
+  set    :sticky
 end
 
 tag "urgent" do
-  stick  true
-  urgent true
-  float  true
+  set :sticky, :urgent, :floating
 end
 
 tag "powerfolder" do
   match "de-dal33t-powerfolder-PowerFolder"
-  float true
-  stick true
+  set   :floating, :sticky
 end
 
 tag "dialogs" do
-  match  "sun-awt-X11-XDialogPeer"
-  match type: [ :dialog, :splash ]
-  stick true
-end
-
-tag "three" do
-  match    "urxvt2"
-  gravity  :bottom_right
-end
-
-tag "three25" do
-  match    "urxvt2"
-  gravity  :bottom_right25
-end
-
-tag "two" do
-  match    "urxvt2"
-  gravity  :bottom
-end
-
-tag "three25" do
-  match    "urxvt1"
-  gravity  :bottom_right25
-end
-
-tag "seven" do
-  match    "urxvt1"
-  gravity  :top_left
-end
-
-tag "eight" do
-  match    "urxvt1"
-  gravity  :top
+  match "sun-awt-X11-XDialogPeer"
+  set   :sticky
 end
 
 tag "android" do
@@ -500,91 +459,61 @@
 # }}}
 
 # Views {{{
-if "mockra" == host or "proteus" == host
+if "mockra" == host
   www_re    = "browser|three25|three25"
   test_re   = "xeph[0-9]+|three25"
   editor_re = "editor|three25|three25"
   icons     = true
 else
   www_re    = "browser"
-  test_re   = "xeph[0-9]+|eight|three$|test"
+  test_re   = "xeph[0-9]+|three$|test"
   editor_re = "editor"
   icons     = true
 end
 
-iconpath = "#{ENV["HOME"]}/.local/share/icons"
-
-space = {
-  :cannon  => Subtlext::Icon.new("#{iconpath}/cannon.xbm"),
-  :ufo     => Subtlext::Icon.new("#{iconpath}/ufo.xbm"),
-  :shelter => Subtlext::Icon.new("#{iconpath}/shelter.xbm"),
-  :terms   => Subtlext::Icon.new("#{iconpath}/invader1.xbm"),
-  :www     => Subtlext::Icon.new("#{iconpath}/invader2.xbm"),
-  :void    => Subtlext::Icon.new("#{iconpath}/invader3.xbm"),
-  :sketch  => Subtlext::Icon.new("#{iconpath}/invader4.xbm"),
-  :test    => Subtlext::Icon.new("#{iconpath}/invader5.xbm"),
-  :editor  => Subtlext::Icon.new("#{iconpath}/invader6.xbm")
-}
+diamond = "#{ENV["HOME"]}/.local/share/icons/black_diamond_with_question_mark.xbm"
 
 view "terms" do
-  match     "terms|eight|two"
+  match     "terms"
   #icon      "#{iconpath}/terminal.xbm"
-  icon      Subtlext::Icon.new("#{iconpath}/cannon.xbm")
+  icon      diamond
   icon_only icons
 end
 
 view "www" do
   match     www_re
   #icon      "#{iconpath}/world.xbm"
-  icon      Subtlext::Icon.new("#{iconpath}/ufo.xbm")
+  icon      diamond
   icon_only icons
 end
 
 view "void" do
   match     "default|void|powerfolder|pms"
   #icon      "#{iconpath}/quote.xbm"
-  icon      Subtlext::Icon.new("#{iconpath}/invader3.xbm")
+  icon      diamond
   icon_only icons
 end
 
 view "misc" do
   match     "inkscape|dia|gimp|android"
   #icon      "#{iconpath}/paint.xbm"
-  icon      Subtlext::Icon.new("#{iconpath}/invader4.xbm")
+  icon      diamond
   icon_only icons
 end
 
 view "test" do
   match     test_re
   #icon      "#{iconpath}/bug.xbm"
-  icon      Subtlext::Icon.new("#{iconpath}/invader5.xbm")
+  icon      diamond
   icon_only icons
 end
 
 view "editor" do
   match     editor_re
   #icon      "#{iconpath}/ruby.xbm"
-  icon      Subtlext::Icon.new("#{iconpath}/invader6.xbm")
+  icon      diamond
   icon_only icons
 end
-
-on :view_focus do |v|
-  views = Hash[*Subtlext::Screen.all.map { |s|
-    [ s.view.name.to_sym, space[space.keys[s.id]] ] }.flatten
-  ]
-
-  Subtlext::View.all.each do |va|
-    sym = va.name.to_sym
-
-    if views.keys.include?(sym)
-      va.icon.copy_area(views[sym])
-    else
-      va.icon.copy_area(space[va.name.to_sym])
-    end
-  end
-
-  Subtlext::Subtle.render
-end
 # }}}
 
 # Sublets {{{
@@ -592,3 +521,9 @@
   format_string "%a %b %d,"
 end
 # }}}
+
+# Virtual {{{
+screen 1 do
+  virtual [  0,  0, 100, 50 ]
+  virtual [  0, 50, 100, 50 ]
+end # }}}
--- a/.config/user-dirs.dirs	Fri Feb 22 02:35:43 2013 +0100
+++ b/.config/user-dirs.dirs	Thu Feb 28 15:04:53 2013 +0100
@@ -1,8 +1,8 @@
-XDG_DESKTOP_DIR=$HOME
-XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_TEMPLATES_DIR=$HOME
-XDG_PUBLICSHARE_DIR=$HOME
-XDG_DOCUMENTS_DIR="$HOME/docs"
-XDG_MUSIC_DIR="$HOME/media/music"
-XDG_PICTURES_DIR="$HOME/images"
-XDG_VIDEOS_DIR="$HOME/media/videos"
+XDG_DESKTOP_DIR="/home/unexist"
+XDG_DOWNLOAD_DIR="/home/unexist/downloads"
+XDG_TEMPLATES_DIR="/home/unexist"
+XDG_PUBLICSHARE_DIR="/home/unexist"
+XDG_DOCUMENTS_DIR="/home/unexist/docs"
+XDG_MUSIC_DIR="/home/unexist/media/music"
+XDG_PICTURES_DIR="/home/unexist/images"
+XDG_VIDEOS_DIR="/home/unexist/media/videos"
--- a/.fakexinerama	Fri Feb 22 02:35:43 2013 +0100
+++ b/.fakexinerama	Thu Feb 28 15:04:53 2013 +0100
@@ -1,5 +1,4 @@
-2
-0 0 320 480
-320 0 320 480
-427 0 213 400
-400 400 400 400
+3
+0 0 213 480
+213 0 214 480
+427 0 213 480
--- a/.hgsub	Fri Feb 22 02:35:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-crecord = .hgext/crecord
-histedit = .hgext/histedit
--- a/.hgsubstate	Fri Feb 22 02:35:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 crecord
-0000000000000000000000000000000000000000 histedit
--- a/.pentadactylrc	Fri Feb 22 02:35:43 2013 +0100
+++ b/.pentadactylrc	Thu Feb 28 15:04:53 2013 +0100
@@ -1,3 +1,4 @@
 set guioptions=BbCrs
 set passkeys+='google\.com/reader':jk
 set passkeys+='9gag\.com':jk
+set passkeys+='narf-archive\.com':jk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.vim/syntax/go.vim	Thu Feb 28 15:04:53 2013 +0100
@@ -0,0 +1,207 @@
+" Copyright 2009 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" go.vim: Vim syntax file for Go.
+"
+" Options:
+"   There are some options for customizing the highlighting; the recommended
+"   settings are the default values, but you can write:
+"     let OPTION_NAME = 0
+"   in your ~/.vimrc file to disable particular options. You can also write:
+"     let OPTION_NAME = 1
+"   to enable particular options. At present, all options default to on.
+"
+"   - go_highlight_array_whitespace_error
+"     Highlights white space after "[]".
+"   - go_highlight_chan_whitespace_error
+"     Highlights white space around the communications operator that don't follow
+"     the standard style.
+"   - go_highlight_extra_types
+"     Highlights commonly used library types (io.Reader, etc.).
+"   - go_highlight_space_tab_error
+"     Highlights instances of tabs following spaces.
+"   - go_highlight_trailing_whitespace_error
+"     Highlights trailing white space.
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("go_highlight_array_whitespace_error")
+  let go_highlight_array_whitespace_error = 1
+endif
+if !exists("go_highlight_chan_whitespace_error")
+  let go_highlight_chan_whitespace_error = 1
+endif
+if !exists("go_highlight_extra_types")
+  let go_highlight_extra_types = 1
+endif
+if !exists("go_highlight_space_tab_error")
+  let go_highlight_space_tab_error = 1
+endif
+if !exists("go_highlight_trailing_whitespace_error")
+  let go_highlight_trailing_whitespace_error = 1
+endif
+
+syn case match
+
+syn keyword     goDirective         package import
+syn keyword     goDeclaration       var const type
+syn keyword     goDeclType          struct interface
+
+hi def link     goDirective         Statement
+hi def link     goDeclaration       Keyword
+hi def link     goDeclType          Keyword
+
+" Keywords within functions
+syn keyword     goStatement         defer go goto return break continue fallthrough
+syn keyword     goConditional       if else switch select
+syn keyword     goLabel             case default
+syn keyword     goRepeat            for range
+
+hi def link     goStatement         Statement
+hi def link     goConditional       Conditional
+hi def link     goLabel             Label
+hi def link     goRepeat            Repeat
+
+" Predefined types
+syn keyword     goType              chan map bool string error
+syn keyword     goSignedInts        int int8 int16 int32 int64 rune
+syn keyword     goUnsignedInts      byte uint uint8 uint16 uint32 uint64 uintptr
+syn keyword     goFloats            float32 float64
+syn keyword     goComplexes         complex64 complex128
+
+hi def link     goType              Type
+hi def link     goSignedInts        Type
+hi def link     goUnsignedInts      Type
+hi def link     goFloats            Type
+hi def link     goComplexes         Type
+
+" Treat func specially: it's a declaration at the start of a line, but a type
+" elsewhere. Order matters here.
+syn match       goType              /\<func\>/
+syn match       goDeclaration       /^func\>/
+
+" Predefined functions and values
+syn keyword     goBuiltins          append cap close complex copy delete imag len
+syn keyword     goBuiltins          make new panic print println real recover
+syn keyword     goConstants         iota true false nil
+
+hi def link     goBuiltins          Keyword
+hi def link     goConstants         Keyword
+
+" Comments; their contents
+syn keyword     goTodo              contained TODO FIXME XXX BUG
+syn cluster     goCommentGroup      contains=goTodo
+syn region      goComment           start="/\*" end="\*/" contains=@goCommentGroup,@Spell
+syn region      goComment           start="//" end="$" contains=@goCommentGroup,@Spell
+
+hi def link     goComment           Comment
+hi def link     goTodo              Todo
+
+" Go escapes
+syn match       goEscapeOctal       display contained "\\[0-7]\{3}"
+syn match       goEscapeC           display contained +\\[abfnrtv\\'"]+
+syn match       goEscapeX           display contained "\\x\x\{2}"
+syn match       goEscapeU           display contained "\\u\x\{4}"
+syn match       goEscapeBigU        display contained "\\U\x\{8}"
+syn match       goEscapeError       display contained +\\[^0-7xuUabfnrtv\\'"]+
+
+hi def link     goEscapeOctal       goSpecialString
+hi def link     goEscapeC           goSpecialString
+hi def link     goEscapeX           goSpecialString
+hi def link     goEscapeU           goSpecialString
+hi def link     goEscapeBigU        goSpecialString
+hi def link     goSpecialString     Special
+hi def link     goEscapeError       Error
+
+" Strings and their contents
+syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
+syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
+syn region      goRawString         start=+`+ end=+`+
+
+hi def link     goString            String
+hi def link     goRawString         String
+
+" Characters; their contents
+syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
+syn region      goCharacter         start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
+
+hi def link     goCharacter         Character
+
+" Regions
+syn region      goBlock             start="{" end="}" transparent fold
+syn region      goParen             start='(' end=')' transparent
+
+" Integers
+syn match       goDecimalInt        "\<\d\+\([Ee]\d\+\)\?\>"
+syn match       goHexadecimalInt    "\<0x\x\+\>"
+syn match       goOctalInt          "\<0\o\+\>"
+syn match       goOctalError        "\<0\o*[89]\d*\>"
+
+hi def link     goDecimalInt        Integer
+hi def link     goHexadecimalInt    Integer
+hi def link     goOctalInt          Integer
+hi def link     Integer             Number
+
+" Floating point
+syn match       goFloat             "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             "\<\d\+[Ee][-+]\d\+\>"
+
+hi def link     goFloat             Float
+
+" Imaginary literals
+syn match       goImaginary         "\<\d\+i\>"
+syn match       goImaginary         "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         "\<\d\+[Ee][-+]\d\+i\>"
+
+hi def link     goImaginary         Number
+
+" Spaces after "[]"
+if go_highlight_array_whitespace_error != 0
+  syn match goSpaceError display "\(\[\]\)\@<=\s\+"
+endif
+
+" Spacing errors around the 'chan' keyword
+if go_highlight_chan_whitespace_error != 0
+  " receive-only annotation on chan type
+  syn match goSpaceError display "\(<-\)\@<=\s\+\(chan\>\)\@="
+  " send-only annotation on chan type
+  syn match goSpaceError display "\(\<chan\)\@<=\s\+\(<-\)\@="
+  " value-ignoring receives in a few contexts
+  syn match goSpaceError display "\(\(^\|[={(,;]\)\s*<-\)\@<=\s\+"
+endif
+
+" Extra types commonly seen
+if go_highlight_extra_types != 0
+  syn match goExtraType /\<bytes\.\(Buffer\)\>/
+  syn match goExtraType /\<io\.\(Reader\|Writer\|ReadWriter\|ReadWriteCloser\)\>/
+  syn match goExtraType /\<reflect\.\(Kind\|Type\|Value\)\>/
+  syn match goExtraType /\<unsafe\.Pointer\>/
+endif
+
+" Space-tab error
+if go_highlight_space_tab_error != 0
+  syn match goSpaceError display " \+\t"me=e-1
+endif
+
+" Trailing white space error
+if go_highlight_trailing_whitespace_error != 0
+  syn match goSpaceError display excludenl "\s\+$"
+endif
+
+hi def link     goExtraType         Type
+hi def link     goSpaceError        Error
+
+" Search backwards for a global declaration to start processing the syntax.
+"syn sync match goSync grouphere NONE /^\(const\|var\|type\|func\)\>/
+
+" There's a bug in the implementation of grouphere. For now, use the
+" following as a more expensive/less precise workaround.
+syn sync minlines=500
+
+let b:current_syntax = "go"
--- a/.zshrc	Fri Feb 22 02:35:43 2013 +0100
+++ b/.zshrc	Thu Feb 28 15:04:53 2013 +0100
@@ -43,10 +43,10 @@
 setopt pushd_ignore_dups
 setopt prompt_subst
 setopt no_beep
-setopt rm_star_wait
+#setopt rm_star_wait
 unsetopt bang_hist #< Disable inline history
 setopt no_bang_hist
-setopt menu_complete
+#setopt menu_complete
 
 # History
 HISTSIZE=5000
@@ -54,7 +54,7 @@
 SAVEHIST=5000
 
 # Style
-zstyle ':completion:*:descriptions' format '%U%B%d%b%u' 
+zstyle ':completion:*:descriptions' format '%U%B%d%b%u'
 zstyle ':completion:*:warnings' format '%BSorry, no matches for: %d%b' 
 
 # Keys bindings
@@ -179,6 +179,10 @@
   export PATH=/opt/android-sdk/platform-tools:$PATH
 fi
 
+# Sencha stuff
+export PATH=/home/unexist/bin/Sencha/Cmd/3.0.0.250:$PATH
+export SENCHA_CMD_3_0_0="/home/unexist/bin/Sencha/Cmd/3.0.0.250"
+
 # Setting default editor
 if [ -f /usr/bin/vim ] ; then
   export EDITOR=/usr/bin/vim