aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--bin/image/shellrc4
-rw-r--r--init.vim11
-rw-r--r--nvim.lua10
3 files changed, 15 insertions, 10 deletions
diff --git a/bin/image/shellrc b/bin/image/shellrc
index a62dd70..bfbb030 100644
--- a/bin/image/shellrc
+++ b/bin/image/shellrc
@@ -8,7 +8,7 @@ image.vertical() {
8 fi 8 fi
9 9
10 ext=${1##*.} 10 ext=${1##*.}
11 convert "$@" +append $(basename -s .$ext $1)-$(basename -s .$ext ${@: -1}).${format:-$ext} 11 convert "$@" -append $(basename -s .$ext $1)-$(basename -s .$ext ${@: -1}).${format:-$ext}
12} 12}
13 13
14# Concatenate image horizontally 14# Concatenate image horizontally
@@ -19,7 +19,7 @@ image.horizontal() {
19 fi 19 fi
20 20
21 ext=${1##*.} 21 ext=${1##*.}
22 convert "$@" -append output.$ext 22 convert "$@" +append output.$ext
23} 23}
24 24
25# Export image with data url format 25# Export image with data url format
diff --git a/init.vim b/init.vim
index d8b326e..b3325ea 100644
--- a/init.vim
+++ b/init.vim
@@ -10,7 +10,7 @@ endif
10let s:home = '~/.vim/vim-init' 10let s:home = '~/.vim/vim-init'
11 11
12" Load script in current dir 12" Load script in current dir
13" command! -nargs=1 LoadScript exec 'so '.s:home.'/'.'<args>' 13" command! -nargs=1 LoadScript exec 'source '.s:home.'/'.'<args>'
14 14
15" Add current dir into runtimepath 15" Add current dir into runtimepath
16execute 'set runtimepath+='.s:home 16execute 'set runtimepath+='.s:home
@@ -32,14 +32,11 @@ source ~/.vim/vim-init/init/init-keymaps.vim
32" Extra config for different contexts 32" Extra config for different contexts
33" source ~/.vim/vim-init/init/init-config.vim 33" source ~/.vim/vim-init/init/init-config.vim
34 34
35" 设定 tabsize 35" Set tabsize
36" source ~/.vim/vim-init/init/init-tabsize.vim 36source ~/.vim/vim-init/init/init-tabsize.vim
37 37
38" Set UI theme
39colorscheme desert
40
41" Neovim
42if has('nvim') 38if has('nvim')
39 " Neovim
43 source ~/.config/nvim/nvim.lua 40 source ~/.config/nvim/nvim.lua
44else 41else
45" Plugin 42" Plugin
diff --git a/nvim.lua b/nvim.lua
index d61b68c..9aa5c07 100644
--- a/nvim.lua
+++ b/nvim.lua
@@ -77,6 +77,7 @@ require('lazy').setup({
77 77
78 -- For surrounding 78 -- For surrounding
79 'machakann/vim-sandwich', 79 'machakann/vim-sandwich',
80
80 81
81 82
82 -- NOTE: This is where your plugins related to LSP can be installed. 83 -- NOTE: This is where your plugins related to LSP can be installed.
@@ -115,7 +116,14 @@ require('lazy').setup({
115 }, 116 },
116 117
117 -- Useful plugin to show you pending keybinds. 118 -- Useful plugin to show you pending keybinds.
118 { 'folke/which-key.nvim', opts = {} }, 119 { 'folke/which-key.nvim', opts = {
120 plugins = {
121 spelling = {
122 enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions
123 suggestions = 20, -- how many suggestions should be shown in the list?
124 },
125 }}
126 },
119 { 127 {
120 -- Adds git related signs to the gutter, as well as utilities for managing changes 128 -- Adds git related signs to the gutter, as well as utilities for managing changes
121 'lewis6991/gitsigns.nvim', 129 'lewis6991/gitsigns.nvim',