From 5b1edf702342178ce66b4184786330ce543d7578 Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Thu, 22 Dec 2022 21:39:38 +0300
Subject: [PATCH] Finally reorganize directory structure

---
 .gitignore                            |  3 +--
 configs/{zshrc => .zshrc}             |  3 +--
 configs/{ => alacritty}/alacritty.yml |  0
 configs/{mako => mako/config}         |  6 +++---
 configs/{nvim.vim => nvim/init.vim}   |  0
 tools/relink.sh                       | 24 +++++++++---------------
 6 files changed, 14 insertions(+), 22 deletions(-)
 rename configs/{zshrc => .zshrc} (97%)
 rename configs/{ => alacritty}/alacritty.yml (100%)
 rename configs/{mako => mako/config} (58%)
 rename configs/{nvim.vim => nvim/init.vim} (100%)

diff --git a/.gitignore b/.gitignore
index c9d5b3c..2c0eecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 
-i3MATE/.DS_Store
 .DS_Store
 
-oh-my-zsh
\ No newline at end of file
+oh-my-zsh
diff --git a/configs/zshrc b/configs/.zshrc
similarity index 97%
rename from configs/zshrc
rename to configs/.zshrc
index bedc923..1886357 100644
--- a/configs/zshrc
+++ b/configs/.zshrc
@@ -24,7 +24,6 @@ stats () {
 	printf "\e[0;34mswap usage:\e[m\t${USEDSWAP}\n"
 	printf "\e[0;34muptime:\e[m\t\t${UPTIME}\n"
 }
-stats
 
 source $ZSH/oh-my-zsh.sh
 source $HOME/.profile
@@ -33,4 +32,4 @@ alias vi="nvim"
 alias vim="nvim"
 alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh"
 alias timestamp='date -u +%FT%TZ'
-
+alias yt-dlp-opus="yt-dlp -f 251 -x"
diff --git a/configs/alacritty.yml b/configs/alacritty/alacritty.yml
similarity index 100%
rename from configs/alacritty.yml
rename to configs/alacritty/alacritty.yml
diff --git a/configs/mako b/configs/mako/config
similarity index 58%
rename from configs/mako
rename to configs/mako/config
index 2f02c5a..b873e54 100644
--- a/configs/mako
+++ b/configs/mako/config
@@ -2,8 +2,8 @@ anchor=top-right
 default-timeout=10000
 width=300
 font=JetBrains Mono 8
-background-color=#002b36FF
-text-color=#839496FF
-border-color=#073642FF
+background-color=#24273AFF
+text-color=#CAD3F5
+border-color=#494D64FF
 height=500
 border-radius=10
diff --git a/configs/nvim.vim b/configs/nvim/init.vim
similarity index 100%
rename from configs/nvim.vim
rename to configs/nvim/init.vim
diff --git a/tools/relink.sh b/tools/relink.sh
index 09ce52a..5cb2bf5 100755
--- a/tools/relink.sh
+++ b/tools/relink.sh
@@ -4,18 +4,12 @@
 # do not run manually
 
 mkdir -p $HOME/.config/nvim $HOME/.config/alacritty $HOME/.config/mako >/dev/null 2>&1
-rm -rf $HOME/.zshrc $HOME/.config/nvim/init.vim $HOME/.config/qt5ct $HOME/.config/alacritty/alacritty.yml $HOME/.config/sway $HOME/.config/waybar $HOME/.config/mako/config  >/dev/null 2>&1
-ln -s $HOME/.dotfiles/configs/zshrc $HOME/.zshrc
-echo ".zshrc linked: $HOME/.dotfiles/configs/zshrc -> $HOME/.zshrc"
-ln -s $HOME/.dotfiles/configs/.profile $HOME/.profile
-echo ".profile linked $HOME/.dotfiles/configs/.profile -> $HOME/.profile"
-ln -s $HOME/.dotfiles/configs/nvim.vim $HOME/.config/nvim/init.vim
-echo "neovim config linked: $HOME/.dotfiles/configs/nvim.vim -> $HOME/.config/nvim/init.vim"
-ln -s $HOME/.dotfiles/configs/alacritty.yml $HOME/.config/alacritty/alacritty.yml
-echo "alacritty config linked: $HOME/.dotfiles/configs/alacritty.yml -> $HOME/.config/alacritty/alacritty.yml"
-
-ln -s $HOME/.dotfiles/configs/sway $HOME/.config/
-ln -s $HOME/.dotfiles/configs/waybar $HOME/.config/
-ln -s $HOME/.dotfiles/configs/mako $HOME/.config/mako/config
-ln -s $HOME/.dotfiles/configs/qt5ct $HOME/.config/qt5ct
-echo "sway (and all other swaywm, wayland stuff things) dotfiles installed"
+ln -sf $HOME/.dotfiles/configs/.zshrc $HOME/.zshrc
+ln -sf $HOME/.dotfiles/configs/.profile $HOME/.profile
+ln -sF $HOME/.dotfiles/configs/nvim $HOME/.config/
+ln -sF $HOME/.dotfiles/configs/alacritty $HOME/.config/
+ln -sF $HOME/.dotfiles/configs/sway $HOME/.config/
+ln -sF $HOME/.dotfiles/configs/waybar $HOME/.config/
+ln -sF $HOME/.dotfiles/configs/mako $HOME/.config/
+ln -sF $HOME/.dotfiles/configs/qt5ct $HOME/.config/
+echo "Dotfiles linked."