diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 7b65666..209183e 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -15,7 +15,6 @@ set foldmethod=indent set nofoldenable set foldlevel=99 set grepprg=grep\ -rn\ $* -set listchars+=lead:⋅ au BufWrite * :%s/\s\+$//e @@ -23,14 +22,19 @@ au BufWrite * :%s/\s\+$//e so ~/.config/nvim/epitech_header.vim packadd! nvim-treesitter -lua require('nvim-treesitter.configs').setup{highlight = {enable = true}} +lua require'nvim-treesitter.configs'.setup {highlight = {enable = true}} packadd! black -packadd! nvim-lspconfig - packadd! indent-blankline -lua require("indent_blankline").setup{space_char_blankline = " ", show_current_context = true, show_current_context_start = true} +lua << EOF +require'indent_blankline'.setup { + show_current_context = true, + show_current_context_start = true, +} +EOF + +packadd! nvim-lspconfig " keybindings nnoremap :Header diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index 6e047f1..a78831f 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 6e047f11861bfb6ec28a6ad0138a8f0a62bb8806 +Subproject commit a78831f97564b4344953ce1ba0f53fc5d034472d diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index a9a6493..7e41005 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit a9a6493b1eeba458757903352e0d3dc4b54fd4f2 +Subproject commit 7e410054235ea84c817fc2b93f8df359ba6545eb diff --git a/.config/zsh/.docker_aliases b/.config/zsh/.docker_aliases index e69de29..b53c52f 100644 --- a/.config/zsh/.docker_aliases +++ b/.config/zsh/.docker_aliases @@ -0,0 +1,33 @@ +# docker +alias dk='docker' +alias dkb='docker build .' +alias dkc='docker create' +alias dkex='docker exec -it' +alias dki='docker image' +alias dkic='docker image create' +alias dkils='docker image ls' +alias dkirm='docker image rm' +alias dkl='docker pull' +alias dklo='docker logs -f' +alias dkp='docker push' +alias dkps='docker ps' +alias dkpsa='docker ps -a' +alias dkrm='docker rm' +alias dkt='docker tag' +alias dkv='docker volume' +alias dkvc='docker volume create' +alias dkvls='docker volume ls' +alias dkvrm='docker volume rm' + +function dkpurge() { + PS="$(docker ps -aq)" + + echo "$PS" | xargs docker stop + echo "$PS" | xargs docker rm + docker image prune -f +} + +# docker-compose +alias dc='docker-compose' +alias dcd='docker-compose down' +alias dcup='docker-compose up -d --build' diff --git a/.config/zsh/.zsh_aliases b/.config/zsh/.zsh_aliases index 06b50d6..e50b227 100644 --- a/.config/zsh/.zsh_aliases +++ b/.config/zsh/.zsh_aliases @@ -8,3 +8,19 @@ alias startgui='startx' alias umnt='sudo umount /mnt -R' alias vi="$EDITOR" alias tmp="cd $(mktemp -d)" + +function watch() { + # alias alias_cmd='cmd' + cmd="$(alias "${1}")" + + if [ -n "${cmd}" ]; then + # remove everything before and including the first = + cmd="${cmd#*=}" + # remove first and last char in this case, quotes + cmd="${cmd:1:-1}" + else + cmd="${1}" + fi + + env watch "${cmd}" "${@:2}" +} diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 0eb7d0b..a90d699 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -74,7 +74,7 @@ CASE_SENSITIVE="true" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) +plugins=(git vi-mode) . $ZSH/oh-my-zsh.sh @@ -99,7 +99,6 @@ plugins=(git) [[ ! -f ~/.config/zsh/.p10k.zsh ]] || . ~/.config/zsh/.p10k.zsh eval "$(pyenv init -)" -pyenv shell 3.10.5 . "$ZDOTDIR"/.zsh_aliases . "$ZDOTDIR"/.kubectl_aliases . "$ZDOTDIR"/.docker_aliases diff --git a/.gitmodules b/.gitmodules index f20d69e..1dfb0d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ +[submodule ".config/nvim/pack/plugins/opt/indent-blankline"] + path = .config/nvim/pack/plugins/opt/indent-blankline + url = https://github.com/lukas-reineke/indent-blankline.nvim.git [submodule ".config/nvim/pack/plugins/opt/nvim-lspconfig"] path = .config/nvim/pack/plugins/opt/nvim-lspconfig url = https://github.com/neovim/nvim-lspconfig @@ -10,6 +13,3 @@ [submodule ".pyenv"] path = .pyenv url = https://github.com/pyenv/pyenv.git -[submodule ".config/nvim/pack/plugins/opt/indent-blankline"] - path = .config/nvim/pack/plugins/opt/indent-blankline - url = https://github.com/lukas-reineke/indent-blankline.nvim.git diff --git a/.pyenv b/.pyenv index 37a6070..ae22c69 160000 --- a/.pyenv +++ b/.pyenv @@ -1 +1 @@ -Subproject commit 37a6070855d7053c34441b01b79ac6133ae5e5d9 +Subproject commit ae22c6950563af3e0ff5405367d42ceed40997d5 diff --git a/bin/set-vol b/bin/set-vol index c58d7eb..8da4df4 100755 --- a/bin/set-vol +++ b/bin/set-vol @@ -19,7 +19,7 @@ esac [ "$NEW" -lt 0 ] && NEW=0 [ "$NEW" -gt 100 ] && NEW=100 -pactl set-sink-volume 0 "$NEW%" -pactl set-sink-mute 0 0 +pactl set-sink-volume "${SINK}" "$NEW"% +pactl set-sink-mute "${SINK}" 0 echo "$NEW"