From 71d62725b8c3a5fa95464b3c23cd1878b8f3ef4a Mon Sep 17 00:00:00 2001
From: Guusvanmeerveld <mail@guusvanmeerveld.dev>
Date: Sat, 11 Jun 2022 17:30:48 +0200
Subject: [PATCH] Rename scripts + fix permissions for vim script

---
 dotfiles                                | 6 +++---
 install.conf.yaml                       | 2 +-
 install_scripts/install-applications    | 2 +-
 install_scripts/post-install            | 8 ++++----
 scripts/{chaotic-aur.sh => chaotic-aur} | 2 ++
 scripts/{chuser.sh => chuser}           | 2 ++
 scripts/{install-vim.sh => install-vim} | 2 ++
 scripts/{install_yay.sh => install-yay} | 2 ++
 scripts/{install-z.sh => install-zsh}   | 2 ++
 scripts/{set_locale.sh => set-locale}   | 2 ++
 10 files changed, 21 insertions(+), 9 deletions(-)
 rename scripts/{chaotic-aur.sh => chaotic-aur} (81%)
 rename scripts/{chuser.sh => chuser} (68%)
 rename scripts/{install-vim.sh => install-vim} (92%)
 mode change 100644 => 100755
 rename scripts/{install_yay.sh => install-yay} (94%)
 rename scripts/{install-z.sh => install-zsh} (98%)
 rename scripts/{set_locale.sh => set-locale} (88%)

diff --git a/dotfiles b/dotfiles
index 66f3666..18b0323 100755
--- a/dotfiles
+++ b/dotfiles
@@ -34,11 +34,11 @@ case $1 in
 
         $ROOT/install -c "$DOTFILES/install-server.yaml"
 
-        $ROOT/scripts/install-z.sh
+        $ROOT/scripts/install-zsh
 
-        $ROOT/scripts/chuser.sh
+        $ROOT/scripts/chuser
 
-        $ROOT/scripts/install-vim.sh
+        $ROOT/scripts/install-vim
     ;;
 
     *)
diff --git a/install.conf.yaml b/install.conf.yaml
index 441b3cd..d5da132 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -36,7 +36,7 @@
 
 - shell:
     - [git submodule update --init --recursive, Installing submodules]
-    - [scripts/install_yay.sh, Installing yay]
+    - [scripts/install-yay, Installing yay]
     # - [scripts/ungoogled_chromium, Setting up ungoogled chromium repo]
 
 - create:
diff --git a/install_scripts/install-applications b/install_scripts/install-applications
index 7f81f95..f6731d1 100755
--- a/install_scripts/install-applications
+++ b/install_scripts/install-applications
@@ -11,4 +11,4 @@ sudo systemctl enable --now syncthing@$USER
 # Docker
 sudo usermod -aG docker $USER
 
-$SCRIPTS/install-vim.sh
+$ROOT/scripts/install-vim
diff --git a/install_scripts/post-install b/install_scripts/post-install
index 4bc7189..ca4b85b 100755
--- a/install_scripts/post-install
+++ b/install_scripts/post-install
@@ -13,12 +13,12 @@ sudo systemctl enable ly
 micro -plugin install quoter filemanager
 
 # ZSH
-$ROOT/scripts/install-z.sh
+$ROOT/scripts/install-zsh
 
-$ROOT/scripts/chaotic-aur.sh
+$ROOT/scripts/chaotic-aur
 
 # Update user
-$ROOT/scripts/chuser.sh
+$ROOT/scripts/chuser
 
 # Set locale
-$ROOT/scripts/set_locale.sh
+$ROOT/scripts/set-locale
diff --git a/scripts/chaotic-aur.sh b/scripts/chaotic-aur
similarity index 81%
rename from scripts/chaotic-aur.sh
rename to scripts/chaotic-aur
index 204cbfa..4d45b4d 100755
--- a/scripts/chaotic-aur.sh
+++ b/scripts/chaotic-aur
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 sudo pacman-key --recv-key FBA220DFC880C036 --keyserver keyserver.ubuntu.com
 sudo pacman-key --lsign-key FBA220DFC880C036
 sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
\ No newline at end of file
diff --git a/scripts/chuser.sh b/scripts/chuser
similarity index 68%
rename from scripts/chuser.sh
rename to scripts/chuser
index c3024d6..a832e19 100755
--- a/scripts/chuser.sh
+++ b/scripts/chuser
@@ -1 +1,3 @@
+#!/bin/bash
+
 sudo chsh -s /bin/zsh $USER
diff --git a/scripts/install-vim.sh b/scripts/install-vim
old mode 100644
new mode 100755
similarity index 92%
rename from scripts/install-vim.sh
rename to scripts/install-vim
index 31b7527..09254f5
--- a/scripts/install-vim.sh
+++ b/scripts/install-vim
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Neovim
 sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
        https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
diff --git a/scripts/install_yay.sh b/scripts/install-yay
similarity index 94%
rename from scripts/install_yay.sh
rename to scripts/install-yay
index 44ef20c..c50bccd 100755
--- a/scripts/install_yay.sh
+++ b/scripts/install-yay
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Download
 git -C /tmp/yay pull || git clone https://aur.archlinux.org/yay /tmp/yay/
 
diff --git a/scripts/install-z.sh b/scripts/install-zsh
similarity index 98%
rename from scripts/install-z.sh
rename to scripts/install-zsh
index 6c0225e..e6e5275 100755
--- a/scripts/install-z.sh
+++ b/scripts/install-zsh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install ohmyzsh
 if [ -d "$ZSH" ]; then
 	echo "ohmyzsh is installed"
diff --git a/scripts/set_locale.sh b/scripts/set-locale
similarity index 88%
rename from scripts/set_locale.sh
rename to scripts/set-locale
index 5f6dccf..e5ba608 100755
--- a/scripts/set_locale.sh
+++ b/scripts/set-locale
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 sudo echo 'en_NL.UTF-8' > /etc/locale.gen
 
 sudo locale-gen