Commit 2.5.1
This commit is contained in:
+10
-6
@@ -4,7 +4,7 @@
|
||||
|
||||
datets=$(date '+%Y%m%d%H%M%S')
|
||||
if [ -d ~/dotfiles ] || [ -f ~/.bashrc ]; then
|
||||
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
____ _
|
||||
| __ ) __ _ ___| | ___ _ _ __
|
||||
@@ -14,13 +14,17 @@ ____ _
|
||||
|_|
|
||||
|
||||
EOF
|
||||
echo -e "${NONE}"
|
||||
if [ -d ~/dotfiles ]; then
|
||||
echo "The script has detected an existing dotfiles folder and will try to create a backup into the folder ~/dotfiles-versions/backups/$datets"
|
||||
echo "The script has detected an existing dotfiles folder and will try to create a backup into the folder:"
|
||||
echo "~/dotfiles-versions/backups/$datets"
|
||||
echo ""
|
||||
fi
|
||||
if [ -f ~/.bashrc ]; then
|
||||
echo "The script has detected an existing .bashrc file and will try to create a backup ~/dotfiles-versions/backups/$datets/.bashrc-old"
|
||||
if [ ! -L ~/.bashrc ] && [ -f ~/.bashrc ]; then
|
||||
echo "The script has detected an existing .bashrc file and will try to create a backup to:"
|
||||
echo "~/dotfiles-versions/backups/$datets/.bashrc-old"
|
||||
echo ""
|
||||
fi
|
||||
echo ""
|
||||
while true; do
|
||||
read -p "Do you want to proceed? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
@@ -38,7 +42,7 @@ EOF
|
||||
echo "~/dotfiles-versions/backups/$datets created"
|
||||
fi
|
||||
if [ -d ~/dotfiles ]; then
|
||||
cp -r ~/dotfiles ~/dotfiles-versions/backups/$datets
|
||||
rsync -a ~/dotfiles/ ~/dotfiles-versions/backups/$datets/
|
||||
echo "Backup of your current dotfiles in ~/dotfiles-versions/backups/$datets created."
|
||||
fi
|
||||
if [ -f ~/.bashrc ]; then
|
||||
|
||||
+9
-6
@@ -1,6 +1,7 @@
|
||||
# ------------------------------------------------------
|
||||
# Install .bashrc
|
||||
# ------------------------------------------------------
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
_ _
|
||||
| |__ __ _ ___| |__ _ __ ___
|
||||
@@ -9,17 +10,19 @@ cat <<"EOF"
|
||||
(_)_.__/ \__,_|___/_| |_|_| \___|
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
while true; do
|
||||
if [ -f ~/.bashrc ]; then
|
||||
echo "The script has detected an existing .bashrc file. "
|
||||
if [ ! -L ~/.bashrc ] && [ -f ~/.bashrc ]; then
|
||||
echo "PLEASE NOTE AGAIN: The script has detected an existing .bashrc file."
|
||||
fi
|
||||
if [ -f ~/dotfiles-versions/backups/$datets/.bashrc-old ]; then
|
||||
echo "Backup is available here ~/dotfiles-versions/backups/$datets/.bashrc-old"
|
||||
echo "Backup is already available here ~/dotfiles-versions/backups/$datets/.bashrc-old"
|
||||
fi
|
||||
if [ -f ~/.bashrc ]; then
|
||||
if [ ! -L ~/.bashrc ] && [ -f ~/.bashrc ]; then
|
||||
echo ""
|
||||
echo "Do you want to replace your existing .bashrc file with the dotfiles .bashrc file?"
|
||||
else
|
||||
echo ""
|
||||
echo "Do you want to install the dotfiles .bashrc file now?"
|
||||
fi
|
||||
read -p "Please confirm (Yy/Nn): " yn
|
||||
@@ -28,7 +31,7 @@ while true; do
|
||||
_installSymLink .bashrc ~/.bashrc ~/dotfiles/.bashrc ~/.bashrc
|
||||
break;;
|
||||
[Nn]* )
|
||||
echo "Installation skipped."
|
||||
echo "Installation of the .bashrc file skipped."
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
RED='\033[0;31m' #'0;31' is Red
|
||||
GREEN='\033[0;32m' #'0;32' is Green
|
||||
YELLOW='\033[1;32m' #'1;32' is Yellow
|
||||
BLUE='\033[0;34m' #'0;34' is Blue
|
||||
NONE='\033[0m' # NO COLOR
|
||||
@@ -5,7 +5,6 @@
|
||||
echo "IMPORTANT: Please make sure that your system and your packages are up to date."
|
||||
echo "You can cancel the installation at any time with CMD + C"
|
||||
echo ""
|
||||
|
||||
SCRIPT=$(realpath "$0")
|
||||
SCRIPTPATH=$(dirname "$SCRIPT")
|
||||
if [ $SCRIPTPATH = "/home/$USER/dotfiles" ]; then
|
||||
|
||||
+36
-5
@@ -1,6 +1,8 @@
|
||||
# ------------------------------------------------------
|
||||
# Copy dotfiles
|
||||
# ------------------------------------------------------
|
||||
if [ ! -d ~/dotfiles ]; then
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
___ _ _ _ _ _ __ _ _
|
||||
|_ _|_ __ ___| |_ __ _| | | __| | ___ | |_ / _(_) | ___ ___
|
||||
@@ -8,24 +10,54 @@ cat <<"EOF"
|
||||
| || | | \__ \ || (_| | | | | (_| | (_) | |_| _| | | __/\__ \
|
||||
|___|_| |_|___/\__\__,_|_|_| \__,_|\___/ \__|_| |_|_|\___||___/
|
||||
|
||||
EOF
|
||||
echo -e "${NONE}"
|
||||
else
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
_ _ _ _ _ _ __ _ _
|
||||
| | | |_ __ __| | __ _| |_ ___ __| | ___ | |_ / _(_) | ___ ___
|
||||
| | | | '_ \ / _` |/ _` | __/ _ \ / _` |/ _ \| __| |_| | |/ _ \/ __|
|
||||
| |_| | |_) | (_| | (_| | || __/ | (_| | (_) | |_| _| | | __/\__ \
|
||||
\___/| .__/ \__,_|\__,_|\__\___| \__,_|\___/ \__|_| |_|_|\___||___/
|
||||
|_|
|
||||
|
||||
EOF
|
||||
echo -e "${NONE}"
|
||||
fi
|
||||
if [ ! -d ~/dotfiles ]; then
|
||||
echo "The script will now remove existing directories and files from ~/.config/"
|
||||
echo "and copy your prepared configuration from ~/dotfiles-versions/$version to ~/dotfiles"
|
||||
echo "Symbolic links will then be created from ~/dotfiles into your ~/.config/ directory."
|
||||
echo "PLEASE BACKUP YOUR EXISTING CONFIGURATIONS IF NEEDED in .config"
|
||||
echo ""
|
||||
echo "Symbolic links will then be created from ~/dotfiles into your ~/.config/ directory."
|
||||
echo ""
|
||||
fi
|
||||
if [[ ! $(tty) == *"pts"* ]] && [ -d ~/dotfiles ]; then
|
||||
echo "You're running the script in tty. You can delete the existing ~/dotfiles folder now for a clean installation."
|
||||
echo "If not, the script will overwrite existing files but will not remove additional files or folders of your custom configuration."
|
||||
echo ""
|
||||
else
|
||||
if [ -d ~/dotfiles ]; then
|
||||
echo "The script will overwrite existing files but will not remove additional files or folders of your custom configuration."
|
||||
fi
|
||||
fi
|
||||
if [ ! -d ~/dotfiles ]; then
|
||||
echo "PLEASE BACKUP YOUR EXISTING CONFIGURATIONS in .config IF NEEDED!"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
while true; do
|
||||
read -p "Do you want to install the dotfiles now? (Yy/Nn): " yn
|
||||
read -p "Do you want to install the prepared dotfiles now? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
if [ ! $mode == "dev" ]; then
|
||||
echo "Copy started"
|
||||
if [ ! -d ~/dotfiles ]; then
|
||||
mkdir ~/dotfiles
|
||||
echo "~/dotfiles folder created."
|
||||
fi
|
||||
cp -rf ~/dotfiles-versions/$version/. ~/dotfiles/
|
||||
rsync -a ~/dotfiles-versions/$version/ ~/dotfiles/
|
||||
echo "All files from ~/dotfiles-versions/$version/ to ~/dotfiles/ copied."
|
||||
else
|
||||
echo "Skipped: DEV MODE!"
|
||||
fi
|
||||
@@ -37,4 +69,3 @@ while true; do
|
||||
esac
|
||||
done
|
||||
echo ""
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# ------------------------------------------------------
|
||||
disman=0
|
||||
if [ -f /etc/systemd/system/display-manager.service ]; then
|
||||
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
___ _ _
|
||||
|_ _|_ __ ___ _ __ ___ _ __| |_ __ _ _ __ | |_
|
||||
@@ -13,7 +13,7 @@ cat <<"EOF"
|
||||
|_|
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
echo "An active display manager has been dedected."
|
||||
echo ""
|
||||
if [ $profile == "Hyprland" ]; then
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
.gitignore
|
||||
.git
|
||||
.install
|
||||
README.md
|
||||
CHANGELOG
|
||||
LICENSE
|
||||
install.sh
|
||||
@@ -20,4 +20,6 @@ if [ ! $mode == "dev" ]; then
|
||||
_installSymLink gtk-4.0 ~/.config/gtk-4.0 ~/dotfiles/gtk/gtk-4.0/ ~/.config/
|
||||
else
|
||||
echo "Skipped: DEV MODE!"
|
||||
fi
|
||||
fi
|
||||
echo "Symbolic links created."
|
||||
echo ""
|
||||
@@ -32,7 +32,6 @@ packagesPacman=(
|
||||
"polkit-gnome"
|
||||
"hyprland"
|
||||
"xdg-desktop-portal"
|
||||
"xdg-desktop-portal-wlr"
|
||||
"xdg-desktop-portal-hyprland"
|
||||
"waybar"
|
||||
"grim"
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
_ _ _ _
|
||||
| | | |_ _ _ __ _ __| | __ _ _ __ __| |
|
||||
@@ -7,3 +8,4 @@ cat <<"EOF"
|
||||
|___/|_|
|
||||
|
||||
EOF
|
||||
echo -e "${NONE}"
|
||||
@@ -2,7 +2,12 @@
|
||||
# init pywal with default wallpaper
|
||||
# ------------------------------------------------------
|
||||
|
||||
_installSymLink wal ~/.config/wal ~/dotfiles/wal/ ~/.config
|
||||
wal -i ~/dotfiles/wallpapers/default.jpg
|
||||
echo "Pywal and templates initiated!"
|
||||
echo ""
|
||||
if [ ! -f ~/.cache/wal/colors-hyprland.conf ]; then
|
||||
_installSymLink wal ~/.config/wal ~/dotfiles/wal/ ~/.config
|
||||
wal -i ~/dotfiles/wallpapers/default.jpg
|
||||
echo "Pywal and templates activated."
|
||||
echo ""
|
||||
else
|
||||
echo "Pywal already activated."
|
||||
echo ""
|
||||
fi
|
||||
@@ -1,7 +1,7 @@
|
||||
# ------------------------------------------------------
|
||||
# Install required packages
|
||||
# ------------------------------------------------------
|
||||
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
___ _ _ _ _
|
||||
|_ _|_ __ ___| |_ __ _| | | _ __ __ _ ___| | ____ _ __ _ ___ ___
|
||||
@@ -11,7 +11,7 @@ cat <<"EOF"
|
||||
|_| |___/
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
_installPackagesPacman "${packagesPacman[@]}";
|
||||
_installPackagesYay "${packagesYay[@]}";
|
||||
echo ""
|
||||
@@ -3,6 +3,7 @@
|
||||
# ------------------------------------------------------
|
||||
|
||||
if [ $disman == 1 ]; then
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
_____ _______ __ _ _
|
||||
|_ _|_ _\ \ / / | | ___ __ _(_)_ __
|
||||
@@ -12,6 +13,7 @@ cat <<"EOF"
|
||||
|___/
|
||||
|
||||
EOF
|
||||
echo -e "${NONE}"
|
||||
while true; do
|
||||
read -p "Do you want to install the custom tty login issue (Yy/Nn): " yn
|
||||
case $yn in
|
||||
|
||||
+8
-42
@@ -1,7 +1,7 @@
|
||||
# ------------------------------------------------------
|
||||
# Prepare dotfiles
|
||||
# ------------------------------------------------------
|
||||
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
____ _ _
|
||||
| _ \ _ __ ___ _ __ __ _ _ __ __ _| |_(_) ___ _ __
|
||||
@@ -11,7 +11,7 @@ cat <<"EOF"
|
||||
|_|
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
echo "Preparing temporary folders for the installation."
|
||||
echo ""
|
||||
if [ ! -d ~/dotfiles-versions ]; then
|
||||
@@ -22,47 +22,13 @@ if [ ! -d ~/dotfiles-versions/$version ]; then
|
||||
mkdir ~/dotfiles-versions/$version
|
||||
echo "~/dotfiles-versions/$version folder created."
|
||||
else
|
||||
echo "The folder ~/dotfiles-versions/$version already exists."
|
||||
echo "Do you want to create a clean build of version $version and "
|
||||
while true; do
|
||||
read -p "and replace all files? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
rm -fr ~/dotfiles-versions/$version
|
||||
mkdir ~/dotfiles-versions/$version
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
echo "The folder ~/dotfiles-versions/$version already exists from previous installations."
|
||||
echo ""
|
||||
rm -fr ~/dotfiles-versions/$version
|
||||
mkdir ~/dotfiles-versions/$version
|
||||
echo "Clean build prepared for the installation."
|
||||
echo ""
|
||||
fi
|
||||
cp -rf . ~/dotfiles-versions/$version/
|
||||
|
||||
if [ -d ~/dotfiles-versions/$version/.git ]; then
|
||||
rm -rf ~/dotfiles-versions/$version/.git
|
||||
fi
|
||||
|
||||
if [ -f ~/dotfiles-versions/$version/.gitignore ]; then
|
||||
rm ~/dotfiles-versions/$version/.gitignore
|
||||
fi
|
||||
|
||||
if [ -f ~/dotfiles-versions/$version/CHANGELOG ]; then
|
||||
rm ~/dotfiles-versions/$version/CHANGELOG
|
||||
fi
|
||||
|
||||
if [ -f ~/dotfiles-versions/$version/README.md ]; then
|
||||
rm ~/dotfiles-versions/$version/README.md
|
||||
fi
|
||||
|
||||
if [ -f ~/dotfiles-versions/$version/install.sh ]; then
|
||||
rm ~/dotfiles-versions/$version/install.sh
|
||||
fi
|
||||
|
||||
if [ -d ~/dotfiles-versions/$version/.install ]; then
|
||||
rm -rf ~/dotfiles-versions/$version/.install
|
||||
fi
|
||||
|
||||
rsync -a --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/
|
||||
echo "dotfiles $version successfully prepared in ~/dotfiles-versions/$version/"
|
||||
echo ""
|
||||
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
# ------------------------------------------------------
|
||||
# Select installation profile
|
||||
# ------------------------------------------------------
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
____ _ _ ____ __ _ _
|
||||
| _ \ ___ ___| | _| |_ ___ _ __ | _ \ _ __ ___ / _(_) | ___
|
||||
@@ -10,7 +11,7 @@ cat <<"EOF"
|
||||
|_|
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
echo "Please select the Desktop Profile for your installation:"
|
||||
echo "1 - Hyprland"
|
||||
echo "2 - Qtile"
|
||||
|
||||
+8
-8
@@ -1,17 +1,17 @@
|
||||
# ------------------------------------------------------
|
||||
# Install pywal
|
||||
# ------------------------------------------------------
|
||||
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
___ _ _ _ _
|
||||
|_ _|_ __ ___| |_ __ _| | | _ __ _ ___ ____ _| |
|
||||
| || '_ \/ __| __/ _` | | | | '_ \| | | \ \ /\ / / _` | |
|
||||
| || | | \__ \ || (_| | | | | |_) | |_| |\ V V / (_| | |
|
||||
|___|_| |_|___/\__\__,_|_|_| | .__/ \__, | \_/\_/ \__,_|_|
|
||||
|_| |___/
|
||||
_
|
||||
_ __ _ ___ ____ _| |
|
||||
| '_ \| | | \ \ /\ / / _` | |
|
||||
| |_) | |_| |\ V V / (_| | |
|
||||
| .__/ \__, | \_/\_/ \__,_|_|
|
||||
|_| |___/
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
if [ -f /usr/bin/wal ]; then
|
||||
echo "pywal already installed."
|
||||
else
|
||||
|
||||
@@ -20,4 +20,6 @@ if [ ! $mode == "dev" ]; then
|
||||
_installSymLink gtk-3.0 ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/
|
||||
else
|
||||
echo "Skipped: DEV MODE!"
|
||||
fi
|
||||
fi
|
||||
echo "Symbolic links created."
|
||||
echo ""
|
||||
@@ -26,7 +26,6 @@ packagesPacman=(
|
||||
"python-rich"
|
||||
"python-click"
|
||||
"xdg-desktop-portal"
|
||||
"xdg-desktop-portal-gtk"
|
||||
"pavucontrol"
|
||||
"tumbler"
|
||||
"xautolock"
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
___ _ _ _
|
||||
/ _ \| |_(_) | ___
|
||||
@@ -6,3 +7,4 @@ cat <<"EOF"
|
||||
\__\_\\__|_|_|\___|
|
||||
|
||||
EOF
|
||||
echo -e "${NONE}"
|
||||
+47
-80
@@ -3,6 +3,7 @@
|
||||
# ------------------------------------------------------
|
||||
|
||||
if [ -d ~/dotfiles ]; then
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
____ _
|
||||
| _ \ ___ ___| |_ ___ _ __ ___
|
||||
@@ -11,102 +12,68 @@ cat <<"EOF"
|
||||
|_| \_\___||___/\__\___/|_| \___|
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
restored=0
|
||||
echo "The script will try to restore existing configurations."
|
||||
echo "PLEASE NOTE: Restoring is not possible with version < 2.5 of the dotfiles."
|
||||
echo "Keyboard layout can be defined manually in the next step."
|
||||
echo "In that case, please use the autamated backup or create your own backup manually."
|
||||
echo ""
|
||||
restored=0
|
||||
|
||||
echo "The following configurations can be transferred into the new installation."
|
||||
if [ -f ~/dotfiles/.bashrc ]; then
|
||||
while true; do
|
||||
read -p "Found existing ~/dotfiles/.bashrc Restore? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
cp ~/dotfiles/.bashrc ~/dotfiles-versions/$version/
|
||||
echo "Restored!"
|
||||
restored=1
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
echo ".bashrc file: ~/dotfiles/.bashrc"
|
||||
fi
|
||||
|
||||
if [ $profile == "Hyprland" ] || [ $profile == "All" ]; then
|
||||
if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then
|
||||
while true; do
|
||||
read -p "Found existing ~/dotfiles/hypr/conf/keyboard.conf Restore? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
cp ~/dotfiles/hypr/conf/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/
|
||||
echo "Restored!"
|
||||
restored=1
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
echo "Hyprland keyboard layout: ~/dotfiles/hypr/conf/keyboard.conf"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $profile = "Hyprland" ] || [ $profile == "All" ]; then
|
||||
if [ -f ~/dotfiles/hypr/conf/monitor.conf ]; then
|
||||
while true; do
|
||||
read -p "Found existing ~/dotfiles/hypr/conf/monitor.conf Restore? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
cp ~/dotfiles/hypr/conf/monitor.conf ~/dotfiles-versions/$version/hypr/conf/
|
||||
echo "Restored!"
|
||||
restored=1
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
echo "Hyprland monitor setup: ~/dotfiles/hypr/conf/monitor.conf"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $profile == "Hyprland" ] || [ $profile == "All" ]; then
|
||||
if [ -f ~/dotfiles/hypr/conf/keybindings.conf ]; then
|
||||
while true; do
|
||||
read -p "Found existing ~/dotfiles/hypr/conf/keybindings.conf Restore? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
cp ~/dotfiles/hypr/conf/keybindings.conf ~/dotfiles-versions/$version/hypr/conf/
|
||||
echo "Restored!"
|
||||
restored=1
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
echo "Hyprland keybindings: ~/dotfiles/hypr/conf/keybindings.conf"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $profile == "Qtile" ] || [ $profile == "All" ]; then
|
||||
if [ -f ~/dotfiles/qtile/conf/keyboard.py ]; then
|
||||
while true; do
|
||||
read -p "Found existing ~/dotfiles/qtile/conf/keyboard.py Restore? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
cp ~/dotfiles/qtile/conf/keyboard.py ~/dotfiles-versions/$version/qtile/conf/
|
||||
echo "Restored!"
|
||||
restored=1
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
echo "Qtile keyboard layout: ~/dotfiles/qtile/conf/keyboard.py"
|
||||
fi
|
||||
fi
|
||||
if [ $restored == 0 ]; then
|
||||
echo "Restore not possible."
|
||||
fi
|
||||
echo ""
|
||||
|
||||
while true; do
|
||||
read -p "Do you want to restore the files now and use it on your new installation (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
if [ -f ~/dotfiles/.bashrc ]; then
|
||||
cp ~/dotfiles/.bashrc ~/dotfiles-versions/$version/
|
||||
echo ".bashrc restored!"
|
||||
fi
|
||||
if [ $profile == "Hyprland" ] || [ $profile == "All" ]; then
|
||||
if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then
|
||||
cp ~/dotfiles/hypr/conf/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/
|
||||
echo "Hyprland keyboard.conf restored!"
|
||||
fi
|
||||
if [ -f ~/dotfiles/hypr/conf/monitor.conf ]; then
|
||||
cp ~/dotfiles/hypr/conf/monitor.conf ~/dotfiles-versions/$version/hypr/conf/
|
||||
echo "Hyprland monitor.conf restored!"
|
||||
fi
|
||||
if [ -f ~/dotfiles/hypr/conf/keybindings.conf ]; then
|
||||
cp ~/dotfiles/hypr/conf/keybindings.conf ~/dotfiles-versions/$version/hypr/conf/
|
||||
echo "Hyprland keybindings.conf restored!"
|
||||
fi
|
||||
fi
|
||||
if [ $profile == "Qtile" ] || [ $profile == "All" ]; then
|
||||
if [ -f ~/dotfiles/qtile/conf/keyboard.py ]; then
|
||||
cp ~/dotfiles/qtile/conf/keyboard.py ~/dotfiles-versions/$version/qtile/conf/
|
||||
echo "Qtile keyboard.py restored!"
|
||||
fi
|
||||
fi
|
||||
restored=1
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
@@ -0,0 +1,6 @@
|
||||
# ------------------------------------------------------
|
||||
# Check that rsync is installed
|
||||
# ------------------------------------------------------
|
||||
|
||||
echo "Checking that rsync is installed..."
|
||||
_installPackagesPacman "rsync";
|
||||
+28
-22
@@ -1,7 +1,7 @@
|
||||
# ------------------------------------------------------
|
||||
# Setup
|
||||
# ------------------------------------------------------
|
||||
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
____ _
|
||||
/ ___| ___| |_ _ _ _ __
|
||||
@@ -11,25 +11,31 @@ cat <<"EOF"
|
||||
|_|
|
||||
|
||||
EOF
|
||||
echo "If you could restore your keyboard layout in the step before you can select Nn and skip."
|
||||
while true; do
|
||||
read -p "Do you want to start the setup (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
read -p "Enter your preferred keyboard layout (us,de,...) (default:us): " keyboard
|
||||
if [ -z "$keyboard" ]; then
|
||||
keyboard="us"
|
||||
fi
|
||||
SEARCH="kb_layout = us"
|
||||
REPLACE="kb_layout = $keyboard"
|
||||
sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
|
||||
echo -e "${NONE}"
|
||||
if [ "$restored" == "1" ]; then
|
||||
echo "You have already restored your settings into the new installation."
|
||||
else
|
||||
while true; do
|
||||
read -p "Do you want to set your keyboard layout? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
read -p "Enter your preferred keyboard layout (us,de,...) (default:us): " keyboard
|
||||
if [ -z "$keyboard" ]; then
|
||||
keyboard="us"
|
||||
fi
|
||||
|
||||
SEARCH="keyboard_layout = \"us\""
|
||||
REPLACE="keyboard_layout = \"$keyboard\""
|
||||
sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/conf/keyboard.py
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
SEARCH="kb_layout = us"
|
||||
REPLACE="kb_layout = $keyboard"
|
||||
sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
|
||||
|
||||
SEARCH="keyboard_layout = \"us\""
|
||||
REPLACE="keyboard_layout = \"$keyboard\""
|
||||
sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/conf/keyboard.py
|
||||
break;;
|
||||
[Nn]* )
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
echo ""
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
version="2.5.1"
|
||||
+14
-5
@@ -1,7 +1,7 @@
|
||||
# ------------------------------------------------------
|
||||
# Install wallpapers
|
||||
# ------------------------------------------------------
|
||||
|
||||
echo -e "${GREEN}"
|
||||
cat <<"EOF"
|
||||
__ __ _ _
|
||||
\ \ / /_ _| | |_ __ __ _ _ __ ___ _ __ ___
|
||||
@@ -11,10 +11,13 @@ __ __ _ _
|
||||
|_| |_|
|
||||
|
||||
EOF
|
||||
|
||||
echo -e "${NONE}"
|
||||
if [ ! -d ~/wallpaper ]; then
|
||||
echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
|
||||
echo "If not, the script will install 3 default wallpapers in ~/wallpaper/"
|
||||
echo ""
|
||||
while true; do
|
||||
read -p "If not, the script will install 3 default wallpapers to ~/wallpaper/ (Yy/Nn): " yn
|
||||
read -p "Do you want to download the repository? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
|
||||
@@ -23,7 +26,7 @@ while true; do
|
||||
mkdir ~/wallpaper
|
||||
fi
|
||||
cp ~/Downloads/wallpaper-main/* ~/wallpaper/
|
||||
echo "Wallpapers installed successfully."
|
||||
echo "Wallpapers frpm the repository installed successfully."
|
||||
break;;
|
||||
[Nn]* )
|
||||
if [ -d ~/wallpaper/ ]; then
|
||||
@@ -32,15 +35,21 @@ while true; do
|
||||
mkdir ~/wallpaper
|
||||
fi
|
||||
cp wallpapers/* ~/wallpaper
|
||||
echo "Default wallpapers installed."
|
||||
echo "Default wallpapers installed successfully."
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
else
|
||||
echo "~/wallpaper folder already exsits."
|
||||
fi
|
||||
echo ""
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Copy default wallpaper to .cache
|
||||
# ------------------------------------------------------
|
||||
if [ ! -f ~/.cache/current_wallpaper.jpg ]; then
|
||||
cp wallpapers/default.jpg ~/.cache/current_wallpaper.jpg
|
||||
echo "Default wallpaper installed."
|
||||
echo ""
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user