5233df61134b

More
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Tue, 17 Sep 2019 11:33:35 -0400
parents e5fe3d20c01c
children b6c6f989dbc3
branches/tags (none)
files bin/rlwrap-lisp fish/config.fish fish/functions/ep.fish stumpwmrc vim/syntax/lisp.vim

Changes

--- a/bin/rlwrap-lisp	Thu Sep 12 15:57:13 2019 -0400
+++ b/bin/rlwrap-lisp	Tue Sep 17 11:33:35 2019 -0400
@@ -7,5 +7,5 @@
        -p'1;36' \
        --quote-characters '"' \
        --histsize 1000 \
-       --history-filename "$HOME/.rlwrap-lisp-history" \
+       --history-filename "$HOME/.rlwrap/lisp_history" \
        "$@"
--- a/fish/config.fish	Thu Sep 12 15:57:13 2019 -0400
+++ b/fish/config.fish	Tue Sep 17 11:33:35 2019 -0400
@@ -69,6 +69,7 @@
 # Environment variables {{{
 
 set -g -x NIX_LINK "$HOME/.nix-profile"
+set -g -x RLWRAP_HOME "$HOME/.rlwrap"
 
 function prepend_to_path -d "Prepend the given dir to PATH if it exists and is not already in it"
     if test -d $argv[1]
--- a/fish/functions/ep.fish	Thu Sep 12 15:57:13 2019 -0400
+++ b/fish/functions/ep.fish	Tue Sep 17 11:33:35 2019 -0400
@@ -1,17 +1,19 @@
 function ep -d "Edit .plan"
+    cd ~/plan
     switch (hostname)
     case alephnull
-        cd ~/.plan
         nvim README.markdown
         make
+        cat README.markdown | sed -En 'H; /^## [0-9]{4}-[0-9]{2}-[0-9]{2}/h; ${g;p;}' | tail +3 > ~/.plan
         git cm 'Update' -a
         git push origin master
-        cd -
     case '*'
-        hg -R ~/.plan pull -u
-        nvim ~/.plan/README.markdown
-        hg -R ~/.plan ci -m 'Update'
-        hg -R ~/.plan push
-        hg -R ~/.plan push git
+        hg pull -u
+        nvim README.markdown
+        cat README.markdown | sed -En 'H; /^## [0-9]{4}-[0-9]{2}-[0-9]{2}/h; ${g;p;}' | tail +3 > ~/.plan
+        hg ci -m 'Update'
+        hg push
+        hg push git
     end
+    cd -
 end
--- a/stumpwmrc	Thu Sep 12 15:57:13 2019 -0400
+++ b/stumpwmrc	Tue Sep 17 11:33:35 2019 -0400
@@ -7,6 +7,7 @@
 ;;;; Config -------------------------------------------------------------------
 (set-prefix-key (kbd "C-space"))
 
