From a72b616209ae7983b9586afef493920db7fd06c4 Mon Sep 17 00:00:00 2001
From: Dmitry Fisenko <fisenkodv@gmail.com>
Date: Thu, 16 Nov 2023 21:52:26 -0500
Subject: [PATCH] refactor: further simplification

---
 .gitignore                                     | 2 +-
 config/nvim/{custom => }/chadrc.lua            | 0
 config/nvim/{custom => }/configs/lspconfig.lua | 0
 config/nvim/{custom => }/configs/null-ls.lua   | 0
 config/nvim/{custom => }/configs/overrides.lua | 0
 config/nvim/{custom => }/highlights.lua        | 0
 config/nvim/{custom => }/init.lua              | 0
 config/nvim/{custom => }/mappings.lua          | 0
 config/nvim/{custom => }/plugins.lua           | 0
 config/zsh/aliases/git.aliases.sh              | 2 --
 scripts/install                                | 2 +-
 11 files changed, 2 insertions(+), 4 deletions(-)
 rename config/nvim/{custom => }/chadrc.lua (100%)
 rename config/nvim/{custom => }/configs/lspconfig.lua (100%)
 rename config/nvim/{custom => }/configs/null-ls.lua (100%)
 rename config/nvim/{custom => }/configs/overrides.lua (100%)
 rename config/nvim/{custom => }/highlights.lua (100%)
 rename config/nvim/{custom => }/init.lua (100%)
 rename config/nvim/{custom => }/mappings.lua (100%)
 rename config/nvim/{custom => }/plugins.lua (100%)

diff --git a/.gitignore b/.gitignore
index e075d75..d173c13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@ config/nvim/plugged
 config/nvim/plugin/packer_compiled.lua
 
 # fish
-config/fish/fish_variables
\ No newline at end of file
+config/fish/fish_variables
diff --git a/config/nvim/custom/chadrc.lua b/config/nvim/chadrc.lua
similarity index 100%
rename from config/nvim/custom/chadrc.lua
rename to config/nvim/chadrc.lua
diff --git a/config/nvim/custom/configs/lspconfig.lua b/config/nvim/configs/lspconfig.lua
similarity index 100%
rename from config/nvim/custom/configs/lspconfig.lua
rename to config/nvim/configs/lspconfig.lua
diff --git a/config/nvim/custom/configs/null-ls.lua b/config/nvim/configs/null-ls.lua
similarity index 100%
rename from config/nvim/custom/configs/null-ls.lua
rename to config/nvim/configs/null-ls.lua
diff --git a/config/nvim/custom/configs/overrides.lua b/config/nvim/configs/overrides.lua
similarity index 100%
rename from config/nvim/custom/configs/overrides.lua
rename to config/nvim/configs/overrides.lua
diff --git a/config/nvim/custom/highlights.lua b/config/nvim/highlights.lua
similarity index 100%
rename from config/nvim/custom/highlights.lua
rename to config/nvim/highlights.lua
diff --git a/config/nvim/custom/init.lua b/config/nvim/init.lua
similarity index 100%
rename from config/nvim/custom/init.lua
rename to config/nvim/init.lua
diff --git a/config/nvim/custom/mappings.lua b/config/nvim/mappings.lua
similarity index 100%
rename from config/nvim/custom/mappings.lua
rename to config/nvim/mappings.lua
diff --git a/config/nvim/custom/plugins.lua b/config/nvim/plugins.lua
similarity index 100%
rename from config/nvim/custom/plugins.lua
rename to config/nvim/plugins.lua
diff --git a/config/zsh/aliases/git.aliases.sh b/config/zsh/aliases/git.aliases.sh
index 1fcda94..5e6280f 100644
--- a/config/zsh/aliases/git.aliases.sh
+++ b/config/zsh/aliases/git.aliases.sh
@@ -21,9 +21,7 @@ alias gpdel="git push --delete"
 alias gpl="git pull"
 alias groot='if [ "`git rev-parse --show-cdup`" != "" ]; then cd `git rev-parse --show-cdup`; fi'
 alias gstu="git status -uno"
-
 alias gswm='git switch $(git_main_branch)'
-
 alias gundo="git reset HEAD~1"
 alias guns="git reset HEAD --"
 
diff --git a/scripts/install b/scripts/install
index cda4d67..3e542b5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -30,7 +30,7 @@ link_config $SOURCE_CONFIG_DIR/fish $TARGET_CONFIG_DIR/fish
 
 # nvim
 link_config $SOURCE_MODULES_DIR/nvchad $TARGET_CONFIG_DIR/nvim
-link_config $SOURCE_CONFIG_DIR/nvim/custom $TARGET_CONFIG_DIR/nvim/lua/custom
+link_config $SOURCE_CONFIG_DIR/nvim $TARGET_CONFIG_DIR/nvim/lua/custom
 
 # tools
 link_config $SOURCE_CONFIG_DIR/htop $TARGET_CONFIG_DIR/htop