From e1ee733461b8cccfd79658fc18cd46f8e60c7888 Mon Sep 17 00:00:00 2001 From: AngeD Date: Thu, 25 Aug 2022 17:07:17 +0200 Subject: [PATCH 1/8] merge: main --- .config/nvim/pack/plugins/opt/nvim-lspconfig | 2 +- .config/zsh/.zshrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index 4d61f9e..bdfcca4 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 4d61f9ecce8309331f71317b13e574a27916f54b +Subproject commit bdfcca4af7ac8171e6d4ae4b375aad61ff747429 diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 0eab4aa..9f9188c 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -28,7 +28,7 @@ CASE_SENSITIVE="true" # HYPHEN_INSENSITIVE="true" # Uncomment one of the following lines to change the auto-update behavior -# zstyle ':omz:update' mode disabled # disable automatic updates +zstyle ':omz:update' mode disabled # disable automatic updates # zstyle ':omz:update' mode auto # update automatically without asking # zstyle ':omz:update' mode reminder # just remind me to update when it's time From 17ffc9070372938445d23b1357f4936388eaecc6 Mon Sep 17 00:00:00 2001 From: AngeD Date: Thu, 25 Aug 2022 17:08:39 +0200 Subject: [PATCH 2/8] fix: gitmodules order --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 65c87f6..03d30a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,12 +16,12 @@ [submodule ".config/nvim/pack/plugins/opt/vim-dirdiff"] path = .config/nvim/pack/plugins/opt/vim-dirdiff url = https://github.com/will133/vim-dirdiff.git +[submodule ".config/nvim/pack/plugins/opt/vim-easy-align"] + path = .config/nvim/pack/plugins/opt/vim-easy-align + url = https://github.com/junegunn/vim-easy-align.git [submodule ".config/zsh/ohmyzsh"] path = .config/zsh/ohmyzsh url = https://github.com/ohmyzsh/ohmyzsh.git [submodule ".pyenv"] path = .pyenv url = https://github.com/pyenv/pyenv.git -[submodule ".config/nvim/pack/plugins/opt/vim-easy-align"] - path = .config/nvim/pack/plugins/opt/vim-easy-align - url = https://github.com/junegunn/vim-easy-align.git From 9414931c6703853ccd0b1ae27703f3b29bb42a65 Mon Sep 17 00:00:00 2001 From: AngeD Date: Fri, 26 Aug 2022 10:05:40 +0200 Subject: [PATCH 3/8] merge: main --- .config/nvim/init.lua | 4 ---- .config/nvim/pack/plugins/opt/nvim-lspconfig | 2 +- .config/nvim/pack/plugins/opt/nvim-treesitter | 2 +- .../nvim/pack/plugins/opt/nvim-treesitter-context | 1 - .gitmodules | 3 --- README.md | 14 +++++++------- 6 files changed, 9 insertions(+), 17 deletions(-) delete mode 160000 .config/nvim/pack/plugins/opt/nvim-treesitter-context diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 98318f7..2cf280b 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -5,10 +5,6 @@ require'nvim-treesitter.configs'.setup { highlight = {enable = true}, indent = {enable = true}, } -vim.cmd("packadd nvim-treesitter-context") -require'treesitter-context'.setup { - enable = true, -} vim.cmd("packadd black") diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index bdfcca4..520c609 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit bdfcca4af7ac8171e6d4ae4b375aad61ff747429 +Subproject commit 520c609210029e901b433c49e7c1e00dd247b47a diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index c170310..840994d 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit c170310534b1c037c2173c3bcb000bd60eb25069 +Subproject commit 840994db95313b97328f33b772cc18081baf461f diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter-context b/.config/nvim/pack/plugins/opt/nvim-treesitter-context deleted file mode 160000 index 8e88b67..0000000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter-context +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8e88b67d0dc386d6ba1b3d09c206f19a50bc0625 diff --git a/.gitmodules b/.gitmodules index 03d30a5..214ae82 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"] path = .config/nvim/pack/plugins/opt/nvim-treesitter url = https://github.com/nvim-treesitter/nvim-treesitter.git -[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter-context"] - path = .config/nvim/pack/plugins/opt/nvim-treesitter-context - url = https://github.com/nvim-treesitter/nvim-treesitter-context.git [submodule ".config/nvim/pack/plugins/opt/vim-dirdiff"] path = .config/nvim/pack/plugins/opt/vim-dirdiff url = https://github.com/will133/vim-dirdiff.git diff --git a/README.md b/README.md index 47259dd..0cc6d64 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,18 @@ To clone the repo : ```console -# pacman -Syu --needed zsh sway firefox alacritty neovim +pacman -Syu --needed zsh sway firefox alacritty neovim -$ git clone --bare https://github.com/AustralEpitech/.dotfiles.git ~/.dotfiles -$ alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' +git clone --bare https://github.com/AustralEpitech/.dotfiles.git ~/.dotfiles +alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' -$ config checkout # remove conflicted files and re-run the command +config checkout # remove conflicted files and re-run the command -$ config submodule update --init --recursive --remote -$ config config status.showUntrackedFiles no +config submodule update --init --recursive --remote +config config status.showUntrackedFiles no ``` To update submodules: ``` -$ config submodule update --recursive --remote +config submodule update --recursive --remote ``` From b7ace482eea87f21f0aa912ae659014567101f7c Mon Sep 17 00:00:00 2001 From: AngeD Date: Fri, 26 Aug 2022 16:44:18 +0200 Subject: [PATCH 4/8] feat: verbose comments, remove vim greppgr, au clean trailing whitespaces and treesitter bugged indent --- .config/nvim/init.lua | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 2cf280b..06d837f 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -3,7 +3,6 @@ vim.cmd("packadd nvim-treesitter") require'nvim-treesitter.configs'.setup { auto_install = true, highlight = {enable = true}, - indent = {enable = true}, } vim.cmd("packadd black") @@ -19,10 +18,11 @@ vim.cmd("packadd nvim-lspconfig") vim.cmd("packadd vim-dirdiff") vim.cmd("packadd vim-easy-align") -vim.keymap.set("n", "ga", "(EasyAlign)") +vim.keymap.set("n", "ga", "(EasyAlign)") vim.keymap.set("x", "ga", "(EasyAlign)") -- variables +vim.g.mapleader = " " vim.o.path = vim.o.path .. ",**" vim.o.expandtab = true vim.o.smartindent = true @@ -37,17 +37,23 @@ vim.o.mouse = "a" vim.o.suffixes = vim.o.suffixes .. ",.pyc" vim.o.foldmethod = "indent" vim.o.foldlevel = 99 -vim.o.grepprg = "grep -rn $*" vim.wo.cc = "80" -vim.cmd("au BufWrite * :%s/\\s\\+$//e") -- keybindings -vim.keymap.set("t", "", "") +-- (mode, key, command ) -vim.keymap.set("n", "", "h" ) -vim.keymap.set("n", "", "j" ) -vim.keymap.set("n", "", "k" ) -vim.keymap.set("n", "", "l" ) +-- terminal escape key +vim.keymap.set("t", "", "" ) -vim.keymap.set("n", "gf", "gF" ) +-- movement keys +vim.keymap.set("n", "", "h" ) +vim.keymap.set("n", "", "j" ) +vim.keymap.set("n", "", "k" ) +vim.keymap.set("n", "", "l" ) + +-- go to file:line instead of just file +vim.keymap.set("n", "gf", "gF" ) + +-- remove trailing whitespaces +vim.keymap.set("n", "w", ":%s/\\s\\+$//e") From b98cd1213e6601fc21124a883f911dcef2cd3c18 Mon Sep 17 00:00:00 2001 From: AngeD Date: Tue, 30 Aug 2022 09:41:45 +0200 Subject: [PATCH 5/8] feat: remove kitty config --- .config/kitty/kitty.conf | 8 -------- .config/nvim/pack/plugins/opt/nvim-treesitter | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 .config/kitty/kitty.conf diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf deleted file mode 100644 index d4922b2..0000000 --- a/.config/kitty/kitty.conf +++ /dev/null @@ -1,8 +0,0 @@ -update_check_interval 0 - -font_family DejaVuSansMono Nerd Font Mono -font_size 14.0 - -background_opacity 0.8 - -enable_audio_bell no diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index f3c53d2..f0c9a18 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit f3c53d225ada93a99bfd818e1c40012400e2dc55 +Subproject commit f0c9a186eab06d7e4dcd78c973dcb60b702ac5d2 From dc1c002082a5fe27f758f9889e81d8762b923c0d Mon Sep 17 00:00:00 2001 From: AngeD Date: Tue, 30 Aug 2022 09:47:48 +0200 Subject: [PATCH 6/8] style: remove empty line --- .config/nvim/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 06d837f..23143a6 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -39,7 +39,6 @@ vim.o.foldmethod = "indent" vim.o.foldlevel = 99 vim.wo.cc = "80" - -- keybindings -- (mode, key, command ) From 37a023500a080a6a0bd68c5333ba153185e6762b Mon Sep 17 00:00:00 2001 From: AngeD Date: Wed, 31 Aug 2022 22:16:04 +0200 Subject: [PATCH 7/8] merge: main --- .config/zsh/.docker_aliases | 15 +++++++++++++++ bin/dkpurge | 20 +++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.config/zsh/.docker_aliases b/.config/zsh/.docker_aliases index c5dae4f..903694d 100644 --- a/.config/zsh/.docker_aliases +++ b/.config/zsh/.docker_aliases @@ -21,6 +21,8 @@ alias dkils='docker image ls' alias dkilsa='docker image ls -a' alias dkilsaq='docker image ls -a -q' alias dkilsq='docker image ls -q' +alias dkip='docker image prune' +alias dkipf='docker image prune -f' alias dkirm='docker image rm' alias dkirmf='docker image rm -f' alias dkl='docker pull' @@ -33,9 +35,22 @@ alias dkvc='docker volume create' alias dkvi='docker volume inspect' alias dkvls='docker volume ls' alias dkvlsq='docker volume ls -q' +alias dkvp='docker volume prune' +alias dkvpf='docker volume prune -f' alias dkvrm='docker volume rm' alias dkvrmf='docker volume rm -f' +# networks +alias dkn='docker network' +alias dknc='docker network create' +alias dkni='docker network inspect' +alias dknls='docker network ls' +alias dknlsq='docker network ls -q' +alias dknp='docker network prune' +alias dknpf='docker network prune -f' +alias dknrm='docker network rm' +alias dknrmf='docker network rm -f' + # docker-compose alias dc='docker-compose' alias dcd='docker-compose down' diff --git a/bin/dkpurge b/bin/dkpurge index 54068eb..aef68e2 100755 --- a/bin/dkpurge +++ b/bin/dkpurge @@ -7,8 +7,9 @@ if [ "$?" != 0 ] && [ "$EUID" != 0 ]; then exit fi -VOL="$(docker volume ls -q 2> /dev/null)" -IMG="$(docker images -q 2> /dev/null)" +VOL="$(docker volume ls -q 2> /dev/null)" +IMG="$(docker images -q 2> /dev/null)" +NET="$(docker network ls -q 2> /dev/null)" if [ -n "$PS" ]; then @@ -41,7 +42,7 @@ fi if [ -n "$IMG" ]; then echo - docker images + docker image ls echo -n "Prune Images? [Y/n/a] " read -r ANS @@ -54,3 +55,16 @@ if [ -n "$IMG" ]; then ;; esac fi + +if [ -n "$NET" ]; then + echo + docker network ls + + echo -n "Prune Networks? [Y/n/a] " + read -r ANS + case "${ANS,,}" in + 'y'|'yes'|'a'|'all'|'') + docker network prune -f + ;; + esac +fi From c2ef4b999daf4c88f9b03acf46a7e91f12a2479c Mon Sep 17 00:00:00 2001 From: AngeD Date: Thu, 1 Sep 2022 09:39:35 +0200 Subject: [PATCH 8/8] feat: vim grepprg recursive --- .config/nvim/init.lua | 1 + .config/nvim/pack/plugins/opt/black | 2 +- .config/nvim/pack/plugins/opt/nvim-lspconfig | 2 +- .config/nvim/pack/plugins/opt/nvim-treesitter | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 23143a6..cf9e0c4 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -37,6 +37,7 @@ vim.o.mouse = "a" vim.o.suffixes = vim.o.suffixes .. ",.pyc" vim.o.foldmethod = "indent" vim.o.foldlevel = 99 +vim.o.grepprg = "grep -rn" vim.wo.cc = "80" -- keybindings diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black index c0cc19b..095fe0d 160000 --- a/.config/nvim/pack/plugins/opt/black +++ b/.config/nvim/pack/plugins/opt/black @@ -1 +1 @@ -Subproject commit c0cc19b5b3371842d696875897bebefebd5e1596 +Subproject commit 095fe0d649541636d7011e779214a146b4f32895 diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index 636ce36..df17834 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 636ce36c30725391486377850bf8460dc0723ae2 +Subproject commit df17834baeba1b8425c15a31cbf52e6b23115c37 diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index f0c9a18..ed89f08 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit f0c9a186eab06d7e4dcd78c973dcb60b702ac5d2 +Subproject commit ed89f08a491ccd2c08f6256371f8fbf24c73e969