From e8abe7865035bf131e682150d904f440d0690041 Mon Sep 17 00:00:00 2001 From: ds6 Date: Tue, 9 Jan 2018 09:13:16 -0600 Subject: [PATCH] vim packages, Xft, urxvt perl, root console, zshrc vim packages have been added as submodules todo.txt deleted from .vim root and added as package square cursor, and Xft and other font changes in Xresources URxvtRoot has been re-enabled as URxvtBG, style finalized zshrc organization and git vcs/alias changes --- .gitmodules | 15 ++ base/.Xresources | 153 ++++++++++-------- base/.vim/autoload/todo/txt.vim | 123 -------------- base/.vim/doc/tags | 10 -- base/.vim/doc/todo.txt | 68 -------- base/.vim/ftdetect/todo.vim | 12 -- base/.vim/ftplugin/todo.vim | 90 ----------- .../pack/commentary.vim/start/vim-commentary | 1 + base/.vim/pack/repeat.vim/start/vim-repeat | 1 + .../speeddating.vim/start/vim-speeddating | 1 + .../.vim/pack/surround.vim/start/vim-surround | 1 + base/.vim/pack/todo.txt/start/todo.txt-vim | 1 + .../python/dateregex/dateregex/__init__.py | 11 -- .../python/dateregex/dateregex/after.py | 95 ----------- .../python/dateregex/dateregex/before.py | 79 --------- base/.vim/syntax/python/todo.py | 31 ---- base/.vim/syntax/todo.vim | 67 -------- base/.xinitrc | 4 +- base/.zshrc | 92 +++++------ 19 files changed, 154 insertions(+), 701 deletions(-) create mode 100644 .gitmodules delete mode 100644 base/.vim/autoload/todo/txt.vim delete mode 100644 base/.vim/doc/tags delete mode 100644 base/.vim/doc/todo.txt delete mode 100644 base/.vim/ftdetect/todo.vim delete mode 100644 base/.vim/ftplugin/todo.vim create mode 160000 base/.vim/pack/commentary.vim/start/vim-commentary create mode 160000 base/.vim/pack/repeat.vim/start/vim-repeat create mode 160000 base/.vim/pack/speeddating.vim/start/vim-speeddating create mode 160000 base/.vim/pack/surround.vim/start/vim-surround create mode 160000 base/.vim/pack/todo.txt/start/todo.txt-vim delete mode 100644 base/.vim/syntax/python/dateregex/dateregex/__init__.py delete mode 100644 base/.vim/syntax/python/dateregex/dateregex/after.py delete mode 100644 base/.vim/syntax/python/dateregex/dateregex/before.py delete mode 100644 base/.vim/syntax/python/todo.py delete mode 100644 base/.vim/syntax/todo.vim diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bc2ddca --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "base/.vim/pack/todo.txt/start/todo.txt-vim"] + path = base/.vim/pack/todo.txt/start/todo.txt-vim + url = https://github.com/freitass/todo.txt-vim +[submodule "base/.vim/pack/surround.vim/start/vim-surround"] + path = base/.vim/pack/surround.vim/start/vim-surround + url = https://github.com/tpope/vim-surround +[submodule "base/.vim/pack/commentary.vim/start/vim-commentary"] + path = base/.vim/pack/commentary.vim/start/vim-commentary + url = https://github.com/tpope/vim-commentary +[submodule "base/.vim/pack/speeddating.vim/start/vim-speeddating"] + path = base/.vim/pack/speeddating.vim/start/vim-speeddating + url = https://github.com/tpope/vim-speeddating +[submodule "base/.vim/pack/repeat.vim/start/vim-repeat"] + path = base/.vim/pack/repeat.vim/start/vim-repeat + url = https://github.com/tpope/vim-repeat diff --git a/base/.Xresources b/base/.Xresources index e418ba9..c72d6f3 100644 --- a/base/.Xresources +++ b/base/.Xresources @@ -1,94 +1,111 @@ -! generic settings +! fonts !xft:Dina:size=8 -*font: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-* +*font: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-* +*faceName: Dina +*faceSize: 8 +Xft.antialias: true +Xft.dpi: 96 +Xft.hinting: true +Xft.hintstyle: hintslight +Xft.rgba: none ! Solarized colors, http://ethanschoonover.com/solarized -!#define S_base03 #002b36 -#define S_base03 #000a0d -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 -*background: S_base03 -*foreground: S_base0 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 +!#define S_base03 #002b36 +#define S_base03 #000a0d +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 +*background: S_base03 +*foreground: S_base0 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground: S_base01 +*pointerColorForeground: S_base1 -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -!#define S_green #859900 -#define S_green #85c000 +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +!#define S_green #859900 +#define S_green #85c000 ! black dark/light -*color0: S_base02 -*color8: S_base03 +*color0: S_base02 +*color8: S_base03 ! red dark/light -*color1: S_red -*color9: S_orange +*color1: S_red +*color9: S_orange ! green dark/light -*color2: S_green -*color10: S_base01 +*color2: S_green +*color10: S_base01 ! yellow dark/light -*color3: S_yellow -*color11: S_base00 +*color3: S_yellow +*color11: S_base00 ! blue dark/light -*color4: S_blue -*color12: S_base0 +*color4: S_blue +*color12: S_base0 ! magenta dark/light -*color5: S_magenta -*color13: S_violet +*color5: S_magenta +*color13: S_violet ! cyan dark/light -*color6: S_cyan -*color14: S_base1 +*color6: S_cyan +*color14: S_base1 ! white dark/light -*color7: S_base2 -*color15: S_base3 +*color7: S_base2 +*color15: S_base3 ! underline -*underlineColor: S_yellow +*underlineColor: S_yellow ! URxvt -URxvt.termName: rxvt-256color -URxvt.perl-ext: +URxvt.termName: rxvt-256color +URxvt.perl-ext: matcher URxvt.perl-ext-common: -URxvt.cursorBlink: on -URxvt.scrollstyle: plain -URxvt.scrollBar_right: true -URxvt.urgentOnBell: true -URxvt.visualBell: true +URxvt.depth: 32 +URxvt.background: rgba:0000/0a00/0d00/d000 +URxvt.internalBorder: 1 +URxvt.dynamicColors: true +URxvt.intensityStyles: false +URxvt.cursorBlink: on +URxvt.scrollstyle: plain +URxvt.scrollBar_right: true +URxvt.urgentOnBell: true +URxvt.visualBell: true -URxvt.depth: 32 -URxvt.background: rgba:0000/0a00/0d00/d000 -URxvt.dynamicColors: true -URxvt.intensityStyles: false +URxvt.url-launcher: /usr/local/bin/xdg-open +URxvt.matcher.button: 1 +URxvt.matcher.rend.0: Uline Bold fg6 +URxvt.matcher.pattern.0: \\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-] +URxvt.matcher.pattern.1: \\B(/\\S+?):(\\d+)(?=:|$) +URxvt.matcher.launcher.1: vim +$2 $1 +URxvt.keysym.M-o: matcher:last +URxvt.keysym.M-u: matcher:list -URxvt.print-pipe: cat > "$HOME/urxvt-$(date +'%Y-%m-%d-%H%M%S')" +URxvt.print-pipe: cat > "$HOME/urxvt-$(date +'%Y-%m-%d-%H%M%S')" ! bg terminal -URxvtRoot.termName: rxvt-256color -URxvtRoot.perl-ext: -URxvtRoot.perl-ext-common: +URxvtBG.termName: rxvt-256color +URxvtBG.perl-ext: +URxvtBG.perl-ext-common: -URxvtRoot.scrollBar: false -URxvtRoot.visualBell: true +URxvtBG.scrollBar: false +URxvtBG.cursorUnderline: true +URxvtBG.visualBell: true -URxvtRoot.depth: 32 -URxvtRoot.borderLess: true -URxvtRoot.transparent: true -URxvtRoot.shading: 80 +URxvtBG.depth: 32 +URxvtBG.borderLess: true +URxvtBG.transparent: true +URxvtBG.shading: 80 ! xvkbd -xvkbd.Alt_R.width: 1 -xvkbd.Meta_R.width: 1 -xvkbd.Multi_key.width: 1 -xvkbd.Shift_R.width: 75 +xvkbd.Alt_R.width: 1 +xvkbd.Meta_R.width: 1 +xvkbd.Multi_key.width: 1 +xvkbd.Shift_R.width: 75 diff --git a/base/.vim/autoload/todo/txt.vim b/base/.vim/autoload/todo/txt.vim deleted file mode 100644 index c5158f0..0000000 --- a/base/.vim/autoload/todo/txt.vim +++ /dev/null @@ -1,123 +0,0 @@ -" File: todo.txt.vim -" Description: Todo.txt filetype detection -" Author: Leandro Freitas -" License: Vim license -" Website: http://github.com/freitass/todo.txt-vim -" Version: 0.4 - -" Export Context Dictionary for unit testing {{{1 -function! s:get_SID() - return matchstr(expand(''), '\d\+_') -endfunction -let s:SID = s:get_SID() -delfunction s:get_SID - -function! todo#txt#__context__() - return { 'sid': s:SID, 'scope': s: } -endfunction - -" Functions {{{1 -function! s:remove_priority() - :s/^(\w)\s\+//ge -endfunction - -function! s:get_current_date() - return strftime('%Y-%m-%d') -endfunction - -function! todo#txt#prepend_date() - execute 'normal! I' . s:get_current_date() . ' ' -endfunction - -function! todo#txt#replace_date() - let current_line = getline('.') - if (current_line =~ '^\(([a-zA-Z]) \)\?\d\{2,4\}-\d\{2\}-\d\{2\} ') && - \ exists('g:todo_existing_date') && g:todo_existing_date == 'n' - return - endif - execute 's/^\(([a-zA-Z]) \)\?\(\d\{2,4\}-\d\{2\}-\d\{2\} \)\?/\1' . s:get_current_date() . ' /' -endfunction - -function! todo#txt#mark_as_done() - call s:remove_priority() - call todo#txt#prepend_date() - execute 'normal! Ix ' -endfunction - -function! todo#txt#mark_all_as_done() - :g!/^x /:call todo#txt#mark_as_done() -endfunction - -function! s:append_to_file(file, lines) - let l:lines = [] - - " Place existing tasks in done.txt at the beggining of the list. - if filereadable(a:file) - call extend(l:lines, readfile(a:file)) - endif - - " Append new completed tasks to the list. - call extend(l:lines, a:lines) - - " Write to file. - call writefile(l:lines, a:file) -endfunction - -function! todo#txt#remove_completed() - " Check if we can write to done.txt before proceeding. - - let l:target_dir = expand('%:p:h') - let l:todo_file = expand('%:p') - let l:done_file = substitute(substitute(l:todo_file, 'todo.txt$', 'done.txt', ''), 'Todo.txt$', 'Done.txt', '') - if !filewritable(l:done_file) && !filewritable(l:target_dir) - echoerr "Can't write to file 'done.txt'" - return - endif - - let l:completed = [] - :g/^x /call add(l:completed, getline(line(".")))|d - call s:append_to_file(l:done_file, l:completed) -endfunction - -function! todo#txt#sort_by_context() range - execute a:firstline . "," . a:lastline . "sort /\\(^\\| \\)\\zs@[^[:blank:]]\\+/ r" -endfunction - -function! todo#txt#sort_by_project() range - execute a:firstline . "," . a:lastline . "sort /\\(^\\| \\)\\zs+[^[:blank:]]\\+/ r" -endfunction - -function! todo#txt#sort_by_date() range - let l:date_regex = "\\d\\{2,4\\}-\\d\\{2\\}-\\d\\{2\\}" - execute a:firstline . "," . a:lastline . "sort /" . l:date_regex . "/ r" - execute a:firstline . "," . a:lastline . "g!/" . l:date_regex . "/m" . a:lastline -endfunction - -function! todo#txt#sort_by_due_date() range - let l:date_regex = "due:\\d\\{2,4\\}-\\d\\{2\\}-\\d\\{2\\}" - execute a:firstline . "," . a:lastline . "sort /" . l:date_regex . "/ r" - execute a:firstline . "," . a:lastline . "g!/" . l:date_regex . "/m" . a:lastline -endfunction - -" Increment and Decrement The Priority -:set nf=octal,hex,alpha - -function! todo#txt#prioritize_increase() - normal! 0f)h -endfunction - -function! todo#txt#prioritize_decrease() - normal! 0f)h -endfunction - -function! todo#txt#prioritize_add(priority) - " Need to figure out how to only do this if the first visible letter in a line is not ( - :call todo#txt#prioritize_add_action(a:priority) -endfunction - -function! todo#txt#prioritize_add_action(priority) - execute 's/^\(([a-zA-Z]) \)\?/(' . a:priority . ') /' -endfunction - -" Modeline {{{1 -" vim: ts=8 sw=4 sts=4 et foldenable foldmethod=marker foldcolumn=1 diff --git a/base/.vim/doc/tags b/base/.vim/doc/tags deleted file mode 100644 index 113d935..0000000 --- a/base/.vim/doc/tags +++ /dev/null @@ -1,10 +0,0 @@ -'g:todo_existing_date' todo.txt /*'g:todo_existing_date'* -'g:todo_load_python' todo.txt /*'g:todo_load_python'* -todo-commands todo.txt /*todo-commands* -todo-commands-date todo.txt /*todo-commands-date* -todo-commands-done todo.txt /*todo-commands-done* -todo-commands-priority todo.txt /*todo-commands-priority* -todo-commands-sorting todo.txt /*todo-commands-sorting* -todo-contents todo.txt /*todo-contents* -todo-options todo.txt /*todo-options* -todo.txt todo.txt /*todo.txt* diff --git a/base/.vim/doc/todo.txt b/base/.vim/doc/todo.txt deleted file mode 100644 index 8d7ca3d..0000000 --- a/base/.vim/doc/todo.txt +++ /dev/null @@ -1,68 +0,0 @@ -*todo.txt* Vim plugin for Todo.txt files - _____ _ _ _ ~ - |_ _|__ __| | ___ | |___ _| |_ ~ - | |/ _ \ / _` |/ _ \| __\ \/ / __|~ - | | (_) | (_| | (_) | |_ > <| |_ ~ - |_|\___/ \__,_|\___(_)__/_/\_\\__|~ - - Reference Manual~ - -============================================================================== -CONTENTS *todo-contents* - - 1. Commands ..................................... |todo-commands| - 1.1. Sorting tasks ............................ |todo-commands-sorting| - 1.2. Edit priority ............................ |todo-commands-priority| - 1.3. Date ..................................... |todo-commands-date| - 1.4. Mark as done ............................. |todo-commands-done| - 2. Options ...................................... |todo-options| - -============================================================================== -1. Commands *todo-commands* - -1.1 Sorting tasks: *todo-commands-sorting* - `s` Sort the file - `s+` Sort the file on +Projects - `s@` Sort the file on @Contexts - `sd` Sort the file on dates - `sdd` Sort the file on due dates (i.e. due:2015-10-25) - -1.2 Edit priority: *todo-commands-priority* - `j` Decrease the priority of the current line - `k` Increase the priority of the current line - `a` Add the priority (A) to the current line - `b` Add the priority (B) to the current line - `c` Add the priority (C) to the current line - -1.3 Date: *todo-commands-date* - `d` Set current task's creation date to the current date - `date` (Insert mode) Insert the current date - -1.4 Mark as done: *todo-commands-done* - `x` Mark current task as done - `X` Mark all tasks as done - `D` Move completed tasks to done.txt - -See :h for more information about the commands' prefix. - -============================================================================== -2. Options *todo-options* - - *'g:todo_existing_date'* -Specify the behavior of date insertion functions when the task already has a -date of creation: > - let g:todo_existing_date = 'n' -< - r - replace existing date (default) - n - do nothing - - *'g:todo_load_python'* -Specify if the plugin should load the python module. Useful if you use Neovim -for example or if perhaps you just don't have/want python for vim: > - let g:todo_load_python = 1 -< - 1 - Load (default) - 0 - Don't load - -=============================================================================== -vim:ft=help:et:ts=2:sw=2:sts=2:norl diff --git a/base/.vim/ftdetect/todo.vim b/base/.vim/ftdetect/todo.vim deleted file mode 100644 index 6268180..0000000 --- a/base/.vim/ftdetect/todo.vim +++ /dev/null @@ -1,12 +0,0 @@ -" File: todo.txt.vim -" Description: Todo.txt filetype detection -" Author: Leandro Freitas -" License: Vim license -" Website: http://github.com/freitass/todo.txt-vim -" Version: 0.1 - -autocmd BufNewFile,BufRead [Tt]odo.txt set filetype=todo -autocmd BufNewFile,BufRead *.[Tt]odo.txt set filetype=todo -autocmd BufNewFile,BufRead [Dd]one.txt set filetype=todo -autocmd BufNewFile,BufRead *.[Dd]one.txt set filetype=todo - diff --git a/base/.vim/ftplugin/todo.vim b/base/.vim/ftplugin/todo.vim deleted file mode 100644 index 548617b..0000000 --- a/base/.vim/ftplugin/todo.vim +++ /dev/null @@ -1,90 +0,0 @@ -" File: todo.txt.vim -" Description: Todo.txt filetype detection -" Author: Leandro Freitas -" License: Vim license -" Website: http://github.com/freitass/todo.txt-vim -" Version: 0.4 - -" Save context {{{1 -let s:save_cpo = &cpo -set cpo&vim - -" General options {{{1 -" Some options lose their values when window changes. They will be set every -" time this script is invocated, which is whenever a file of this type is -" created or edited. -setlocal textwidth=0 -setlocal wrapmargin=0 - -" Mappings {{{1 -" Sort tasks {{{2 -nnoremap