From a450c44376a248d9b280595cdf039d303f47731f Mon Sep 17 00:00:00 2001 From: AngeD Date: Tue, 23 Aug 2022 09:49:22 +0200 Subject: [PATCH 1/2] feat: simplified wconf alias --- .config/zsh/.zsh_aliases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/zsh/.zsh_aliases b/.config/zsh/.zsh_aliases index 0fc166b..d8683a7 100644 --- a/.config/zsh/.zsh_aliases +++ b/.config/zsh/.zsh_aliases @@ -8,7 +8,7 @@ alias sudo='sudo ' alias tmp="cd $(mktemp -d)" alias umnt='sudo umount /mnt -R' alias vi="$EDITOR" -alias wconfig="$EDITOR $HOME/.config/sway" +alias wconf="$EDITOR $HOME/.config/sway" alias zshconf="$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc" function fnalias() { From 718742e531fba227773749e355d124bf3d3e9460 Mon Sep 17 00:00:00 2001 From: AngeD Date: Fri, 26 Aug 2022 10:02:36 +0200 Subject: [PATCH 2/2] feat: remove treesitter-context --- .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 65c87f6..9add383 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 ```