summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortypebrook <typebrook@gmail.com>2019-09-18 11:06:18 +0800
committertypebrook <typebrook@gmail.com>2019-09-18 11:06:18 +0800
commitcf9c66edb072f78f8f6d860fb761241030d72b54 (patch)
treef5b32ecc9471635ffa1f23712a58e62e8971675d
parentea45e47a4e44f55727f241fd3b77c73b12aa5d93 (diff)
parentd01adc14deecccb33fb5f7fa63f442019bb3c3b6 (diff)
Merge remote-tracking branch 'origin/dev' into dev
-rwxr-xr-xscripts/cyclone.sh4
-rw-r--r--scripts/vimwiki.cron1
-rw-r--r--vimrc6
3 files changed, 6 insertions, 5 deletions
diff --git a/scripts/cyclone.sh b/scripts/cyclone.sh
deleted file mode 100755
index 1c7e035..0000000
--- a/scripts/cyclone.sh
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/usr/bin/env bash
2
3NAME=$1
4wd ci "{\"labels\": {\"en\": \"$NAME\"}, \"claims\": {\"P31\": \"Q66724080\", \"P361\": \"Q66724586\"}}"
diff --git a/scripts/vimwiki.cron b/scripts/vimwiki.cron
deleted file mode 100644
index 7a1e77c..0000000
--- a/scripts/vimwiki.cron
+++ /dev/null
@@ -1 +0,0 @@
1*/15 * * * * cd ~/vimwiki && git add * && git commit -am "update" && git push
diff --git a/vimrc b/vimrc
index 56eb2b1..9be6881 100644
--- a/vimrc
+++ b/vimrc
@@ -80,6 +80,11 @@ augroup vimwikiPush
80 autocmd VimLeave ~/vimwiki/* :!(~/vimwiki/scripts/upload.sh > /dev/null 2>&1 &) 80 autocmd VimLeave ~/vimwiki/* :!(~/vimwiki/scripts/upload.sh > /dev/null 2>&1 &)
81augroup END 81augroup END
82 82
83" Configuration fro vim-instant-markdown
84let g:instant_markdown_autostart = 0
85nnoremap <leader>md :InstantMarkdownPreview<CR>
86
87
83""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" 88"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
84" => Redirect the output of a Vim or external command into a scratch buffer 89" => Redirect the output of a Vim or external command into a scratch buffer
85""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" 90"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -155,6 +160,7 @@ Plug 'vimwiki/vimwiki'
155Plug 'iberianpig/tig-explorer.vim' 160Plug 'iberianpig/tig-explorer.vim'
156Plug 'rust-lang/rust.vim' 161Plug 'rust-lang/rust.vim'
157Plug 'racer-rust/vim-racer' 162Plug 'racer-rust/vim-racer'
163Plug 'suan/vim-instant-markdown', {'for': 'markdown'}
158 164
159" Initialize plugin system 165" Initialize plugin system
160call plug#end() 166call plug#end()