firefly avatar firefly committed 9896e6e

Updated vimrc statusline & styled tmux a bit

Comments (0)

Files changed (4)

config/awesome/rc.lua

                                           end, mytasklist.buttons)
 
     -- padding
-    local pw      = 15
+    local pw = 15
 
     local padders = {}
     local function pad(width)
-##-- Keybindings ----------------------------------------------------
+#--- Misc -----------------------------------------------------------
+set-option -g default-terminal "screen-256color"
+
+
+#--- Keybindings ----------------------------------------------------
 bind-key h  select-pane -L
 bind-key j  select-pane -D
 bind-key k  select-pane -U
 bind-key -r L resize-pane -R 5
 
 
-##-- Colours --------------------------------------------------------
-set message-fg     colour248
-set message-bg     colour235
-set pane-border-fg colour242
-set status-bg      colour233
-set status-left-fg red
-set status-left-bg colour235
-
-
-##-- Misc -----------------------------------------------------------
-set-option -g default-terminal "screen-256color"
+#--- Colours --------------------------------------------------------
+set pane-border-fg  colour242
+set message-fg      colour248
+set message-bg      colour235
+set status-bg       colour233
+set status-left-fg  red
+set status-left-bg  colour235

vim/syntax/logic.vim

 
-syn match  logicAnd        "\*"   conceal cchar=∧
-syn match  logicOr         "+"    conceal cchar=∨
-syn match  logicNot        "\~"   conceal cchar=¬
-syn match  logicImplies    "->"   conceal cchar=→
-syn match  logicEquivalent "<->"  conceal cchar=↔
-syn match  logicTurnstile  "|-"   conceal cchar=⊢
-syn match  logicBottom     "_|_"  conceal cchar=⊥
+syn match  logicAnd          "\*"   conceal cchar=∧
+syn match  logicOr           "+"    conceal cchar=∨
+syn match  logicNot          "\~"   conceal cchar=¬
+syn match  logicImplies      "->"   conceal cchar=→
+syn match  logicEquivalent   "<->"  conceal cchar=↔
+syn match  logicTurnstile    "|-"   conceal cchar=⊢
+syn match  logicDblTurnstile "|="   conceal cchar=⊨
+syn match  logicBottom       "_|_"  conceal cchar=⊥
 
 syn match  logicDeductionSeparator  "^-\+$" contains=logicDeductionSeparatorChar
 syn match  logicDeductionSeparatorChar "-"  contained conceal cchar=─
 syn match  logicSubscript  "_8"   conceal cchar=₈
 syn match  logicSubscript  "_9"   conceal cchar=₉
 
+syn match  logicSubscript  "_a"   conceal cchar=ₐ
+syn match  logicSubscript  "_e"   conceal cchar=ₑ
+syn match  logicSubscript  "_o"   conceal cchar=ₒ
+syn match  logicSubscript  "_x"   conceal cchar=ₓ
+syn match  logicSubscript  "_h"   conceal cchar=ₕ
+syn match  logicSubscript  "_k"   conceal cchar=ₖ
+syn match  logicSubscript  "_l"   conceal cchar=ₗ
+syn match  logicSubscript  "_m"   conceal cchar=ₘ
+syn match  logicSubscript  "_n"   conceal cchar=ₙ
+syn match  logicSubscript  "_p"   conceal cchar=ₚ
+syn match  logicSubscript  "_s"   conceal cchar=ₛ
+syn match  logicSubscript  "_t"   conceal cchar=ₜ
+
 syn cluster logicExpression
-\ contains=logicAnd,logicOr,logicNot,logicImplies,logicEquivalent,logicTurnstile,logicSubscript
+\ contains=logicAnd,logicOr,logicNot,logicImplies,logicEquivalent,logicTurnstile,logicDblTurnstile,logicSubscript
 
 syn region  logicHeading  start="^\s*#\+" end="#*\s*$"  oneline contains=@logicExpression
 
 
 set incsearch
 set spelllang=sv
+set hidden                      " Abandoning a buffer makes it hidden instead of
+                                " unloading it, thus preserving changes/stuff.
 
-set showcmd                     " show keys pressed in normal mode in last line
-set splitright                  " vsplit splits to right
+set showcmd                     " Show keys pressed in normal mode in last line
+set splitright                  " :vsplit splits to right
 
 " Use persistent undo if available
 if version >= 703
 set formatoptions+=j            " Remove comment leaders when joining
 
 " Use pretty characters for vim's rendering of things.
+" (fillchar/stlnc doesn't support multibyte chars.. :<)
 set list listchars=tab:»\ ,trail:·,nbsp:␣,extends:$,precedes:^
-set fillchars=vert:│"╎║┃
+set fillchars=vert:│",stlnc:─╎║┃
 
 set foldmethod=marker
 
 "end
 
 "color Tomorrow-Night-Bright-ff
-let g:jellybeans_background_color_256="NONE"
+let g:jellybeans_background_color_256="16"
 let g:jellybeans_overrides =
-\     { 'CursorLine'   : { '256ctermbg' : '234'  }
+\     { 'CursorLine'   : { '256ctermbg' : '233'  }
 \     , 'StatusLine'   : {
 \                          '256ctermfg' : '3'
-\                        , '256ctermbg' : '233'  }
+\                        , '256ctermbg' : '236'  }
 \     , 'StatusLineNC' : { '256ctermfg' : '242'
-\                        , '256ctermbg' : '233'  }
+\                        , '256ctermbg' : '234'  }
 \     , 'ColorColumn'  : { '256ctermbg' : '233'  }
 \     , 'LineNr'       : { '256ctermfg' : '238'  }
 \     , 'CursorLineNr' : { '256ctermfg' : '3'
 "set laststatus=1                " Only display status line if >1 window
 set laststatus=2                " Never mind.  Always display status line.
 
-hi User1 ctermfg=3 ctermbg=235
-hi User2 ctermfg=3
-
 set statusline=
+set statusline+=%*              " --> highlight
 set statusline+=%<              " truncation location marker
-set statusline+=%1*             " --> gray bg
-set statusline+=\ %f\           " space, filename, space
-set statusline+=%*              " <-- regular bg
+set statusline+=\ %t\           " space, filename (tail), space
+set statusline+=%#StatusLineNC# " <-- NC styling
 set statusline+=%y%m%r          " space, info (filetype, edited?, readonly?)
 set statusline+=%=              " spacer <==>
 set statusline+=[%2n]\          " 2-char bufno, space
 set statusline+=%-8.(%l,%c%V%)  " group of line# & col#
+set statusline+=\ %*            " --> highlight again (with space)
 set statusline+=\ %P            " space, percentage in file
 
 " Make the ruler also display the bufno
 " nnoremap S diw"0P
 
 
+nnoremap <Leader>, :source %<CR>
+
 """ temp
 "if !exists("*JumpToNotesWindow")
 "  fun JumpToNotesWindow()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.