diff --git a/commonsh/02_term b/commonsh/02_term index 500ba13..91dd4ff 100755 --- a/commonsh/02_term +++ b/commonsh/02_term @@ -66,6 +66,10 @@ if command -v infocmp >/dev/null 2>&1 ; then ;; esac + if [ "${COLORTERM}" = "gnome-terminal" ]; then + TERM="xterm-256color" + fi + TERM=`fix_term $TERM` # I am sorry to hear that you are running an @@ -81,5 +85,24 @@ if command -v infocmp >/dev/null 2>&1 ; then *256*) alias screen="screen -T `fix_term xterm-256color`" ;; + linux) + # Tango palette for framebuffers + printf "\033]P02e3436" #black + printf "\033]P8555753" #darkgray + printf "\033]P1cc0000" #darkred + printf "\033]P9ef2929" #red + printf "\033]P24e9a06" #darkgreen + printf "\033]PA8ae234" #green + printf "\033]P3c4a000" #brown + printf "\033]PBfce94f" #yellow + printf "\033]P43465a4" #darkblue + printf "\033]PC729fcf" #blue + printf "\033]P575507b" #darkmagenta + printf "\033]PDad7fa8" #magenta + printf "\033]P606989a" #darkcyan + printf "\033]PE34e2e2" #cyan + printf "\033]P7ffffff" #lightgray + printf "\033]PFeeeeec" #white + ;; esac fi diff --git a/git-info b/git-info index 512d641..e69327a 100755 --- a/git-info +++ b/git-info @@ -9,7 +9,9 @@ if [ $? -ne 0 ] ; then fi # Show various information about this git directory -echo "== Remote URL: `git remote -v`" +echo "== Remote URL: " +git remote -v +echo echo "== Remote Branches: " git branch -r diff --git a/vim/syntax/llvm.vim b/vim/syntax/llvm.vim new file mode 100644 index 0000000..5d9f789 --- /dev/null +++ b/vim/syntax/llvm.vim @@ -0,0 +1,111 @@ +" Vim syntax file +" Language: llvm +" Maintainer: The LLVM team, http://llvm.org/ +" Version: $Revision: 97271 $ + +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +syn case match + +" Types. +" Types also include struct, array, vector, etc. but these don't +" benefit as much from having dedicated highlighting rules. +syn keyword llvmType void float double +syn keyword llvmType x86_fp80 fp128 ppc_fp128 +syn keyword llvmType type label opaque +syn match llvmType /\/ + +" Instructions. +" The true and false tokens can be used for comparison opcodes, but it's +" much more common for these tokens to be used for boolean constants. +syn keyword llvmStatement add fadd sub fsub mul fmul +syn keyword llvmStatement sdiv udiv fdiv srem urem frem +syn keyword llvmStatement and or xor +syn keyword llvmStatement icmp fcmp +syn keyword llvmStatement eq ne ugt uge ult ule sgt sge slt sle +syn keyword llvmStatement oeq ogt oge olt ole one ord ueq ugt uge +syn keyword llvmStatement ult ule une uno +syn keyword llvmStatement nuw nsw exact inbounds +syn keyword llvmStatement phi call select shl lshr ashr va_arg +syn keyword llvmStatement trunc zext sext +syn keyword llvmStatement fptrunc fpext fptoui fptosi uitofp sitofp +syn keyword llvmStatement ptrtoint inttoptr bitcast +syn keyword llvmStatement ret br indirectbr switch invoke unwind unreachable +syn keyword llvmStatement malloc alloca free load store getelementptr +syn keyword llvmStatement extractelement insertelement shufflevector +syn keyword llvmStatement extractvalue insertvalue + +" Keywords. +syn keyword llvmKeyword define declare global constant +syn keyword llvmKeyword internal external private +syn keyword llvmKeyword linkonce linkonce_odr weak weak_odr appending +syn keyword llvmKeyword common extern_weak +syn keyword llvmKeyword thread_local dllimport dllexport +syn keyword llvmKeyword hidden protected default +syn keyword llvmKeyword except deplibs +syn keyword llvmKeyword volatile fastcc coldcc cc ccc +syn keyword llvmKeyword x86_stdcallcc x86_fastcallcc +syn keyword llvmKeyword signext zeroext inreg sret nounwind noreturn +syn keyword llvmKeyword nocapture byval nest readnone readonly noalias +syn keyword llvmKeyword inlinehint noinline alwaysinline optsize ssp sspreq +syn keyword llvmKeyword noredzone noimplicitfloat naked alignstack +syn keyword llvmKeyword module asm align tail to +syn keyword llvmKeyword addrspace section alias sideeffect c gc +syn keyword llvmKeyword target datalayout triple +syn keyword llvmKeyword blockaddress +syn keyword llvmKeyword union + +" Obsolete keywords. +syn keyword llvmError uninitialized implementation +syn keyword llvmError getresult big little endian begin end + +" Misc syntax. +syn match llvmIgnore /[%@]\d\+\>/ +syn match llvmNumber /-\?\<\d\+\>/ +syn match llvmFloat /-\?\<\d\+\.\d*\(e[+-]\d\+\)\?\>/ +syn match llvmFloat /\<0x\x\+\>/ +syn keyword llvmBoolean true false +syn keyword llvmConstant zeroinitializer undef null +syn match llvmComment /;.*$/ +syn region llvmString start=/"/ skip=/\\"/ end=/"/ +syn match llvmLabel /[-a-zA-Z$._][-a-zA-Z$._0-9]*:/ +syn match llvmIdentifier /[%@][-a-zA-Z$._0-9][-a-zA-Z$._0-9]*/ + +" Syntax-highlight dejagnu test commands. +syn match llvmSpecialComment /;\s*RUN:.*$/ +syn match llvmSpecialComment /;\s*PR\d*\s*$/ +syn match llvmSpecialComment /;\s*END\.\s*$/ +syn match llvmSpecialComment /;\s*XFAIL:.*$/ +syn match llvmSpecialComment /;\s*XTARGET:.*$/ + +if version >= 508 || !exists("did_c_syn_inits") + if version < 508 + let did_c_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink llvmType Type + HiLink llvmStatement Statement + HiLink llvmNumber Number + HiLink llvmComment Comment + HiLink llvmString String + HiLink llvmLabel Label + HiLink llvmKeyword Keyword + HiLink llvmBoolean Boolean + HiLink llvmFloat Float + HiLink llvmIgnore Ignore + HiLink llvmConstant Constant + HiLink llvmSpecialComment SpecialComment + HiLink llvmError Error + HiLink llvmIdentifier Identifier + + delcommand HiLink +endif + +let b:current_syntax = "llvm" diff --git a/xmonad.hs b/xmonad.hs index 1a7d0eb..acb8e1e 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -42,7 +42,7 @@ myLayoutHook = tiled ||| Mirror tiled ||| Grid ||| simpleTabbed main = do xmproc <- spawnPipe "~/bin/xmobar" - xmonad $ defaultConfig + xmonad $ withUrgencyHook NoUrgencyHook defaultConfig { manageHook = manageDocks <+> myFloatHook <+> manageHook defaultConfig <+> scratchpadManageHook (W.RationalRect 0.25 0.25 0.5 0.5) , layoutHook = avoidStruts $ smartBorders $ myLayoutHook , logHook = dynamicLogWithPP $ xmobarPP diff --git a/zsh/prompt b/zsh/prompt index 9308541..cf819e9 100755 --- a/zsh/prompt +++ b/zsh/prompt @@ -18,7 +18,11 @@ case "${TERM}" in BOLDERRORCOLOR=$'%{\e[01;38;5;9m%}' CLOCKCOLOR=$'%{\e[01;38;5;221m%}' JOBCOLOR=$'%{\e[38;5;30m%}' - BLACKCOLOR=$'%{\e[00;30m%}' + if [ "${TERM_PROGRAM}" = "Apple_Terminal" ] ; then + BLACKCOLOR=$'%{\e[00;30m%}' + else + BLACKCOLOR=$'%{\e[38;5;232m%}' + fi ;; dumb) ;;