@@ -6,11 +6,11 @@ if has('vim_starting')

   set nocompatible               " Be iMproved

   " Required:

-  set runtimepath+=$HOME/.nvim/bundle/neobundle.vim/

+  set runtimepath+=$HOME/.config/nvim/bundle/neobundle.vim/

 endif

 " Required:

-call neobundle#begin(expand("$HOME/.nvim/bundle"))

+call neobundle#begin(expand("$HOME/.config/nvim/bundle"))

 " Let NeoBundle manage NeoBundle

 " Required:

new file mode 100644

@@ -0,0 +1,114 @@

+(in-package :stumpwm)

+

+(eval-when (:load-toplevel :compile-toplevel :execute)

+  (load "~/quicklisp/setup.lisp")

+  (ql:quickload :swank))

+

+(defcommand start-swank () ()

+  (swank:start-server :port 4587 :dont-close t))

+

+

+(set-prefix-key (kbd "s-space"))

+

+(defparameter *browser-command* "/usr/bin/google-chrome-beta")

+

+(defun cat (&rest strings)

+  (apply 'concatenate 'string strings))

+

+(defgeneric get-search-url (provider &rest strings)

+  (:method-combination append :most-specific-last)

+  (:method :around (provider &rest r)

+   (declare (ignore r))

+   (apply #'concatenate 'string (call-next-method)))

+

+  (:method append (provider &rest r)

+   (declare (ignore r))

+   (list "https://duckduckgo.com/?q="))

+  (:method append ((provider (eql nil)) &rest strings)

+   (list* (car strings) (loop for string in (cdr strings) nconcing (list "+" string))))

+

+  (:method append ((provider (eql :google)) &rest strings)

+   (list* "%21google" (loop for string in strings nconcing (list "+" string)))))

+

+(defmacro add-provider (name ddg-shortcut)

+  `(defmethod get-search-url append ((provider (eql ,name)) &rest strings)

+     (list* (concatenate 'string "%21" ,ddg-shortcut)

+            (loop for string in strings nconcing (list "+" string)))))

+

+(defmacro add-providers (&body definitions)

+  `(progn

+     ,@(loop for (name shortcut) in definitions

+             collect `(add-provider ,name ,shortcut))))

+

+

+(add-providers

+  (:amazon "a")

+  (:php "php")

+  (:python "python")

+  (:stack-overflow "sof")

+  (:lisp "lisp")

+  (:wikipedia "w"))

+

+(defcommand google (provider search-string) ((:string "Search Provider? ") (:string "Search Google for: "))

+  "Search google for a given string"

+  (check-type search-string (or null string))

+  (when search-string)

+  (run-shell-command (cat *browser-command* " "

+                          (get-search-url :google (substitute #\+ #\space search-string)))))

+

+

+(defcommand do-search (provider search-string) ((:string "Provider: ") (:string "Search for: "))

+  "Run a search against a specified provider"

+  (check-type provider (or null string))

+  (check-type search-string (or null string))

+  (when (and provider search-string)

+    (let ((provider (intern (string-upcase provider) :keyword)))

+      (run-shell-command (cat *browser-command* " "

+                              (get-search-url provider (substitute #\+ #\space search-string)))))))

+

+(defcommand google (search-string) ((:string "Search Google for: "))

+  "Search google for a given string"

+  (check-type search-string (or null string))

+  (when search-string

+    (run-shell-command (cat *browser-command* " "

+                            (get-search-url :google (substitute #\+ #\space search-string))))))

+

+(defcommand duckduckgo (search-string) ((:string "Search DDG for: "))

+  "Search duckduckgo gor a given string"

+  (check-type search-string (or null string))

+  (when search-string

+    (run-shell-command (cat *browser-command* " "

+                            (get-search-url nil (substitute #\+ #\space search-string))))))

+

+(defcommand search-for-selection (provider) ((:string "Search Provider?"))

+  "Search for the x selection with provider"

+  (do-search provider (get-x-selection)))

+

+(defparameter *selection-search-map* nil "selection search map")

+(fill-keymap *selection-search-map*

+             (kbd "g") "search-for-search google"

+             (kbd "/") "search-for-search google"

+             (kbd "s-/") "search-for-search google" 

+             (kbd "l") "search-for-selection lisp")

+

+(defparameter *search-map* nil "search map")

+(fill-keymap *search-map*

+             (kbd "a") "do-search amazon"

+             (kbd "h") "do-search php"

+             (kbd "p") "do-search python"

+             (kbd "o") "do-search stack-overflow"

+             (kbd "y") "do-search youtube"

+             (kbd "l") "do-search lisp"

+             (kbd "w") "do-search wikipedia"

+             (kbd "d") "do-search duckduckgo"

+             (kbd "g") "do-search google"

+             (kbd "s") *selection-search-map*

+             (kbd "/") "do-search google"

+             (kbd "Return") "search-for-selection google"

+             (kbd "s-/") "do-search google")

+

+(define-key *top-map* (kbd "s-/") *search-map*)

+(define-key *top-map* (kbd "s-TAB") "fnext")

+(define-key *top-map* (kbd "s-ISO_Left_Tab") "fother")

+

+; vim: set ft=lisp:

@@ -27,7 +27,7 @@ set -g message-fg colour16

 set -g message-bg colour221

 set -g message-attr bold

 set -g status-left '#[fg=colour235,bg=colour252,bold]  #S #[fg=colour252,bg=colour238,nobold]#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]'

-set -g window-status-format "#[fg=white,bg=colour234] #I #W"

+set -g window-status-format "#[fg=white,bg=colour234]#I #W"

 set -g window-status-current-format "#[fg=colour234,bg=colour39] #[fg=colour25,bg=colour39,noreverse,bold] #I  #W #[fg=colour39,bg=colour234,nobold]"

 set -sg escape-time 0

@@ -4,14 +4,13 @@ let g:sql_type_default = 'pgsql'

 let g:airline_theme="murmur"

 let g:haddock_browser_callformat = "%s %s"

 let g:haddock_browser = "open"

-let g:lisp_rainbow=1 

-let g:pandoc_no_empty_implicits=1

-let g:pandoc_use_hard_wraps = 1

-let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

-let g:pandoc#modules#disabled =  ["command", "bibliographies"]

-let g:pandoc_formatting_settings = "h"

-let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

-let g:slimv_disable_clojure=1

+let g:lisp_rainbow=1

+"let g:pandoc_no_empty_implicits=1

+"let g:pandoc_use_hard_wraps = 1

+"let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

+"let g:pandoc#modules#disabled =  ["command", "bibliographies"]

+"let g:pandoc_formatting_settings = "h"

+"let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

 let g:snips_author="Edward Langley"

 let g:solarized_termtrans=1

 let g:syntastic_python_checkers = ['python']

@@ -53,64 +52,72 @@ NeoBundleFetch 'Shougo/neobundle.vim'

-NeoBundle 'altercation/vim-colors-solarized'

-NeoBundle 'bitc/vim-hdevtools'

-NeoBundle 'Blackrush/vim-gocode'

-NeoBundle 'bling/vim-airline'

-NeoBundle 'burnettk/vim-angular'

-NeoBundle 'christoomey/vim-tmux-navigator'

-NeoBundle 'curist/vim-angular-template'

-NeoBundle 'eagletmt/ghcmod-vim'

-NeoBundle 'eagletmt/neco-ghc'

-NeoBundle 'edsono/vim-matchit'

-"NeoBundle 'enomsg/vim-haskellConcealPlus'

-NeoBundle 'exu/pgsql.vim'

-NeoBundle 'fiddlerwoaroof/htmljinja'

-NeoBundle 'fiddlerwoaroof/vim-jinja'

-NeoBundle 'godlygeek/tabular'

-NeoBundle 'groenewege/vim-less'

-NeoBundle 'guns/vim-clojure-static'

-NeoBundle 'ivanov/vim-ipython'

-NeoBundle 'jmcantrell/vim-virtualenv'

-NeoBundle 'kien/rainbow_parentheses.vim'

-NeoBundle 'kovisoft/slimv'

-NeoBundle 'lukerandall/haskellmode-vim'

-"NeoBundle 'm2mdas/phpcomplete-extended'

-NeoBundle 'markcornick/vim-vagrant'

-NeoBundle 'matthewsimo/angular-vim-snippets'

-NeoBundle 'mattn/emmet-vim.git'

-NeoBundle 'msanders/snipmate.vim'

-NeoBundle 'othree/javascript-libraries-syntax.vim'

-NeoBundle 'pangloss/vim-javascript'

-NeoBundle 'raichoo/haskell-vim'

-"NeoBundle 'rking/ag.vim' "Ag search utility

-NeoBundle 'rust-lang/rust.vim'

-NeoBundle 'scrooloose/nerdcommenter'

-NeoBundle 'scrooloose/nerdtree'

-NeoBundle 'scrooloose/syntastic'

-NeoBundle 'Shougo/unite-outline'

-NeoBundle 'Shougo/unite.vim'

-NeoBundle 'Shougo/vimfiler.vim'

-NeoBundle 'Shougo/vimproc'

-NeoBundle 'Shougo/vimshell.vim'

-NeoBundle 'sjl/gundo.vim'

-NeoBundle 'sjl/vitality.vim'

-NeoBundle 'sophacles/vim-bundle-mako'

-NeoBundle 'terryma/vim-multiple-cursors'

-NeoBundle 'tpope/vim-fireplace'

-NeoBundle 'tpope/vim-fugitive'

-NeoBundle 'tpope/vim-repeat'

-NeoBundle 'tpope/vim-surround'

-NeoBundle 'Twinside/vim-haskellFold'

-NeoBundle 'Twinside/vim-hoogle'

-"NeoBundle 'Valloric/YouCompleteMe'

-NeoBundle 'vim-pandoc/vim-pandoc'

-NeoBundle 'vim-scripts/dbext.vim'

-NeoBundle 'vim-scripts/php.vim--Garvin'

-NeoBundle 'vim-scripts/pydoc.vim'

-NeoBundle 'vim-scripts/VimClojure'

-NeoBundle 'vim-voom/VOoM'

-NeoBundle 'ytsunetsune/unite-outline-euslisp'

+ NeoBundle 'mustache/vim-mustache-handlebars'

+ NeoBundle 'davidoc/taskpaper.vim'

+ NeoBundle 'altercation/vim-colors-solarized'

+ NeoBundle 'bitc/vim-hdevtools'

+ NeoBundle 'Blackrush/vim-gocode'

+ NeoBundle 'bling/vim-airline'

+ NeoBundle 'bling/vim-airline-themes'

+ NeoBundle 'burnettk/vim-angular'

+ NeoBundle 'christoomey/vim-tmux-navigator'

+ NeoBundle 'curist/vim-angular-template'

+ NeoBundle 'eagletmt/ghcmod-vim'

+ NeoBundle 'eagletmt/neco-ghc'

+ NeoBundle 'edsono/vim-matchit'

+ "NeoBundle 'enomsg/vim-haskellConcealPlus'

+ NeoBundle 'exu/pgsql.vim'

+ NeoBundle 'fiddlerwoaroof/htmljinja'

+ NeoBundle 'fiddlerwoaroof/vim-jinja'

+ NeoBundle 'godlygeek/tabular'

+ NeoBundle 'groenewege/vim-less'

+ NeoBundle 'guns/vim-clojure-static'

+ NeoBundle 'ivanov/vim-ipython'

+ NeoBundle 'jmcantrell/vim-virtualenv'

+ NeoBundle 'kien/rainbow_parentheses.vim'

+ NeoBundle 'kovisoft/slimv'

+ NeoBundle 'lukerandall/haskellmode-vim'

+ "NeoBundle 'm2mdas/phpcomplete-extended'

+ NeoBundle 'markcornick/vim-vagrant'

+ NeoBundle 'matthewsimo/angular-vim-snippets'

+ NeoBundle 'mattn/emmet-vim.git'

+ NeoBundle 'msanders/snipmate.vim'

+ NeoBundle 'othree/javascript-libraries-syntax.vim'

+ NeoBundle 'pangloss/vim-javascript'

+ NeoBundle 'raichoo/haskell-vim'

+ "NeoBundle 'rking/ag.vim' "Ag search utility

+ NeoBundle 'rust-lang/rust.vim'

+ NeoBundle 'scrooloose/nerdcommenter'

+ NeoBundle 'scrooloose/nerdtree'

+ NeoBundle 'scrooloose/syntastic'

+ NeoBundle 'Shougo/unite.vim'

+ NeoBundle 'Shougo/unite-outline'

+ NeoBundle 'tsukkee/unite-tag'

+ NeoBundle 'Shougo/vimfiler.vim'

+ NeoBundle 'Shougo/vimproc'

+ NeoBundle 'Shougo/vimshell.vim'

+ NeoBundle 'sjl/gundo.vim'

+ NeoBundle 'sjl/vitality.vim'

+ NeoBundle 'sophacles/vim-bundle-mako'

+ NeoBundle 'terryma/vim-multiple-cursors'

+ NeoBundle 'tpope/vim-fireplace'

+ NeoBundle 'tpope/vim-fugitive'

+ NeoBundle 'tpope/vim-repeat'

+ NeoBundle 'tpope/vim-surround'

+ NeoBundle 'Twinside/vim-haskellFold'

+ NeoBundle 'Twinside/vim-hoogle'

+ "NeoBundle 'Valloric/YouCompleteMe'

+ "NeoBundle 'vim-pandoc/vim-pandoc'

+ NeoBundle 'vim-scripts/dbext.vim'

+ NeoBundle 'vim-scripts/php.vim--Garvin'

+ NeoBundle 'vim-scripts/pydoc.vim'

+ NeoBundle 'vim-scripts/VimClojure'

+ NeoBundle 'vim-voom/VOoM'

+ NeoBundle 'ytsunetsune/unite-outline-euslisp'

+ NeoBundle 'xolox/vim-misc'

+ NeoBundle 'xolox/vim-easytags'

+ NeoBundle 'majutsushi/tagbar'

+

 " Required:

 call neobundle#end()

@@ -124,28 +131,28 @@ NeoBundleCheck

 "End NeoBundle Scripts-------------------------

 let counter = 0

-let g:syntastic_auto_loc_list=1

-let g:sql_type_default = 'pgsql'

 let g:airline_theme="murmur"

 let g:haddock_browser_callformat = "%s %s"

 let g:haddock_browser = "open"

-let g:lisp_rainbow=1 

-let g:pandoc_no_empty_implicits=1

-let g:pandoc_use_hard_wraps = 1

-let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

-let g:pandoc#modules#disabled =  ["command", "bibliographies"]

-let g:pandoc_formatting_settings = "h"

-let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

+let g:lisp_rainbow=1

+"let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

+"let g:pandoc_formatting_settings = "h"

+"let g:pandoc#modules#disabled =  ["command", "bibliographies"]

+"let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

+"let g:pandoc_no_empty_implicits=1

+"let g:pandoc_use_hard_wraps = 1

 let g:slimv_disable_clojure=1

+let g:slimv_repl_split=3

+let g:slimv_browser_command_suffix='2>&1 > /dev/null'

 let g:snips_author="Edward Langley"

 let g:solarized_termtrans=1

+let g:sql_type_default = 'pgsql'

+let g:syntastic_auto_loc_list=1

 let g:syntastic_python_checkers = ['python']

 let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*'

 let g:tex_flavor='xelatex'

 let g:unite_force_overwrite_statusline = 0

 let g:vimclojure#HighlightBuiltins = 1

-let g:vimclojure#HighlightBuiltins = 1

-let g:vimclojure#ParenRainbow = 1

 let g:vimclojure#ParenRainbow = 1

 let g:virtualenv_directory = "$HOME/python_envs"

 let maplocalleader=','

@@ -232,7 +239,7 @@ if &term =~ "xterm\\|rxvt"

 endif

 "SmartIndent for Python

-"autocmd BufEnter *.hs compiler ghc

+autocmd BufEnter *.hs compiler ghc

 au FocusLost * :wa

 function Checkft()

@@ -247,18 +254,18 @@ endfunction

 autocmd! BufNewFile * silent! 0r ~/.vim/skel/tmpl.%:e

 autocmd BufRead,BufNewFile *.twig set filetype=htmljinja

 autocmd BufRead,BufNewFile *.mako set ft=mako

-autocmd BufRead,BufNewFile *.md set dictionary+=/usr/share/dict/words

+autocmd BufRead,BufNewFile *.md set dictionary+=/usr/share/dict/words ft=markdown

 autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

 autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

 autocmd BufRead,BufNewFile *.tac set ft=python

 autocmd bufwritepost * call Checkft()

 autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

-autocmd FileType haskell set omnifunc=necoghc#omnifunc

+"autocmd FileType haskell set omnifunc=necoghc#omnifunc

 autocmd FileType lisp set omnifunc=SlimvOmniComplete

-autocmd FileType markdown set linebreak tw=110 noexpandtab nosmartindent autoindent

-autocmd FileType pandoc set linebreak tw=110 noexpandtab nosmartindent autoindent

-autocmd FileType pantondoc set linebreak tw=110 noexpandtab nosmartindent autoindent

+autocmd FileType markdown set linebreak tw=110 noexpandtab nosmartindent autoindent spelllang=en spell

+"autocmd FileType pandoc set linebreak tw=110 noexpandtab nosmartindent autoindent

+"autocmd FileType pantondoc set linebreak tw=110 noexpandtab nosmartindent autoindent

 autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,(

 "Diable the anti-python smart indent of #

 inoremap  # X#

@@ -342,18 +349,18 @@ function! s:unite_my_settings()

   " exit with esc

   nmap <buffer> <ESC> <Plug>(unite_exit)

- 

+

   " exit with ctrl-c

   imap <buffer> <c-c> <Plug>(unite_exit)

   nmap <buffer> <c-c> <Plug>(unite_exit)

 endfunction

 if executable('ag')

-  let g:unite_source_file_async_command =

-            \ 'ag --follow --nocolor --nogroup --hidden -g "" --ignore ''.sass-cache'''

+  let g:unite_source_file_async_command = 'ag --follow --nocolor --nogroup --hidden -g "" --ignore ''.sass-cache'''

   "https://github.com/ggreer/the_silver_searcher

   "Use ag in unite grep source.

   let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '--hidden', '-g', '', '--ignore', '.git', '--ignore', '.sass-cache']

+  let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '--hidden', '-g', '', '--ignore', '.git', '--ignore', '.sass-cache']

   "let g:unite_source_grep_command = 'ag'

   "let g:unite_source_grep_default_opts =

   "      \ '--line-numbers --nocolor --nogroup --hidden --ignore ' .

@@ -386,6 +393,8 @@ nmap [unite]k :<C-u>Unite tab:no-current<C-m>

 nmap [unite]t :NERDTreeToggle<CR>

 nmap [unite]u :GundoToggle<CR>

 nmap [unite]r :!vagrant rsync<CR>

+nmap [unite]h :set hlsearch!<CR>

+nmap [unite]l :set list!<CR>

 " Reload

 map <silent> tu :call GHC_BrowseAll()<CR>

@@ -393,4 +402,4 @@ map <silent> tu :call GHC_BrowseAll()<CR>

 map <silent> tw :call GHC_ShowType(1)<CR>

 autocmd BufRead,BufNewFile *.css,*.scss,*.less setlocal foldmethod=marker foldmarker={,}

-

+command -nargs=+ Gadd Git add <q-args>

@@ -1,7 +1,7 @@

 Config { font = "xft:Source Code Pro:size=8:antialias=true"

        , bgColor = "black"

        , fgColor = "grey"

-       , position = TopW L 90

+       , position = TopW L 100

        , commands = [ Run Weather "EGPF" ["-t"," <tempF>F","-L","64","-H","77","--normal","green","--high","red","--low","lightblue"] 36000

                     , Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10

                     , Run Memory ["-t","Mem: <usedratio>%"] 10

@@ -15,6 +15,7 @@ import XMonad.Actions.CopyWindow(copy,copyWindow,kill1,killAllOtherCopies)

 import XMonad.Actions.CycleWindows()

 import XMonad.Actions.DynamicWorkspaces

 import XMonad.Actions.GridSelect

+import XMonad.Actions.PhysicalScreens

 import XMonad.Actions.SpawnOn

 import XMonad.Core()

 import XMonad.Hooks.DynamicLog

@@ -50,9 +51,9 @@ import XMonad.StackSet as W

 import XMonad.Util.Dzen

 import XMonad.Util.EZConfig(additionalKeys)

 import XMonad.Util.Loggers

+import XMonad.Util.NamedScratchpad

 import XMonad.Util.Run(spawnPipe)

 import XMonad.Util.Scratchpad

-import XMonad.Util.NamedScratchpad

 nmaster :: Int

 nmaster = 1

@@ -82,48 +83,48 @@ imLayout = renamed [Replace "im"] $ withIM myRatio empathyRoster Accordion where

 base :: NewSelect

   (ModifiedLayout Rename (Mirror ThreeCol))

   (NewSelect (ModifiedLayout Rename (Mirror Tall))

-    (NewSelect Full

-      (NewSelect Accordion

-        (NewSelect Circle

-          (NewSelect SpiralWithDir

-            (NewSelect

-              (ModifiedLayout Rename

-                (ModifiedLayout (Decoration TabbedDecoration DefaultShrinker) Simplest))

-                (NewSelect

-                  (ModifiedLayout Rename (Mirror Accordion))

-                  (NewSelect

-                    (ModifiedLayout Rename (ModifiedLayout Gaps Full))

-                    (NewSelect

-                      (ModifiedLayout Rename DragPane)

-                      (NewSelect (ModifiedLayout Rename Grid)

-                      (NewSelect TwoPane OneBig))))))))))) Word64

-base =     mthree ||| wide ||| Full ||| Accordion ||| Circle ||| spiral (6/7)

-       ||| myTabbed ||| wideAccordion ||| writingLayout ||| rows ||| grid

-       ||| (TwoPane (3/100) (1/2)) ||| (OneBig (3/4) (3/4))

-   where

-      mthree = renamed [Replace "ThreeWide"] $ Mirror threeLayout

-      wide = renamed [Replace "Wide"] $ Mirror tiled

-      wideAccordion = renamed [Replace "WideAccordion"] $ Mirror Accordion

-      grid = renamed [Replace "Gridding"] $ GridRatio (1/2)

-      rows = renamed [Replace "WritingNew"] $ dragPane Vertical 1 0.5

-

-

-

-myLayout = avoidStruts $ smartBorders $

-   onWorkspace "web" (myTabbed ||| Full ||| (TwoPane (3/100) (1/2))) $

-   onWorkspace "terminal" (tiled ||| threeLayout ||| Full) $

-   onWorkspace "IM" imLayout $

-   onWorkspace "images" (gimpLayout ||| tiled ||| threeLayout ||| base) $

-   tiled ||| threeLayout ||| base

- where

-   gimpLayout = renamed [Replace "gimp"] $ withIM (11/64) (Role "gimp-toolbox") $ ResizableTall 2 (1/118) (11/20) [1]

+   (NewSelect Full

+    (NewSelect Accordion

+     (NewSelect Circle

+      (NewSelect SpiralWithDir

+       (NewSelect (ModifiedLayout Rename (ModifiedLayout (Decoration TabbedDecoration DefaultShrinker) Simplest))

+        (NewSelect (ModifiedLayout Rename (Mirror Accordion))

+         (NewSelect (ModifiedLayout Rename (ModifiedLayout Gaps Full))

+          (NewSelect (ModifiedLayout Rename DragPane)

+           (NewSelect (ModifiedLayout Rename Grid)

+            (NewSelect TwoPane OneBig))))))))))) Word64

+base = mthree ||| wide ||| Full ||| Accordion ||| Circle ||| spiral (6/7)

+   ||| myTabbed ||| wideAccordion ||| writingLayout ||| rows ||| grid

+   ||| TwoPane (3/100) (1/2) ||| OneBig (3/4) (3/4)

+  where

+    mthree = renamed [Replace "ThreeWide"] $ Mirror threeLayout

+    wide = renamed [Replace "Wide"] $ Mirror tiled

+    wideAccordion = renamed [Replace "WideAccordion"] $ Mirror Accordion

+    grid = renamed [Replace "Gridding"] $ GridRatio (1/2)

+    rows = renamed [Replace "WritingNew"] $ dragPane Vertical 1 0.5

+

+

+{-

+ -

+ -}

+

+tmp = onWorkspace "web" (myTabbed ||| Full ||| TwoPane (3/100) (1/2)) $

+      onWorkspace "terminal" (tiled ||| threeLayout ||| Full) $

+      onWorkspace "IM" imLayout $

+      --onWorkspace "images" (gimpLayout ||| tiled ||| threeLayout ||| base) $

+       tiled ||| threeLayout ||| base

+ --where

+ --  gimpLayout = renamed [Replace "gimp"] $ withIM (11/64) (Role "gimp-toolbox") $ ResizableTall 2 (1/118) (11/20) [1]

+

+myLayout = avoidStruts $ smartBorders tmp

 myDzenConfig :: DzenConfig

-myDzenConfig = (timeout 1 >=> (onCurr (vCenter 100)) >=> (onCurr (hCenter 300)) >=> XMonad.Util.Dzen.font "xft:Source Code Pro:size=20:antialias=true")

+myDzenConfig = timeout 1 >=> onCurr (vCenter 100)

+                         >=> onCurr (hCenter 300)

+                         >=> XMonad.Util.Dzen.font "xft:Source Code Pro:size=20:antialias=true"

-makeLayoutList :: [t] -> [(t,t)] 

-makeLayoutList [] = []

-makeLayoutList (l:ls) = (l,l):(makeLayoutList ls)

+makeLayoutList :: [t] -> [(t,t)]

+makeLayoutList = map (\ l -> (l, l))

 --changeLayout :: Maybe String -> X ()

 --changeLayout a =

@@ -138,7 +139,7 @@ makeLayoutList (l:ls) = (l,l):(makeLayoutList ls)

 nchooseLayout :: GSConfig String -> X ()

 nchooseLayout conf = do

    loName <- wrapped_loName

-   wsName <- wrapped_wsName 

+   wsName <- wrapped_wsName

    a <- gridselect conf $ makeLayoutList $

       cycleFront loName $ case wsName of

@@ -154,14 +155,14 @@ nchooseLayout conf = do

          dzenConfig myDzenConfig r

    return ()

  where

-   wrapped_loName :: X [Char]

+   wrapped_loName :: X String

    wrapped_loName =  liftM (fromMaybe "") logLayout

-   wrapped_wsName :: X [Char]

+   wrapped_wsName :: X String 

    wrapped_wsName =  liftM (fromMaybe "") logCurrent

    cycleFront :: String -> [String] -> [String]

-   cycleFront n l = n:(Data.List.delete n l)

+   cycleFront n l = n: Data.List.delete n l

    basicList = ["Accordion", "Full", "Tabbed", "Spiral", "Wide", "ThreeWide", "WideAccordion", "Writing", "WritingNew", "Gridding", "TwoPane", "OneBig"]

    defaultList = ["Tall", "ThreeCol"] ++ basicList

@@ -200,10 +201,9 @@ manageScratchPad = namedScratchpadManageHook scratchpads

 scratchpads :: [NamedScratchpad]

 scratchpads = [

   -- run htop in xterm, find it by title, use default floating window placement

-  NS "htop" "xterm -e htop" (title =? "htop") floatStyle ,

+  NS "glances" "xterm -e glances" (title =? "glances") floatStyle ,

   NS "mutt" "xterm -e mutt" (title =? "mutt") floatStyle ,

   NS "mcabber" "xterm -e mcabber" (title =? "mcabber") floatStyle ,

-  NS "irc" "xterm -e irssi" (title =? "irssi") floatStyle ,

   NS "mpc" "stterm -c mpc -e ncmpcpp" (className =? "ncmpcpp") floatStyle ,

   -- run gvim, find by role

@@ -232,18 +232,19 @@ copyNSwitch :: forall l a s sd a1. (Eq s, Eq a) => ((StackSet String l a s sd ->

                  -> String -> X ()

 copyNSwitch ws target = do

   ws $ copy target

-  ws $ W.greedyView target

+  ws $ W.view target

   dShow target

 shiftNSwitch :: forall l a s sd a1. (Eq s, Ord a) => ((StackSet String l a s sd -> StackSet String l a s sd) -> X a1)

                   -> String -> X ()

 shiftNSwitch ws target = do

   ws $ shift target

-  ws $ W.greedyView target

+  ws $ W.view target

   dShow target

-switchWorkspace :: WorkspaceId -> X ()

-switchWorkspace target = do

+switchWorkspace :: forall l a s sd a1. (Eq s, Ord a) => ((StackSet String l a s sd -> StackSet String l a s sd) -> X a1)

+                  -> String -> X ()

+switchWorkspace ws target = do

   windows $ W.greedyView target

   dShow target

@@ -257,6 +258,47 @@ maximizeFlop = do

   windows W.focusUp

   withFocused $ sendMessage . maximizeRestore

+makeSwitchComb mod keyList num action = ((getMod mod, keyList !! num), action)

+  where

+    getMod Nothing = mod4Mask

+    getMod (Just mod) = mod4Mask .|. mod

+

+workspaceNames = ["web", "2", "3", "4", "5", "6", "7", "terminal", "images"]

+

+numKeys :: [KeySym]

+numKeys = [xK_0, xK_1, xK_2, xK_3, xK_4, xK_5, xK_6, xK_7, xK_8, xK_9]

+

+numPadKeys :: [KeySym]

+numPadKeys = [xK_KP_Insert -- 0

+             , xK_KP_End,  xK_KP_Down,  xK_KP_Page_Down -- 1, 2, 3

+             , xK_KP_Left, xK_KP_Begin, xK_KP_Right     -- 4, 5, 6

+             , xK_KP_Home, xK_KP_Up,    xK_KP_Page_Up   -- 7, 8, 9

+             ]

+

+combForNum keyList action mod n = makeSwitchComb mod keyList n $ action windows $ workspaceNames !! (n-1)

+

+multiMap funs seq = concatMap (`map` seq) funs

+

+workspaceKeys =

+    bindWorkspaces [

+      bindNum copyNSwitch shiftMask,

+      bindNum shiftNSwitch controlMask,

+

+      bindNumPad copyNSwitch shiftMask,

+      bindNumPad shiftNSwitch controlMask,

+

+      combForNum numKeys switchWorkspace Nothing,

+      combForNum numPadKeys switchWorkspace Nothing

+      ] ++ [

+      ((mod4Mask, xK_0), withNthWorkspace greedyView 0),

+      ((mod4Mask .|. shiftMask, xK_0), withNthWorkspace copy 0),

+      ((mod4Mask, head numPadKeys), withNthWorkspace greedyView 0) 

+      ]

+    where

+      bindNum action = combForNum numKeys action . Just

+      bindNumPad action = combForNum numPadKeys action . Just

+      bindWorkspaces = flip multiMap [1..9]

+

 main :: IO ()

 main = do

    xmproc <- spawnPipe "/home/edwlan/.local/bin/xmobar /home/edwlan/.xmobarrc"

@@ -265,69 +307,24 @@ main = do

          manageHook = myManageHook <+> manageSpawn <+> manageHook defaultConfig,

          --handleEventHook = handleTimerEvent,

          layoutHook = maximize myLayout,

-         logHook = takeTopFocus >> (dynamicLogWithPP myPP {

-            ppOutput = hPutStrLn xmproc

-         }),

+         logHook = takeTopFocus >> dynamicLogWithPP myPP {

+           ppOutput = hPutStrLn xmproc

+         },

          modMask = mod4Mask,

          focusFollowsMouse = False,

          clickJustFocuses = False,

-         XMonad.workspaces = ["web", "terminal", "1", "2", "3", "4", "5", "6", "images", "IM"]

-      } `additionalKeys` (

+         XMonad.workspaces = ["web", "2", "3", "4", "5", "6", "7", "terminal", "images", "IM"]

+      } `additionalKeys` (workspaceKeys ++

       [

-         ((mod4Mask .|. controlMask, numPadKeys !! 1), shiftNSwitch windows "web" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 2), shiftNSwitch windows "terminal" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 3), shiftNSwitch windows "1" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 4), shiftNSwitch windows "2" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 5), shiftNSwitch windows "3" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 6), shiftNSwitch windows "4" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 7), shiftNSwitch windows "5" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 8), shiftNSwitch windows "6" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 9), shiftNSwitch windows "images" ),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_h ), sendMessage $ Move L),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_j ), sendMessage $ Move D),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_k   ), sendMessage $ Move U),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_l), sendMessage $ Move R),

-         ((mod4Mask .|. controlMask, xK_1), shiftNSwitch windows "web" ),

-         ((mod4Mask .|. controlMask, xK_2), shiftNSwitch windows "terminal" ),

-         ((mod4Mask .|. controlMask, xK_3), shiftNSwitch windows "1" ),

-         ((mod4Mask .|. controlMask, xK_4), shiftNSwitch windows "2" ),

-         ((mod4Mask .|. controlMask, xK_5), shiftNSwitch windows "3" ),

-         ((mod4Mask .|. controlMask, xK_6), shiftNSwitch windows "4" ),

-         ((mod4Mask .|. controlMask, xK_7), shiftNSwitch windows "5" ),

-         ((mod4Mask .|. controlMask, xK_8), shiftNSwitch windows "6" ),

-         ((mod4Mask .|. controlMask, xK_9), shiftNSwitch windows "images" ),

          ((mod4Mask .|. controlMask, xK_backslash), maximizeFlop),

          ((mod4Mask .|. controlMask, xK_grave), shiftNSwitch windows "IM" ),

          ((mod4Mask .|. controlMask, xK_m), withWorkspace defaultXPConfig (windows . shift)),

-         (((mod4Mask .|. controlMask, xK_q     ), spawn "if type xmonad; then xmonad --recompile && xmonad --restart; else xmessage xmonad not in \\$PATH: \"$PATH\"; fi")),

+         ((mod4Mask .|. controlMask, xK_q     ), spawn "if type xmonad; then xmonad --recompile && xmonad --restart; else xmessage xmonad not in \\$PATH: \"$PATH\"; fi"),

          ((mod4Mask .|. controlMask, xK_t), killAllOtherCopies),

-         ((mod4Mask, numPadKeys !! 1), switchWorkspace "web" ),

-         ((mod4Mask, numPadKeys !! 2), switchWorkspace "terminal" ),

-         ((mod4Mask, numPadKeys !! 3), switchWorkspace "1" ),

-         ((mod4Mask, numPadKeys !! 4), switchWorkspace "2" ),

-         ((mod4Mask, numPadKeys !! 5), switchWorkspace "3" ),

-         ((mod4Mask, numPadKeys !! 6), switchWorkspace "4" ),

-         ((mod4Mask, numPadKeys !! 7), switchWorkspace "5" ),

-         ((mod4Mask, numPadKeys !! 8), switchWorkspace "6" ),

-         ((mod4Mask, numPadKeys !! 9), switchWorkspace "images" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 1), copyNSwitch windows "web" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 2), copyNSwitch windows "terminal" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 3), copyNSwitch windows "1" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 4), copyNSwitch windows "2" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 5), copyNSwitch windows "3" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 6), copyNSwitch windows "4" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 7), copyNSwitch windows "5" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 8), copyNSwitch windows "6" ),

-         ((mod4Mask .|. shiftMask, numPadKeys !! 9), copyNSwitch windows "images" ),

-         ((mod4Mask .|. shiftMask, xK_1), copyNSwitch windows "web" ),

-         ((mod4Mask .|. shiftMask, xK_2), copyNSwitch windows "terminal" ),

-         ((mod4Mask .|. shiftMask, xK_3), copyNSwitch windows "1" ),

-         ((mod4Mask .|. shiftMask, xK_4), copyNSwitch windows "2" ),

-         ((mod4Mask .|. shiftMask, xK_5), copyNSwitch windows "3" ),

-         ((mod4Mask .|. shiftMask, xK_6), copyNSwitch windows "4" ),

-         ((mod4Mask .|. shiftMask, xK_7), copyNSwitch windows "5" ),

-         ((mod4Mask .|. shiftMask, xK_8), copyNSwitch windows "6" ),

-         ((mod4Mask .|. shiftMask, xK_9), copyNSwitch windows "images" ),

          ((mod4Mask .|. shiftMask, xK_backslash), maximizeSwitch),

          ((mod4Mask .|. shiftMask, xK_BackSpace), removeWorkspace),

          ((mod4Mask .|. shiftMask, xK_grave), shiftNSwitch windows "IM" ),

@@ -337,15 +334,6 @@ main = do

          ((mod4Mask .|. shiftMask, xK_r), renameWorkspace defaultXPConfig),

          ((mod4Mask .|. shiftMask, xK_t), kill1),

          ((mod4Mask .|. shiftMask, xK_w), gridselectWorkspace defaultGSConfig (\ws -> greedyView ws . shift ws)),

-         ((mod4Mask, xK_1), switchWorkspace "web" ),

-         ((mod4Mask, xK_2), switchWorkspace "terminal" ),

-         ((mod4Mask, xK_3), switchWorkspace "1" ),

-         ((mod4Mask, xK_4), switchWorkspace "2" ),

-         ((mod4Mask, xK_5), switchWorkspace "3" ),

-         ((mod4Mask, xK_6), switchWorkspace "4" ),

-         ((mod4Mask, xK_7), switchWorkspace "5" ),

-         ((mod4Mask, xK_8), switchWorkspace "6" ),

-         ((mod4Mask, xK_9), switchWorkspace "images" ),

          --((mod4Mask, xK_apostrophe), scratchpadSpawnActionTerminal "gvim"),

          ((mod4Mask, xK_backslash), withFocused (sendMessage . maximizeRestore)),

          ((mod4Mask, xK_b), sendMessage ToggleStruts),

@@ -357,31 +345,26 @@ main = do

          ((mod4Mask, xK_KP_Multiply), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_queue_mpd"),

          ((mod4Mask, xK_KP_Subtract), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_queueplay_mpd"),

          ((mod4Mask, xK_p), spawnHere "/home/edwlan/bin/yeganesh_run -f"),

-         ((mod4Mask, xK_q), ((withSelectedWindow $ windows . W.focusWindow) defaultGSConfig) >> (windows $ W.shiftMaster)),

+         ((mod4Mask, xK_q), (withSelectedWindow $ windows . W.focusWindow) defaultGSConfig >> windows W.shiftMaster),

          ((mod4Mask, xK_semicolon), nchooseLayout defaultGSConfig),

-         ((mod4Mask, xK_w), gridselectWorkspace defaultGSConfig (\ws -> greedyView ws))

+         ((mod4Mask, xK_w), gridselectWorkspace defaultGSConfig greedyView),

+

+         ((mod4Mask, xK_Left), onPrevNeighbour W.view), 

+         ((mod4Mask, xK_Right), onNextNeighbour W.view)

+

       ]

-      ++ zip (zip (repeat (mod4Mask)) ([xK_0])) (map (withNthWorkspace greedyView) [0..])

-      ++ zip (zip (repeat (mod4Mask .|. shiftMask)) ([xK_0])) (map (withNthWorkspace copy) [0..]) 

-      ++ zip (zip (repeat (mod4Mask)) (map (numPadKeys !!) ([0]))) (map (withNthWorkspace greedyView) [0..])

       ++ [

          ((mod4Mask .|. mod1Mask, xK_1), namedScratchpadAction scratchpads "notes"),

          ((mod4Mask .|. mod1Mask, numPadKeys !! 1), namedScratchpadAction scratchpads "notes"),

          ((mod4Mask .|. mod1Mask, xK_2), namedScratchpadAction scratchpads "mutt"),

          ((mod4Mask .|. mod1Mask, numPadKeys !! 2), namedScratchpadAction scratchpads "mutt"),

-         ((mod4Mask .|. mod1Mask, xK_3), namedScratchpadAction scratchpads "irc"),

-         ((mod4Mask .|. mod1Mask, numPadKeys !! 3), namedScratchpadAction scratchpads "irc"),

+         --((mod4Mask .|. mod1Mask, xK_3), namedScratchpadAction scratchpads "irc"),

+         --((mod4Mask .|. mod1Mask, numPadKeys !! 3), namedScratchpadAction scratchpads "irc"),

          ((mod4Mask .|. mod1Mask, xK_4), namedScratchpadAction scratchpads "htop"),

          ((mod4Mask .|. mod1Mask, numPadKeys !! 4), namedScratchpadAction scratchpads "htop"),

          ((mod4Mask .|. mod1Mask, xK_5), namedScratchpadAction scratchpads "mpc"),

          ((mod4Mask .|. mod1Mask, numPadKeys !! 5), namedScratchpadAction scratchpads "mpc"),

          ((mod4Mask .|. mod1Mask, xK_6), namedScratchpadAction scratchpads "mcabber"),

          ((mod4Mask .|. mod1Mask, numPadKeys !! 6), namedScratchpadAction scratchpads "mcabber")

-      ]) 

+      ])

-numPadKeys :: [KeySym]

-numPadKeys = [xK_KP_Insert -- 0

-             , xK_KP_End,  xK_KP_Down,  xK_KP_Page_Down -- 1, 2, 3

-             , xK_KP_Left, xK_KP_Begin, xK_KP_Right     -- 4, 5, 6

-             , xK_KP_Home, xK_KP_Up,    xK_KP_Page_Up   -- 7, 8, 9

-             ]

@@ -1,56 +1,56 @@

+#zmodload zsh/zprof

+

+cat <<'EOP'

+             :

+    `.       ;        .'

+      `.  .-'''-.   .'

+        ;'  __   _;'

+       /   '_    _`\

+      |  _( a (  a  |

+ '''''| (_)    >    |``````

+       \    \    / /

+        `.   `--'.'

+       .' `-,,,-' `.

+     .'      :      `.  hjw

+             :

+EOP

+

 echo "begin zshrc"

-echo ".zshrc loaded for $USER on $TTY at `date`" | logger

+echo "shell session started for $USER on $TTY at `date`" | logger

 source $HOME/.localzshrc.sh

 autoload -U colors && colors

+autoload zsh/parameter

+

+# Experimenting with disabling oh-my-zsh

+#

+# # Path to your oh-my-zsh configuration.

+# #export ZSH=$HOME/.oh-my-zsh

+# #export MPD_HOST=srv2.elangley.org

+# #

+# #fpath=(~/.zsh.d/completion ~/.zsh.d/functions $fpath)

+# #plugins=(git rails osx brew zsh-syntax-highlighting python git-extra git-flow battery)

+# #

+# #source $ZSH/oh-my-zsh.sh

+# #unsetopt correct_all

+# #

+# #echo "done oh-my-zsh"

+# unalias sp

-# Path to your oh-my-zsh configuration.

-export ZSH=$HOME/.oh-my-zsh

-export MPD_HOST=srv2.elangley.org

-

-# Set name of the theme to load.

-# Look in ~/.oh-my-zsh/themes/

-# Optionally, if you set this to "random", it'll load a random theme each

-# time that oh-my-zsh is loaded.

-

-# Set to this to use case-sensitive completion

-# export CASE_SENSITIVE="true"

-

-# Comment this out to disable weekly auto-update checks

-# export DISABLE_AUTO_UPDATE="true"

-

-# Uncomment following line if you want to disable colors in ls

-# export DISABLE_LS_COLORS="true"

-

-# Uncomment following line if you want to disable autosetting terminal title.

-#export DISABLE_AUTO_TITLE="true"

-

-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)

-# Example format: plugins=(rails git textmate ruby lighthouse)

-fpath=(~/.zsh.d/completion ~/.zsh.d/functions $fpath)

-plugins=(git rails osx brew zsh-syntax-highlighting python git-extra git-flow battery)

-

-source $ZSH/oh-my-zsh.sh

-unsetopt correct_all

-

-echo "done oh-my-zsh"

-unalias sp

-

-# Customize to your needs...

 export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/usr/texbin:/usr/X11/bin:/opt/local/bin:/sbin/usr/sbin:$PATH

-#source /usr/local/Cellar/coreutils/8.12/aliases

-#unalias kill

 if [[ -e /etc/sysconfig/zsh-prompt-$TERM ]]; then

-  . /etc/sysconfig/zsh-prompt-$TERM 

+  . /etc/sysconfig/zsh-prompt-$TERM

 elif [[ -e $HOME/.zsh-prompt-$TERM ]]; then

   . $HOME/.zsh-prompt-$TERM

 fi

-if [ -x /opt/local/bin/fortune ]; then export FORTUNE=/opt/local/bin/fortune

-elif [ -x /usr/local/bin/fortune ]; then export FORTUNE=/usr/local/bin/fortune

-elif [ -x /usr/games/fortune ]; then export FORTUNE=/usr/games/fortune

-else export FORTUNE=/usr/bin/fortune

-fi

+for p in $PATH; do

+  _FORTUNE="$PATH/fortune"

+  if [[ -x "$_FORTUNE" ]]; then

+    FORTUNE="$_FORTUNE"

+    break

+  fi

+done

 if [ -x "$FORTUNE" ]; then

   $FORTUNE

@@ -63,9 +63,9 @@ function battery_charge() {

 autoload -Uz vcs_info

 zstyle ':vcs_info:*' actionformats \

-    '%F{5}%f%s%F{5}%F{3}-%F{5}%F{2}%b%F{3}|%F{1}%a%F{5}%f'

+    '%F{5}%f%s%F{5}%F{3}->%F{5}%F{2}%b%F{3}|%F{1}%a%F{5}%f'

 zstyle ':vcs_info:*' formats       \

-  '%F{5}%f%s%F{5}%F{3}-%F{5}%F{2}%b%F{5}%f'

+  '%F{5}%f%s%F{5}%F{3}->%F{5}%F{2}%b%F{5}%f'

 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'

 zstyle ':vcs_info:*' enable git cvs svn

@@ -80,7 +80,7 @@ vcs_info_wrapper() {

 export PYTHONSTARTUP=$HOME/Library/Python/2.7/site-packages/sitecustomize.py

 setopt promptsubst

 PROMPT='---

-(%?) %m:%n--%l ${PWD/$HOME/~} `vcs_info_wrapper` `battery_charge` 

+(%?) %m:%n--%l ${PWD/$HOME/~} `vcs_info_wrapper` `battery_charge`