diff --git a/_laya-repo b/_laya-repo deleted file mode 100644 index f2df9c3..0000000 --- a/_laya-repo +++ /dev/null @@ -1,12 +0,0 @@ -#compdef laya-repo - -_describe 'command' '( - commit-all:go\ through\ all\ libs\ in\ storage,\ stage\ all\ changes,\ commit\ them\ - convert:create\ new\ laya\ repository\ and\ copy\ current\ dir\ to\ repository\ directory\ - pull-all:pull\ or\ clone\ everything\ in\ repository.laya.io/laya/\ - status:show\ what\ is\ not\ commited\ - diff:show\ diff\ of\ current\ directory\ agains\ laya\ lib\ of\ same\ name\ - sync:synchronize\ all\ files\ of\ current\ directory\ to\ laya\ lib\ of\ same\ name\ - sync-all:call\ sync\ to\ all\ subdirectories\ of\ current\ directory - )' && ret=0 - diff --git a/dot_config/nvim/lua/configs/lsp.lua b/dot_config/nvim/lua/configs/lsp.lua index 4cab896..08ee5da 100644 --- a/dot_config/nvim/lua/configs/lsp.lua +++ b/dot_config/nvim/lua/configs/lsp.lua @@ -94,7 +94,6 @@ function M.setup() end require('lspconfig').jsonls.setup { - -- on_attach = M.on_attach, capabilities = capabilities, settings = { validate = { enable = true }, @@ -117,6 +116,16 @@ function M.setup() }, } + require('lspconfig').yamlls.setup { + capabilities = capabilities, + settings = { + validate = { enable = true }, + json = { + schemas = require('schemastore').json.schemas { }, + }, + }, + } + require 'lspconfig'.phpactor.setup { -- on_attach = M.on_attach, capabilities = capabilities, diff --git a/dot_config/zsh/aliases.zsh b/dot_config/zsh/aliases.zsh index 76fea27..467e587 100644 --- a/dot_config/zsh/aliases.zsh +++ b/dot_config/zsh/aliases.zsh @@ -11,8 +11,7 @@ alias gst='git status -s' alias gp='git push' alias gd='git diff' alias gup='git pull --rebase' -alias gupv='git pull --rebase -v' -alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' +alias gwch='git log -p --ext-diff' alias wine32='WINEARCH=win32 WINEPREFIX=/home/sogun/.wine32 wine'