1
0
mirror of https://github.com/aquatix/dotfiles.git synced 2025-12-07 19:25:11 +01:00

13 Commits

9 changed files with 90 additions and 35 deletions

View File

@@ -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'
@@ -133,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

View File

@@ -1 +1,2 @@
au BufNewFile,BufRead *.todo set filetype=todo au BufNewFile,BufRead *.todo set filetype=todo
"au BufNewFile,BufRead *.todo set filetype=markdown

View File

@@ -157,3 +157,5 @@ knuffelbaar
gewokte gewokte
Efteling Efteling
wokgerecht wokgerecht
rundersaucijs
Loïs

Binary file not shown.

View File

@@ -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"

52
.vimrc
View File

@@ -185,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>
@@ -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')
@@ -422,32 +434,16 @@ let g:wiki_filetypes = ['md']
let g:wiki_link_extension = '.md' let g:wiki_link_extension = '.md'
let g:wiki_link_target_type = 'md' let g:wiki_link_target_type = 'md'
" let g:wiki_mappings_use_defaults = 1 " let g:wiki_mappings_use_defaults = 1
"support for #tag style tags instead of :tag:
let g:wiki_tags_format_pattern = '\v%(^|\s)#\zs[^# ]+'
" vimwiki " number of lines from the top to scan for tags
"Plug 'vimwiki/vimwiki', { 'branch': 'dev' } let g:wiki_tags_scan_num_lines = 500
let wiki_1 = {} " search through the tags in the wiki
let wiki_1.path = '~/phren/' nmap <leader>wf :WikiFzfTags <CR>
let wiki_1.syntax = 'markdown' " find backlinks to this document
let wiki_1.ext = '.md' nmap <leader>wb :WikiGraphFindBacklinks <CR>
" find in ToC/structure of the (markdown) file
" vimwiki-markdown nmap <leader>ft :WikiFzfToc <CR>
let wiki_1.template_path = '~/phren/templates/'
let wiki_1.template_default = 'default'
let wiki_1.path_html = '~/phren/site_html/'
let wiki_1.custom_wiki2html = 'vimwiki_markdown'
let wiki_1.template_ext = '.tpl'
let $VIMWIKI_MARKDOWN_EXTENSIONS = 'wikilinks'
let g:vimwiki_list = [wiki_1]
let g:vimwiki_ext2syntax = {'.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
" Do not use vimwiki magic on non-wiki (markdown) files
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'

View File

@@ -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`

View File

@@ -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

View File

@@ -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