Merge branch 'work'

This commit is contained in:
aduhayon 2022-08-10 09:54:39 +02:00
commit ad18bf8027
4 changed files with 10 additions and 8 deletions

View File

@ -1,5 +1,5 @@
-- packages -- packages
require'yamlls'.dockerls.setup {} require'lspconfig'.yamlls.setup {}
-- variables -- variables
vim.o.shiftwidth = 2 vim.o.shiftwidth = 2

@ -1 +1 @@
Subproject commit e9ab0341394b41ac9fbd197b0a6ceaff3c4d9e51 Subproject commit e7b5e92d46355919e96e78f596bd5297c9ef77dd

View File

@ -10,9 +10,9 @@ alias umnt='sudo umount /mnt -R'
alias vi="$EDITOR" alias vi="$EDITOR"
alias tmp="cd $(mktemp -d)" alias tmp="cd $(mktemp -d)"
function watch() { function fnalias() {
# alias alias_cmd='cmd' # alias alias_cmd='cmd'
cmd="$(alias "${1}")" cmd="$(alias "${2}")"
if [ -n "${cmd}" ]; then if [ -n "${cmd}" ]; then
# remove everything before and including the first = # remove everything before and including the first =
@ -20,8 +20,10 @@ function watch() {
# remove first and last char in this case, quotes # remove first and last char in this case, quotes
cmd="${cmd:1:-1}" cmd="${cmd:1:-1}"
else else
cmd="${1}" cmd="${2}"
fi fi
env watch "${cmd}" "${@:2}" env "${1}" "${cmd}" "${@:3}"
} }
alias watch='fnalias watch'

4
.gitmodules vendored
View File

@ -6,10 +6,10 @@
url = https://github.com/lukas-reineke/indent-blankline.nvim.git url = https://github.com/lukas-reineke/indent-blankline.nvim.git
[submodule ".config/nvim/pack/plugins/opt/nvim-lspconfig"] [submodule ".config/nvim/pack/plugins/opt/nvim-lspconfig"]
path = .config/nvim/pack/plugins/opt/nvim-lspconfig path = .config/nvim/pack/plugins/opt/nvim-lspconfig
url = https://github.com/neovim/nvim-lspconfig url = https://github.com/neovim/nvim-lspconfig.git
[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"] [submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"]
path = .config/nvim/pack/plugins/opt/nvim-treesitter path = .config/nvim/pack/plugins/opt/nvim-treesitter
url = https://github.com/nvim-treesitter/nvim-treesitter url = https://github.com/nvim-treesitter/nvim-treesitter.git
[submodule ".config/zsh/ohmyzsh"] [submodule ".config/zsh/ohmyzsh"]
path = .config/zsh/ohmyzsh path = .config/zsh/ohmyzsh
url = https://github.com/ohmyzsh/ohmyzsh.git url = https://github.com/ohmyzsh/ohmyzsh.git