Bunch of stuff

Changed scripts location Added loops to the symlinks part of install.sh Now the script copies profile file to /etc/profile
NecRaul · Mar 3, 2024 · dd8fde1 · dd8fde1
1 parent 07e7733
commit dd8fde1
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 23 deletions.
diff --git a/.bashrc b/.bashrc
@@ -122,8 +122,8 @@ export MOZ_USE_XINPUT2="1"
 
 # External sources for bashrc
 source "$XDG_CONFIG_HOME/git/git-prompt.sh"
+source "$XDG_CONFIG_HOME/zoxide/zoxide.sh"
 source "$XDG_DATA_HOME/blesh/ble.sh" --rcfile "$XDG_CONFIG_HOME/blesh/init.sh"
-source "$HOME/.local/bin/zoxide.sh"
 
 # Start a tmux session when bash starts
 if [ -x "$(command -v tmux)" ] && [ -n "${DISPLAY}" ] && [ -z "${TMUX}" ]; then

diff --git a/.local/bin/zoxide.sh → .config/zoxide/zoxide.sh b/.local/bin/zoxide.sh → .config/zoxide/zoxide.sh
diff --git a/.local/bin/convert-to-webm.sh → .local/bin/scripts/convert-to-webm.sh b/.local/bin/convert-to-webm.sh → .local/bin/scripts/convert-to-webm.sh
diff --git a/.local/bin/extract-subs.sh → .local/bin/scripts/extract-subs.sh b/.local/bin/extract-subs.sh → .local/bin/scripts/extract-subs.sh
diff --git a/.local/bin/fzfcode → .local/bin/scripts/fzfcode b/.local/bin/fzfcode → .local/bin/scripts/fzfcode
diff --git a/.local/bin/fzfvim → .local/bin/scripts/fzfvim b/.local/bin/fzfvim → .local/bin/scripts/fzfvim
diff --git a/.local/bin/maimpick → .local/bin/scripts/maimpick b/.local/bin/maimpick → .local/bin/scripts/maimpick
diff --git a/.local/bin/make-single-audio.sh → .local/bin/scripts/make-single-audio.sh b/.local/bin/make-single-audio.sh → .local/bin/scripts/make-single-audio.sh
diff --git a/.local/bin/remove-epoch.sh → .local/bin/scripts/remove-epoch.sh b/.local/bin/remove-epoch.sh → .local/bin/scripts/remove-epoch.sh
diff --git a/.local/bin/remove-filename.sh → .local/bin/scripts/remove-filename.sh b/.local/bin/remove-filename.sh → .local/bin/scripts/remove-filename.sh
diff --git a/.local/bin/rename-anime.sh → .local/bin/scripts/rename-anime.sh b/.local/bin/rename-anime.sh → .local/bin/scripts/rename-anime.sh
diff --git a/.local/bin/set-default-tracks.sh → .local/bin/scripts/set-default-tracks.sh b/.local/bin/set-default-tracks.sh → .local/bin/scripts/set-default-tracks.sh
diff --git a/.local/bin/sysact → .local/bin/scripts/sysact b/.local/bin/sysact → .local/bin/scripts/sysact
diff --git a/.local/bin/toggle-audio-devices.sh → .local/bin/scripts/toggle-audio-devices.sh b/.local/bin/toggle-audio-devices.sh → .local/bin/scripts/toggle-audio-devices.sh
diff --git a/.local/bin/update-pip.sh → .local/bin/scripts/update-pip.sh b/.local/bin/update-pip.sh → .local/bin/scripts/update-pip.sh
diff --git a/.local/bin/zip-manga.sh → .local/bin/scripts/zip-manga.sh b/.local/bin/zip-manga.sh → .local/bin/scripts/zip-manga.sh
diff --git a/install.sh b/install.sh
@@ -146,28 +146,34 @@ install_blesh() {
 create_symlinks() {
     echo "==================================================="
     echo "Creating symlinks."
+    # / #
+    sudo cp -f $(pwd)/profile /etc/profile
+
     # ~ #
     cp -f $(pwd)/.bashrc $HOME/.bashrc
     cp -f $(pwd)/.pypirc $HOME/.pypirc
     # # #
 
     # config #
-    ln -sf $(pwd)/.config/blesh $HOME/.config/blesh
-    ln -sf $(pwd)/.config/czkawka $HOME/.config/czkawka
-    ln -sf $(pwd)/.config/gallery-dl $HOME/.config/gallery-dl
-    ln -sf $(pwd)/.config/lf $HOME/.config/lf
-    ln -sf $(pwd)/.config/mpd $HOME/.config/mpd
-    ln -sf $(pwd)/.config/mpv $HOME/.config/mpv
-    ln -sf $(pwd)/.config/ncmpcpp $HOME/.config/ncmpcpp
-    ln -sf $(pwd)/.config/npm $HOME/.config/npm
-    ln -sf $(pwd)/.config/nvim $HOME/.config/nvim
-    ln -sf $(pwd)/.config/pip $HOME/.config/pip
-    ln -sf $(pwd)/.config/pyNPS $HOME/.config/pyNPS
-    ln -sf $(pwd)/.config/python $HOME/.config/python
-    ln -sf $(pwd)/.config/spectaclerc $HOME/.config/spectaclerc
-    ln -sf $(pwd)/.config/tmux $HOME/.config/tmux
-    ln -sf $(pwd)/.config/wget $HOME/.config/wget
-    ln -sf $(pwd)/.config/zathura $HOME/.config/zathura
+    for item in \
+        ".config/blesh" \
+        ".config/czkawka" \
+        ".config/gallery-dl" \
+        ".config/lf" \
+        ".config/mpd" \
+        ".config/mpv" \
+        ".config/ncmpcpp" \
+        ".config/npm" \
+        ".config/nvim" \
+        ".config/pip" \
+        ".config/pyNPS" \
+        ".config/python" \
+        ".config/tmux" \
+        ".config/wget" \
+        ".config/zathura" \
+        ".config/spectaclerc"; do
+        ln -sf "$(pwd)/$item" "$HOME/$item"
+    done
     # # # # # #
 
     # git #
@@ -177,12 +183,18 @@ create_symlinks() {
     # # # #
 
     # scripts #
-    ln -sf $(pwd)/.local/bin/*.sh $HOME/.local/bin/
-    ln -sf $(pwd)/.local/bin/fzfcode $HOME/.local/bin/
-    ln -sf $(pwd)/.local/bin/fzfvim $HOME/.local/bin/
-    ln -sf $(pwd)/.local/bin/4chan-pywal/4chan-pywal.sh $HOME/.local/bin/
-    ln -sf $(pwd)/.local/bin/pywal-kde-plasma/pywal.sh $HOME/.local/bin/
-    ln -sf $(pwd)/.local/bin/pywal-kde-plasma/zathurarc.template $HOME/.local/bin/
+    dirs=(
+        "$HOME/.local/bin/4chan-pywal"
+        "$HOME/.local/bin/pyupload-devel"
+        "$HOME/.local/bin/pywal-kde"
+        "$HOME/.local/bin/pywal-kde-plasma"
+        "$HOME/.local/bin/scripts"
+        "$HOME/.local/bin/statusbar"
+    )
+    for dir in "${dirs[@]}"; do
+        mkdir -p "$dir"
+        ln -sf "$(pwd)/${dir#$HOME/}/"* "$dir"
+    done
     # # # # # #
 
     echo "==================================================="