+
 (redirect-all-output (data-dir-file "debug" "text"))
 
 (setf *mouse-focus-policy* :click
@@ -286,20 +287,24 @@
           (next-group))))))
 
 (defcommand screen-laptop () ()
+  (only)
   (loop with laptop = "eDP1"
         with extern = "DP1"
         for (output commands) in `((,laptop ("--auto"))
                                    (,laptop ("--primary"))
                                    (,extern ("--off")))
-        do (uiop:run-program `("xrandr" "--output" ,output ,@commands))))
+        do (progn (uiop:run-program `("xrandr" "--output" ,output ,@commands))
+                  (sleep 1))))
 
 (defcommand screen-external () ()
+  (only)
   (loop with laptop = "eDP1"
         with extern = "DP1"
         for (output commands) in `((,extern ("--auto"))
                                    (,extern ("--primary"))
                                    (,laptop ("--off")))
-        do (uiop:run-program `("xrandr" "--output" ,output ,@commands))))
+        do (progn (uiop:run-program `("xrandr" "--output" ,output ,@commands))
+                  (sleep 1))))
 
 (defcommand vlime () ()
   (load "~/src/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp")
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/syntax/lisp.vim	Tue Sep 17 11:33:35 2019 -0400
@@ -0,0 +1,155 @@
+" This is a copy of the built-in Lisp syntax highlighting with a bunch of stuff
+" I don't want stripped out (for speed) and some extra stuff added in (e.g.
+" format directives).
+
+" Load Once: {{{1
+if exists("b:current_syntax")
+ finish
+endif
+
+if exists("g:lisp_isk")
+ exe "setl isk=".g:lisp_isk
+elseif (v:version == 704 && has("patch-7.4.1142")) || v:version > 704
+ syn iskeyword 38,42,43,45,47-58,60-62,64-90,97-122,_
+else
+ setl isk=38,42,43,45,47-58,60-62,64-90,97-122,_
+endif
+
+if exists("g:lispsyntax_ignorecase") || exists("g:lispsyntax_clisp")
+ set ignorecase
+endif
+
+" Clusters: {{{1
+syn cluster			lispAtomCluster		contains=lispAtomBarSymbol,lispAtomList,lispAtomNmbr0,lispComment,lispLeadWhite
+syn cluster			lispBaseListCluster	contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispList,lispNumber,lispEscapeSpecial,lispSymbol,lispLeadWhite
+if exists("g:lisp_instring")
+ syn cluster			lispListCluster		contains=@lispBaseListCluster,lispString,lispInString,lispInStringString
+else
+ syn cluster			lispListCluster		contains=@lispBaseListCluster,lispString
+endif
+
+syn case ignore
+
+" Lists: {{{1
+syn match lispSymbol	contained	![^()'`,"; \t]\+!
+syn match lispBarSymbol	contained	!|..\{-}|!
+if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+ syn region lispParen0           matchgroup=hlLevel0 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen1
+ syn region lispParen1 contained matchgroup=hlLevel1 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen2
+ syn region lispParen2 contained matchgroup=hlLevel2 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen3
+ syn region lispParen3 contained matchgroup=hlLevel3 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen4
+ syn region lispParen4 contained matchgroup=hlLevel4 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen5
+ syn region lispParen5 contained matchgroup=hlLevel5 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen6
+ syn region lispParen6 contained matchgroup=hlLevel6 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen7
+ syn region lispParen7 contained matchgroup=hlLevel7 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen8
+ syn region lispParen8 contained matchgroup=hlLevel8 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen9
+ syn region lispParen9 contained matchgroup=hlLevel9 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen0
+else
+ syn region lispList			matchgroup=lispParen start="("   skip="|.\{-}|"			matchgroup=lispParen end=")"	contains=@lispListCluster
+ syn region lispBQList			matchgroup=PreProc   start="`("  skip="|.\{-}|"			matchgroup=PreProc   end=")"		contains=@lispListCluster
+endif
+
+" Atoms: {{{1
+syn match lispAtomMark			"'"
+syn match lispAtom			"'("me=e-1			contains=lispAtomMark	nextgroup=lispAtomList
+syn match lispAtom			"'[^ \t()]\+"			contains=lispAtomMark
+syn match lispAtomBarSymbol		!'|..\{-}|!			contains=lispAtomMark
+syn region lispAtom			start=+'"+			skip=+\\"+ end=+"+
+syn region lispAtomList			contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispEscapeSpecial
+syn match lispAtomNmbr			contained			"\<\d\+"
+syn match lispLeadWhite			contained			"^\s\+"
+
+" Strings: {{{1
+
+"                                              start  prefixparameters   modifiers      directive
+syn match lispStringFormatDirective contained /\v[~](([-+]?[0-9]*|'.),?)*(:\@|\@:|:|\@)?./
+
+syn region			lispString			start=+"+ skip=+\\\\\|\\"+ end=+"+	contains=lispStringFormatDirective,@Spell
+
+if exists("g:lisp_instring")
+ syn region			lispInString			keepend matchgroup=Delimiter start=+"(+rs=s+1 skip=+|.\{-}|+ matchgroup=Delimiter end=+)"+ contains=@lispBaseListCluster,lispInStringString
+ syn region			lispInStringString		start=+\\"+ skip=+\\\\+ end=+\\"+ contained
+endif
+
+" Numbers: supporting integers and floating point numbers {{{1
+syn match lispNumber		"-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\([dDeEfFlL][-+]\=\d\+\)\="
+syn match lispNumber		"-\=\(\d\+/\d\+\)"
+
+syn match lispEscapeSpecial		"\*\w[a-z_0-9-]*\*"
+syn match lispEscapeSpecial		!#|[^()'`,"; \t]\+|#!
+syn match lispEscapeSpecial		!#x\x\+!
+syn match lispEscapeSpecial		!#o\o\+!
+syn match lispEscapeSpecial		!#b[01]\+!
+syn match lispEscapeSpecial		!#\\[ -}\~]!
+syn match lispEscapeSpecial		!#[':][^()'`,"; \t]\+!
+syn match lispEscapeSpecial		!#([^()'`,"; \t]\+)!
+syn match lispEscapeSpecial		!#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)!
+syn match lispEscapeSpecial		"\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>"
+
+syn match lispConcat		"\s\.\s"
+syn match lispParenError	")"
+
+" Comments: {{{1
+syn cluster lispCommentGroup	contains=lispTodo,@Spell
+syn match   lispComment		";.*$"				contains=@lispCommentGroup
+syn region  lispCommentRegion	start="#|" end="|#"		contains=lispCommentRegion,@lispCommentGroup
+syn keyword lispTodo		contained			combak			combak:			todo			todo:
+
+" Synchronization: {{{1
+syn sync lines=100
+
+" Define Highlighting: {{{1
+if !exists("skip_lisp_syntax_inits")
+
+  hi def link lispCommentRegion		lispComment
+  hi def link lispAtomNmbr		lispNumber
+  hi def link lispAtomMark		lispMark
+  hi def link lispInStringString	lispString
+  hi def link lispStringFormatDirective	SpecialChar
+
+  hi def link lispAtom			Identifier
+  hi def link lispAtomBarSymbol		Special
+  hi def link lispBarSymbol		Special
+  hi def link lispComment		Comment
+  hi def link lispConcat		Statement
+  hi def link lispMark			Delimiter
+  hi def link lispNumber		Number
+  hi def link lispParenError		Error
+  hi def link lispEscapeSpecial		Type
+  hi def link lispString		String
+  hi def link lispTodo			Todo
+  hi def link lispVar			Statement
+
+  if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+   if &bg == "dark"
+    hi def hlLevel0 ctermfg=red		guifg=red1
+    hi def hlLevel1 ctermfg=yellow	guifg=orange1
+    hi def hlLevel2 ctermfg=green	guifg=yellow1
+    hi def hlLevel3 ctermfg=cyan	guifg=greenyellow
+    hi def hlLevel4 ctermfg=magenta	guifg=green1
+    hi def hlLevel5 ctermfg=red		guifg=springgreen1
+    hi def hlLevel6 ctermfg=yellow	guifg=cyan1
+    hi def hlLevel7 ctermfg=green	guifg=slateblue1
+    hi def hlLevel8 ctermfg=cyan	guifg=magenta1
+    hi def hlLevel9 ctermfg=magenta	guifg=purple1
+   else
+    hi def hlLevel0 ctermfg=red		guifg=red3
+    hi def hlLevel1 ctermfg=darkyellow	guifg=orangered3
+    hi def hlLevel2 ctermfg=darkgreen	guifg=orange2
+    hi def hlLevel3 ctermfg=blue	guifg=yellow3
+    hi def hlLevel4 ctermfg=darkmagenta	guifg=olivedrab4
+    hi def hlLevel5 ctermfg=red		guifg=green4
+    hi def hlLevel6 ctermfg=darkyellow	guifg=paleturquoise3
+    hi def hlLevel7 ctermfg=darkgreen	guifg=deepskyblue4
+    hi def hlLevel8 ctermfg=blue	guifg=darkslateblue
+    hi def hlLevel9 ctermfg=darkmagenta	guifg=darkviolet
+   endif
+  else
+    hi def link lispParen Delimiter
+  endif
+
+endif
+
+let b:current_syntax = "lisp"
+
+" vim: ts=8 nowrap fdm=marker