merge: local work branch
This commit is contained in:
commit
8ba4c4074d
@ -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 <C-c><C-h> :Header<CR>
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 6e047f11861bfb6ec28a6ad0138a8f0a62bb8806
|
||||
Subproject commit a78831f97564b4344953ce1ba0f53fc5d034472d
|
@ -1 +1 @@
|
||||
Subproject commit a9a6493b1eeba458757903352e0d3dc4b54fd4f2
|
||||
Subproject commit 7e410054235ea84c817fc2b93f8df359ba6545eb
|
@ -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'
|
@ -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}"
|
||||
}
|
||||
|
@ -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
|
||||
|
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -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
|
||||
|
2
.pyenv
2
.pyenv
@ -1 +1 @@
|
||||
Subproject commit 37a6070855d7053c34441b01b79ac6133ae5e5d9
|
||||
Subproject commit ae22c6950563af3e0ff5405367d42ceed40997d5
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user