merge: main

This commit is contained in:
AngeD 2022-12-13 10:44:27 +01:00
commit 0c36458c4e
9 changed files with 18 additions and 5 deletions

View File

@ -45,7 +45,8 @@ vim.o.mousemodel = extend
require"pack-impatient" require"pack-impatient"
vim.cmd("packadd plenary") vim.cmd("packadd plenary")
require"pack-onedark" require"theme"
require"pack-dirdiff" require"pack-dirdiff"
require"pack-easy-align" require"pack-easy-align"
require"pack-indent-blankline" require"pack-indent-blankline"

View File

@ -0,0 +1,5 @@
vim.cmd("packadd onedark")
require"onedark".setup {
style = "dark"
}
require"onedark".load()

@ -0,0 +1 @@
Subproject commit d4a85643a465f5fae2113d07d22d021d4af4795a

@ -0,0 +1 @@
Subproject commit 89dde4963ad198c9b6144dee3d5e8bcbb7559ddc

1
.config/zsh/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.zcompdump*

View File

@ -7,9 +7,9 @@ alias vi='$EDITOR'
# conf # conf
alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
alias viconf='$EDITOR $XDG_CONFIG_HOME/nvim' alias viconf='(cd $XDG_CONFIG_HOME/nvim && $EDITOR .)'
alias wconf='$EDITOR $HOME/.config/awesome' alias wconf='(cd $HOME/.config/awesome && $EDITOR .)'
alias zshconf='$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc' alias zshconf='(cd $ZDOTDIR/ && $EDITOR . && . $ZDOTDIR/.zshrc)'
# dev # dev
alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash' alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
KUBE_PS1_KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" KUBE_PS1_KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}"
KUBE_PS1_KUBECONFIGMD5= KUBE_PS1_KUBECONFIGMD5=
KUBE_PS1_CTX= KUBE_PS1_CTX=

3
.gitmodules vendored
View File

@ -13,6 +13,9 @@
[submodule ".config/nvim/pack/plugins/opt/lspconfig"] [submodule ".config/nvim/pack/plugins/opt/lspconfig"]
path = .config/nvim/pack/plugins/opt/lspconfig path = .config/nvim/pack/plugins/opt/lspconfig
url = https://github.com/neovim/nvim-lspconfig.git url = https://github.com/neovim/nvim-lspconfig.git
[submodule ".config/nvim/pack/plugins/opt/onedark"]
path = .config/nvim/pack/plugins/opt/onedark
url = https://github.com/navarasu/onedark.nvim
[submodule ".config/nvim/pack/plugins/opt/plenary"] [submodule ".config/nvim/pack/plugins/opt/plenary"]
path = .config/nvim/pack/plugins/opt/plenary path = .config/nvim/pack/plugins/opt/plenary
url = https://github.com/nvim-lua/plenary.nvim.git url = https://github.com/nvim-lua/plenary.nvim.git

View File

@ -12,7 +12,7 @@ set_brightness() {
echo "$VAL" > "$FILE" echo "$VAL" > "$FILE"
} }
CUR_FILE=/var/tmp/current_brightness CUR_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/current_brightness"
set +e set +e
CUR="$(cat "$CUR_FILE" || echo 50)" CUR="$(cat "$CUR_FILE" || echo 50)"