move to waikiki

nvim/.config/nvim/init.vim

@@ -46,14 +46,14 @@ function! WordCount()
 endfunction
 
 function! LightlineWordCount()
-  return &filetype =~# '\v^(markdown|txt|vimwiki)' ? WordCount() . ' Words' : ''
+  return &filetype =~# '\v^(markdown|txt)' ? WordCount() . ' Words' : ''
 endfunction
 
 " Plugins
 
 call plug#begin("~/.config/nvim/plugged")
 
-Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
+Plug 'fcpg/vim-waikiki'
 Plug 'chriskempson/base16-vim'
 Plug 'tpope/vim-fugitive'
 Plug 'Olical/conjure'
@@ -76,7 +76,7 @@ Plug 'davidgranstrom/scnvim'
 
 call plug#end()
 
-au BufNewFile *vimwiki/*.wiki :0r !fragment-vimwiki-header '%'
+au BufNewFile *vimwiki/*.md :0r !fragment-vimwiki-header '%'
 au BufNewFile *gmi :set includeexpr=substitute(v:fname,'^/','','')
 au BufRead *gmi :set includeexpr=substitute(v:fname,'^/','','')
 
@@ -90,10 +90,9 @@ au BufRead *gmi :set includeexpr=substitute(v:fname,'^/','','')
 "     endif
 " endfunction
 
+
+let g:waikiki_default_maps = 1
 let g:limelight_conceal_ctermfg = 'grey'
-let g:vimwiki_global_ext = 0
-let g:vimwiki_folding = ''
-let g:vimwiki_markdown_link_ext = 1
 let g:table_mode_corner = '|'
 let g:rainbow_active = 0
 let g:ledger_bin="hledger"
@@ -105,8 +104,7 @@ let g:taskwiki_markup_syntax = "markdown"
 
 let g:tidal_target = "terminal"
 
-let g:vimwiki_list = [{'path': '~/vimwiki', 'syntax': 'markdown', 'ext': '.wiki', 'links_space_char': '_' },
-            \ {'path': '~/website/wiki/vimwiki', 'syntax': 'markdown', 'ext': '.md', 'links_space_char': '_' , 'diary_rel_path' : 'blog', 'diary_index' : 'index', 'diary_header': 'Blog' }]
+let g:waikiki_roots = ['~/vimwiki/']
 
 let g:lightline = {
       \ 'colorscheme': 'Tomorrow_Night',
@@ -149,9 +147,6 @@ nnoremap <leader>pc :AsyncRun pandoc --csl ~/Documents/08-Bibliography/ieee.csl
 "Using makedoc script
 nnoremap <leader>pd :AsyncRun makedoc %<Enter>
 
-" Remind
-" nnoremap <leader>r :!remind ~/vimwiki/calendar.rem<Enter>
-
 set number relativenumber
 set ruler
 

scripts/.local/bin/pim

@@ -1,4 +1,4 @@
 #!/bin/sh                                                                                                   
-tmux new-session -d "nvim -n -c:VimwikiIndex"
+tmux new-session -d "nvim ~/vimwiki/index.md +'lcd ~/vimwiki'"
 tmux new-window 'calcurse'
 tmux -2 attach-session -d

x11/.xinitrc

@@ -42,4 +42,5 @@ fi
 nvidia-settings --load-config-only
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 ~/.screenlayout/layout.sh
+xrandr --output DP-0 --brightness 0.5
 exec i3

zsh/.zshrc

@@ -5,9 +5,9 @@ antigen bundle zsh-users/zsh-syntax-highlighting
 
 #aliases
 alias v=nvim
-alias vw="nvim +VimwikiIndex +'lcd ~/vimwiki'"
-alias sw="nvim ~/vimwiki/schoolwork/index.wiki +'lcd ~/vimwiki/schoolwork'"
-alias ws="nvim +'VimwikiIndex 2' +'lcd ~/website/wiki/vimwiki'"
+alias vw="nvim ~/vimwiki/index.md +'lcd ~/vimwiki'"
+alias sw="nvim ~/vimwiki/schoolwork/index.md +'lcd ~/vimwiki/schoolwork'"
+alias ws="nvim ~/website/wiki/content/index.gmi +'lcd ~/website/wiki/content/'"
 export EDITOR=nvim
 export VISUAL=nvim
 export VITASDK=~/.local/vitasdk