diff --git a/Makefile b/Makefile index 2170e180..4b9b6cbe 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -export CGO_ENABLED=0 -export GOPRIVATE=github.com export GOPROXY=https://goproxy.cn +export GOPRIVATE=github.com +export CGO_ENABLED=0 all: @echo && date diff --git a/etc/conf/sh.vim b/etc/conf/sh.vim index c35a97bc..06308c15 100644 --- a/etc/conf/sh.vim +++ b/etc/conf/sh.vim @@ -1,5 +1,7 @@ highlight ishKey ctermfg=yellow syntax match ishKey "require" syntax match ishKey "ish" +set foldmethod=marker set foldmarker={,} + diff --git a/go.mod b/go.mod index 0bbe5ab5..29b3db43 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module contexts go 1.13 require ( - github.com/gomodule/redigo v1.8.2 // indirect github.com/shylinux/icebergs v0.1.23 - github.com/shylinux/toolkits v0.1.5 + github.com/shylinux/toolkits v0.1.6 + github.com/stretchr/testify v1.5.1 // indirect ) replace github.com/shylinux/icebergs => ./usr/icebergs diff --git a/go.sum b/go.sum index 853622f1..6c84c7f6 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/gomarkdown/markdown v0.0.0-20200513213024-62c5e2c608cc/go.mod h1:aii0 github.com/gomarkdown/markdown v0.0.0-20200609195525-3f9352745725/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= +github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= +github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s= github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= diff --git a/usr/publish/order.js b/usr/publish/order.js index 03a182a2..f44511e5 100644 --- a/usr/publish/order.js +++ b/usr/publish/order.js @@ -1,5 +1,11 @@ Volcanos("onengine", { river: { "main": {name: "main", storm: { + "dream": {name: "dream", index: [ + "web.space", + "web.dream", + "web.code.docker.container", + "web.code.tmux.session", + ]}, "main": {name: "main", index: [ "web.code.inner", "web.code.git.status", @@ -24,6 +30,12 @@ Volcanos("onengine", { river: { "docker": {name: "docker", index: [ "web.code.docker.image", "web.code.docker.container", + "web.code.docker.command", + ]}, + "tmux": {name: "tmux", index: [ + "web.code.tmux.text", + "web.code.tmux.buffer", + "web.code.tmux.session", ]}, "wiki": {name: "wiki", index: [ // "web.wiki.draw.draw",