diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 4cef0f3..0014c6b 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=tab:>\ ,multispace:\|⋅⋅⋅,trail:⋅,nbsp:+ au BufWrite * :%s/\s\+$//e @@ -23,14 +22,22 @@ 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! indent-blankline +lua << EOF +require('indent_blankline').setup { + show_current_context = true, + show_current_context_start = true, +} +EOF + packadd! nvim-lspconfig packadd! nvim-lsp-installer -lua require("nvim-lsp-installer").setup{} +lua require("nvim-lsp-installer").setup {} " keybindings diff --git a/.config/nvim/pack/plugins/opt/indent-blankline b/.config/nvim/pack/plugins/opt/indent-blankline new file mode 160000 index 0000000..c15bbe9 --- /dev/null +++ b/.config/nvim/pack/plugins/opt/indent-blankline @@ -0,0 +1 @@ +Subproject commit c15bbe9f23d88b5c0b4ca45a446e01a0a3913707 diff --git a/.config/nvim/pack/plugins/opt/nvim-lsp-installer b/.config/nvim/pack/plugins/opt/nvim-lsp-installer index b8c168c..227b677 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lsp-installer +++ b/.config/nvim/pack/plugins/opt/nvim-lsp-installer @@ -1 +1 @@ -Subproject commit b8c168ccb30529a11404e5f71525502ec6288ccf +Subproject commit 227b677e6bd088ea405c5923da37ae0b657becaf diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index 60f2993..4b627e1 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 60f2993b9661d9844cee3bebdbd1b5860577eb3c +Subproject commit 4b627e15434e30568442046b5c726eea32810fc9 diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index 0d7fab0..c784720 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit 0d7fab0c3323ed2e50ccdf14fd24fbbad664f7b1 +Subproject commit c784720917bacb6716ce35ef07d464f5da738dd7 diff --git a/.config/zsh/.oh-my-zsh b/.config/zsh/.oh-my-zsh index aa75eee..97134d1 160000 --- a/.config/zsh/.oh-my-zsh +++ b/.config/zsh/.oh-my-zsh @@ -1 +1 @@ -Subproject commit aa75eeea3348b906f2016be0e44335889e0faed1 +Subproject commit 97134d1eed19b72a9c4bf90a2effa847221608bf 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 6c1fc1e..9f5043d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule ".config/nvim/pack/plugins/opt/nvim-lsp-installer"] path = .config/nvim/pack/plugins/opt/nvim-lsp-installer url = https://github.com/williamboman/nvim-lsp-installer.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 +[submodule "/home/ange/.pyenv"] + path = /home/ange/.pyenv + url = https://github.com/pyenv/pyenv.git diff --git a/.pyenv b/.pyenv new file mode 160000 index 0000000..37a6070 --- /dev/null +++ b/.pyenv @@ -0,0 +1 @@ +Subproject commit 37a6070855d7053c34441b01b79ac6133ae5e5d9 diff --git a/bin/set-vol b/bin/set-vol index d4072b6..77d222e 100755 --- a/bin/set-vol +++ b/bin/set-vol @@ -2,6 +2,7 @@ set -e CUR_FILE=/var/tmp/current_volume +SINK='@DEFAULT_SINK@' set +e CUR="$(cat "$CUR_FILE" || echo 50)" @@ -22,8 +23,8 @@ 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" > "$CUR_FILE" echo "$NEW"