mirror of
https://github.com/aquatix/dotfiles.git
synced 2025-12-07 03:35:10 +01:00
Compare commits
22 Commits
0b76113602
...
vim-todo
| Author | SHA1 | Date | |
|---|---|---|---|
| c59ec2687a | |||
| b2fa6f46c6 | |||
| 26d268249c | |||
| 0243aa351b | |||
| be22ae5d26 | |||
| afdc46f09a | |||
| 071c48f38a | |||
| b5ebbe1c68 | |||
| 0084ea18ef | |||
| 5bf9bc00d8 | |||
| 23b7a4daa7 | |||
| 1a95a6dd3b | |||
| dd536a69af | |||
| cacfcb08f1 | |||
| 08f6b4e4e6 | |||
| a7adbb5b10 | |||
| 7f3e2231c7 | |||
| 3450865acb | |||
| 88f0f0a17a | |||
| d989e45356 | |||
| 3bb8761460 | |||
| 0d82d4d81f |
@@ -22,6 +22,11 @@ alias lll='ls --color=always -alF | less -R'
|
|||||||
# append history instead of overwriting:
|
# append history instead of overwriting:
|
||||||
shopt -s histappend
|
shopt -s histappend
|
||||||
|
|
||||||
|
if command -v batcat &> /dev/null; then
|
||||||
|
# Sometimes `bat` has the binary `batcat`, like on Debian or Ubuntu
|
||||||
|
alias bat='batcat'
|
||||||
|
fi
|
||||||
|
|
||||||
alias findphp='find . -name "*.php" | xargs grep --color=auto'
|
alias findphp='find . -name "*.php" | xargs grep --color=auto'
|
||||||
alias findjs='find . -name "*.js" | xargs grep --color=auto'
|
alias findjs='find . -name "*.js" | xargs grep --color=auto'
|
||||||
alias findcss='find . -name "*.css" | xargs grep --color=auto'
|
alias findcss='find . -name "*.css" | xargs grep --color=auto'
|
||||||
|
|||||||
@@ -55,6 +55,9 @@ set -gx FZF_DEFAULT_COMMAND 'rg --files --no-ignore --hidden --follow --glob "!.
|
|||||||
set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
|
set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
|
||||||
set -gx FZF_ALT_C_COMMAND "$FZF_DEFAULT_COMMAND"
|
set -gx FZF_ALT_C_COMMAND "$FZF_DEFAULT_COMMAND"
|
||||||
|
|
||||||
|
# Set HOSTNAME to the hostname of the device, without trailing domain name
|
||||||
|
set -x HOSTNAME (hostname | string split -m1 '.')[1]
|
||||||
|
|
||||||
# Aliases
|
# Aliases
|
||||||
## Listing
|
## Listing
|
||||||
alias ll 'ls -alF'
|
alias ll 'ls -alF'
|
||||||
@@ -98,6 +101,9 @@ function grepl
|
|||||||
grep --color=always -ir $argv | less -R
|
grep --color=always -ir $argv | less -R
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Sometimes `bat` has the binary `batcat`, like on Debian or Ubuntu
|
||||||
|
alias bat (command -v batcat || echo bat)
|
||||||
|
|
||||||
function rgl
|
function rgl
|
||||||
rg -p $argv | less -RFX
|
rg -p $argv | less -RFX
|
||||||
end
|
end
|
||||||
@@ -130,6 +136,24 @@ function rgvim
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function imready
|
||||||
|
# Get return status and run time of last command, to be used with long-running jobs
|
||||||
|
# e.g.: longrunning.sh; imready
|
||||||
|
set laststatus $status
|
||||||
|
if test $status = 0
|
||||||
|
set result "success"
|
||||||
|
else
|
||||||
|
set result "failed with result $laststatus"
|
||||||
|
end
|
||||||
|
set duration (echo "$CMD_DURATION 1000" | awk '{printf "%.3fs", $1 / $2}')
|
||||||
|
set resulttext "Result of command: $result (took: $duration)"
|
||||||
|
|
||||||
|
# Send a push message with summary
|
||||||
|
if test -f "$HOME/workspace/projects/others/pushover.sh/pushover.sh"
|
||||||
|
$HOME/workspace/projects/others/pushover.sh/pushover.sh -t "[$HOSTNAME] command finished" "$resulttext"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function jl
|
function jl
|
||||||
# Pretty print the json file used as argument, and feed it in colour to less
|
# Pretty print the json file used as argument, and feed it in colour to less
|
||||||
jq -C --indent 2 . $argv | less -R
|
jq -C --indent 2 . $argv | less -R
|
||||||
|
|||||||
3
.vim/after/syntax/markdown.vim
Normal file
3
.vim/after/syntax/markdown.vim
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
unlet b:current_syntax
|
||||||
|
syntax include @Yaml syntax/yaml.vim
|
||||||
|
syntax region yamlFrontmatter start=/\%^---$/ end=/^---$/ keepend contains=@Yaml
|
||||||
@@ -1 +1,2 @@
|
|||||||
au BufNewFile,BufRead *.todo set filetype=todo
|
au BufNewFile,BufRead *.todo set filetype=todo
|
||||||
|
"au BufNewFile,BufRead *.todo set filetype=markdown
|
||||||
|
|||||||
@@ -155,3 +155,7 @@ KlikAanKlikUit
|
|||||||
Mandalorian
|
Mandalorian
|
||||||
knuffelbaar
|
knuffelbaar
|
||||||
gewokte
|
gewokte
|
||||||
|
Efteling
|
||||||
|
wokgerecht
|
||||||
|
rundersaucijs
|
||||||
|
Loïs
|
||||||
|
|||||||
Binary file not shown.
@@ -2,6 +2,11 @@ if exists("b:current_syntax")
|
|||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
runtime! syntax/html.vim
|
||||||
|
unlet! b:current_syntax
|
||||||
|
|
||||||
|
"runtime! syntax/markdown.vim
|
||||||
|
"unlet! b:current_syntax
|
||||||
|
|
||||||
" Keywords that we want to emphasize
|
" Keywords that we want to emphasize
|
||||||
"syntax keyword todoKeyword todo done important
|
"syntax keyword todoKeyword todo done important
|
||||||
@@ -85,6 +90,19 @@ highlight todoTitledItem ctermfg=172 guifg=#d78700
|
|||||||
syntax match todoItem '[a-zA-Z0-9\-_]\+:' contained
|
syntax match todoItem '[a-zA-Z0-9\-_]\+:' contained
|
||||||
highlight todoItem ctermfg=Blue guifg=#87d7ff
|
highlight todoItem ctermfg=Blue guifg=#87d7ff
|
||||||
|
|
||||||
|
|
||||||
|
syn region markdownIdDeclaration matchgroup=markdownLinkDelimiter start="^ \{0,3\}!\=\[" end="\]:" oneline keepend nextgroup=markdownUrl skipwhite
|
||||||
|
syn match markdownUrl "\S\+" nextgroup=markdownUrlTitle skipwhite contained
|
||||||
|
syn region markdownUrl matchgroup=markdownUrlDelimiter start="<" end=">" oneline keepend nextgroup=markdownUrlTitle skipwhite contained
|
||||||
|
syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+"+ end=+"+ keepend contained
|
||||||
|
syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+'+ end=+'+ keepend contained
|
||||||
|
syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+(+ end=+)+ keepend contained
|
||||||
|
|
||||||
|
syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart
|
||||||
|
syn region markdownLink matchgroup=markdownLinkDelimiter start="(" end=")" contains=markdownUrl keepend contained
|
||||||
|
syn region markdownId matchgroup=markdownIdDelimiter start="\[" end="\]" keepend contained
|
||||||
|
syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+:\|[[:alnum:]_+-]\+@\)\@=" end=">" keepend oneline
|
||||||
|
|
||||||
highlight link todoStatusDone PreProc
|
highlight link todoStatusDone PreProc
|
||||||
highlight link todoStatusDoing PreProc
|
highlight link todoStatusDoing PreProc
|
||||||
highlight link todoStatusCancelled PreProc
|
highlight link todoStatusCancelled PreProc
|
||||||
@@ -93,6 +111,18 @@ highlight link todoStatusTodo PreProc
|
|||||||
highlight link todoStatusImportant PreProc
|
highlight link todoStatusImportant PreProc
|
||||||
highlight link todoStatusQuestion PreProc
|
highlight link todoStatusQuestion PreProc
|
||||||
|
|
||||||
|
hi def link markdownLinkText htmlLink
|
||||||
|
hi def link markdownIdDeclaration Typedef
|
||||||
|
hi def link markdownId Type
|
||||||
|
hi def link markdownAutomaticLink markdownUrl
|
||||||
|
hi def link markdownUrl Float
|
||||||
|
hi def link markdownUrlTitle String
|
||||||
|
hi def link markdownIdDelimiter markdownLinkDelimiter
|
||||||
|
hi def link markdownUrlDelimiter htmlTag
|
||||||
|
hi def link markdownUrlTitleDelimiter Delimiter
|
||||||
|
|
||||||
|
" runtime! syntax/markdown.vim
|
||||||
|
" unlet! b:current_syntax
|
||||||
|
|
||||||
" Syntax highlighting scheme name
|
" Syntax highlighting scheme name
|
||||||
let b:current_syntax = "todo"
|
let b:current_syntax = "todo"
|
||||||
|
|||||||
67
.vimrc
67
.vimrc
@@ -141,6 +141,7 @@ endif
|
|||||||
" fzf integration for fast fuzzy finding, better and faster than ctrl-p
|
" fzf integration for fast fuzzy finding, better and faster than ctrl-p
|
||||||
set rtp+=~/workspace/projects/others/fzf
|
set rtp+=~/workspace/projects/others/fzf
|
||||||
set rtp+=/data/data/com.termux/files/usr/bin/fzf
|
set rtp+=/data/data/com.termux/files/usr/bin/fzf
|
||||||
|
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||||
Plug 'junegunn/fzf.vim'
|
Plug 'junegunn/fzf.vim'
|
||||||
|
|
||||||
" Customize fzf colors to match your color scheme
|
" Customize fzf colors to match your color scheme
|
||||||
@@ -184,7 +185,10 @@ command! -bang -nargs=? -complete=dir FilesPreview
|
|||||||
" \t for tags, \c for (Git) commits and \f to search through contents of files
|
" \t for tags, \c for (Git) commits and \f to search through contents of files
|
||||||
nmap ; :Buffers<CR>
|
nmap ; :Buffers<CR>
|
||||||
nmap <Leader>o :Files<CR>
|
nmap <Leader>o :Files<CR>
|
||||||
nmap <Leader>O :FilesPreview<CR>
|
"nmap <Leader>O :FilesPreview<CR>
|
||||||
|
" Git files, takes .gitignore into account
|
||||||
|
nmap <Leader>O :GFiles<CR>
|
||||||
|
nmap <Leader>b :Buffers<CR>
|
||||||
nmap <Leader>t :Tags<CR>
|
nmap <Leader>t :Tags<CR>
|
||||||
nmap <Leader>c :Commits<CR>
|
nmap <Leader>c :Commits<CR>
|
||||||
" nmap <Leader>f :Find<CR>
|
" nmap <Leader>f :Find<CR>
|
||||||
@@ -200,9 +204,8 @@ nnoremap <silent> ]f :lnext<CR>
|
|||||||
" https://github.com/ryanoasis/nerd-fonts
|
" https://github.com/ryanoasis/nerd-fonts
|
||||||
Plug 'ryanoasis/vim-devicons'
|
Plug 'ryanoasis/vim-devicons'
|
||||||
" Set guifont when using gvim:
|
" Set guifont when using gvim:
|
||||||
"set guifont=Droid\ Sans\ Mono\ for\ Powerline\ Plus\ Nerd\ File\ Types\ 11
|
set guifont=Hack\ Nerd\ Font\ Mono\ 10
|
||||||
|
|
||||||
"
|
|
||||||
" undotree.vim : Display your undo history in a graph.
|
" undotree.vim : Display your undo history in a graph.
|
||||||
Plug 'mbbill/undotree'
|
Plug 'mbbill/undotree'
|
||||||
nnoremap <Leader>u :UndotreeToggle<CR>
|
nnoremap <Leader>u :UndotreeToggle<CR>
|
||||||
@@ -282,6 +285,8 @@ Plug 'Yggdroot/indentLine'
|
|||||||
let g:indentLine_char = '┊'
|
let g:indentLine_char = '┊'
|
||||||
"let g:indentLine_setConceal = 0
|
"let g:indentLine_setConceal = 0
|
||||||
let g:indentLine_conceallevel = 1
|
let g:indentLine_conceallevel = 1
|
||||||
|
" Do not conceal LaTeX symbols
|
||||||
|
let g:tex_conceal=""
|
||||||
|
|
||||||
" Colour-match brackets
|
" Colour-match brackets
|
||||||
Plug 'luochen1990/rainbow'
|
Plug 'luochen1990/rainbow'
|
||||||
@@ -312,7 +317,14 @@ if !filereadable(skip_ycm) " Only load YouCompleteMe if ~/.dot_no_ycm does not
|
|||||||
" sudo apt-get install python-dev
|
" sudo apt-get install python-dev
|
||||||
" cd ~/.vim/bundle/YouCompleteMe
|
" cd ~/.vim/bundle/YouCompleteMe
|
||||||
" ./install.py # For C-style languages: ./install.py --clang-completer
|
" ./install.py # For C-style languages: ./install.py --clang-completer
|
||||||
Plug 'ycm-core/YouCompleteMe'
|
if has('patch-8.1.2269')
|
||||||
|
" Latest YCM needs at least this version of vim
|
||||||
|
Plug 'ycm-core/YouCompleteMe'
|
||||||
|
else
|
||||||
|
" Version compatible with the vim in Debian 10 buster
|
||||||
|
" Plug 'ycm-core/YouCompleteMe', { 'commit':'d98f896' }
|
||||||
|
Plug 'ycm-core/YouCompleteMe', { 'branch':'legacy-vim' }
|
||||||
|
endif
|
||||||
" YouCompleteMe interpreter version (should be the same as what YCM was
|
" YouCompleteMe interpreter version (should be the same as what YCM was
|
||||||
" compiled with):
|
" compiled with):
|
||||||
if filereadable('/data/data/com.termux/files/usr/bin/python3')
|
if filereadable('/data/data/com.termux/files/usr/bin/python3')
|
||||||
@@ -414,30 +426,24 @@ Plug 'aquatix/mdnav', { 'branch': 'fixes' }
|
|||||||
let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
|
let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
|
||||||
|
|
||||||
|
|
||||||
" vimwiki
|
" wiki.vim
|
||||||
"Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
|
Plug 'lervag/wiki.vim'
|
||||||
let wiki_1 = {}
|
" let g:wiki_root = '~/wiki'
|
||||||
let wiki_1.path = '~/phren/'
|
let g:wiki_root = '~/phren'
|
||||||
let wiki_1.syntax = 'markdown'
|
let g:wiki_filetypes = ['md']
|
||||||
let wiki_1.ext = '.md'
|
let g:wiki_link_extension = '.md'
|
||||||
|
let g:wiki_link_target_type = 'md'
|
||||||
" vimwiki-markdown
|
" let g:wiki_mappings_use_defaults = 1
|
||||||
let wiki_1.template_path = '~/phren/templates/'
|
"support for #tag style tags instead of :tag:
|
||||||
let wiki_1.template_default = 'default'
|
let g:wiki_tags_format_pattern = '\v%(^|\s)#\zs[^# ]+'
|
||||||
let wiki_1.path_html = '~/phren/site_html/'
|
" number of lines from the top to scan for tags
|
||||||
let wiki_1.custom_wiki2html = 'vimwiki_markdown'
|
let g:wiki_tags_scan_num_lines = 500
|
||||||
let wiki_1.template_ext = '.tpl'
|
" search through the tags in the wiki
|
||||||
let $VIMWIKI_MARKDOWN_EXTENSIONS = 'wikilinks'
|
nmap <leader>wf :WikiFzfTags <CR>
|
||||||
|
" find backlinks to this document
|
||||||
let g:vimwiki_list = [wiki_1]
|
nmap <leader>wb :WikiGraphFindBacklinks <CR>
|
||||||
let g:vimwiki_ext2syntax = {'.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
|
" find in ToC/structure of the (markdown) file
|
||||||
" Do not use vimwiki magic on non-wiki (markdown) files
|
nmap <leader>ft :WikiFzfToc <CR>
|
||||||
let g:vimwiki_global_ext = 0
|
|
||||||
" Be smarter with file extensions
|
|
||||||
let g:vimwiki_markdown_link_ext = 1
|
|
||||||
|
|
||||||
" Quick way of opening a window with backlinks to the current document
|
|
||||||
nmap <leader>wb :VimwikiBacklinks <CR>
|
|
||||||
|
|
||||||
|
|
||||||
if $USER != 'root'
|
if $USER != 'root'
|
||||||
@@ -571,7 +577,7 @@ set hidden
|
|||||||
set cryptmethod=blowfish2
|
set cryptmethod=blowfish2
|
||||||
|
|
||||||
" Ensure 256 colour support if the terminal supports it
|
" Ensure 256 colour support if the terminal supports it
|
||||||
if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
|
if has("gui_running") || &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
|
||||||
|
|
||||||
set background=dark
|
set background=dark
|
||||||
let g:enable_bold_font = 1
|
let g:enable_bold_font = 1
|
||||||
@@ -582,6 +588,9 @@ if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &te
|
|||||||
" create a bar for airline
|
" create a bar for airline
|
||||||
set laststatus=2
|
set laststatus=2
|
||||||
let g:airline_powerline_fonts = 1
|
let g:airline_powerline_fonts = 1
|
||||||
|
|
||||||
|
" ensure black background in gvim
|
||||||
|
highlight Normal guibg=black
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" This is what sets vim to use 24-bit colors. It will also work for any version of neovim
|
" This is what sets vim to use 24-bit colors. It will also work for any version of neovim
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ cd dotfiles # this takes you to the freshly cloned ~/.dot/dotfiles
|
|||||||
sh install.sh # follow the instructions and install the files in the homedir
|
sh install.sh # follow the instructions and install the files in the homedir
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Extra's:
|
||||||
|
|
||||||
|
[virtualfish](https://virtualfish.readthedocs.io/en/latest/install.html) for virtualenv(wrapper) integration in `fish` shell.
|
||||||
|
|
||||||
|
|
||||||
## Dependency on `fzf` and ripgrep `rg`
|
## Dependency on `fzf` and ripgrep `rg`
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
sudo -v && wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()"
|
sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sudo sh /dev/stdin
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ Rubik-Medium.ttf
|
|||||||
Rubik-Regular.ttf'
|
Rubik-Regular.ttf'
|
||||||
|
|
||||||
# https://github.com/eosrei/emojione-color-font/
|
# https://github.com/eosrei/emojione-color-font/
|
||||||
FONTS_VARIOUS=$'EmojiOneColor-SVGinOT.ttf'
|
# FONTS_VARIOUS=$'EmojiOneColor-SVGinOT.ttf'
|
||||||
|
|
||||||
FONTS_DELETE=$'Sauce Code Pro Medium Plus Nerd File Types Plus Font Awesome Plus Octicons Plus Pomicons.ttf
|
FONTS_DELETE=$'Sauce Code Pro Medium Plus Nerd File Types Plus Font Awesome Plus Octicons Plus Pomicons.ttf
|
||||||
Sauce Code Pro Bold Plus Nerd File Types Mono Plus Font Awesome Plus Octicons Plus Pomicons.ttf
|
Sauce Code Pro Bold Plus Nerd File Types Mono Plus Font Awesome Plus Octicons Plus Pomicons.ttf
|
||||||
@@ -179,14 +179,15 @@ else
|
|||||||
while read -r FONT; do
|
while read -r FONT; do
|
||||||
install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
|
install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
|
||||||
done <<< "$FONTS_RUBIK"
|
done <<< "$FONTS_RUBIK"
|
||||||
while read -r FONT; do
|
# while read -r FONT; do
|
||||||
install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
|
# install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
|
||||||
done <<< "$FONTS_VARIOUS"
|
# done <<< "$FONTS_VARIOUS"
|
||||||
if [ ! -e "${HOME}/.config/fontconfig" ]; then
|
if [ ! -e "${HOME}/.config/fontconfig" ]; then
|
||||||
mkdir -p "${HOME}/.config/fontconfig"
|
mkdir -p "${HOME}/.config/fontconfig"
|
||||||
fi
|
fi
|
||||||
if [ ! -e "${HOME}/.config/fontconfig/fonts.conf" ]; then
|
if [ -L "${HOME}/.config/fontconfig/fonts.conf" ]; then
|
||||||
ln -s "${SOURCE_DIR}/fonts.conf" "${HOME}/.config/fontconfig/"
|
# Remove the emoji-fallback config that causes crashes in Telegram Desktop (symlink)
|
||||||
|
rm "${HOME}/.config/fontconfig/fonts.conf"
|
||||||
fi
|
fi
|
||||||
# Delete obsolete fonts
|
# Delete obsolete fonts
|
||||||
while read -r FONT; do
|
while read -r FONT; do
|
||||||
|
|||||||
@@ -2,4 +2,4 @@
|
|||||||
cd ~/mydocs/work/divault
|
cd ~/mydocs/work/divault
|
||||||
git pull
|
git pull
|
||||||
#vim -c ":vsp planning_2015.todo" notes_2015.md notes_2014.md
|
#vim -c ":vsp planning_2015.todo" notes_2015.md notes_2014.md
|
||||||
vim -c "set nofoldenable" planning_2020.todo notes.md
|
vim -c "set nofoldenable" planning_2021.todo notes.md
|
||||||
|
|||||||
Reference in New Issue
Block a user