From a812d7b144846814b82c900e2697bf1f914bd787 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Thu, 25 Jan 2024 20:55:32 +0100 Subject: [PATCH] Updates --- .install/backup.sh | 14 +++++++------- .install/copy.sh | 2 +- .install/hook.sh | 6 +++--- .install/keyboard.sh | 6 +++--- .install/library.sh | 12 ++++++------ .install/preparation.sh | 12 ++++++------ .install/wallpaper.sh | 2 +- .install/yay.sh | 6 +++--- dunst/dunstrc | 6 +++--- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.install/backup.sh b/.install/backup.sh index 9fa2645..ed24d52 100755 --- a/.install/backup.sh +++ b/.install/backup.sh @@ -8,12 +8,12 @@ echo -e "${GREEN}" figlet "Backup" 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:" - echo "~/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" fi 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 ":: The script has detected an existing .bashrc file and will try to create a backup to:" + echo " ~/dotfiles-versions/backups/$datets/.bashrc-old" fi if gum confirm "Do you want to create a backup?" ;then if [ ! -d ~/dotfiles-versions ]; then @@ -30,16 +30,16 @@ echo -e "${NONE}" fi if [ -d ~/dotfiles ]; then rsync -a ~/dotfiles/ ~/dotfiles-versions/backups/$datets/ - echo "Backup of your current dotfiles in ~/dotfiles-versions/backups/$datets created." + echo ":: Backup of your current dotfiles in ~/dotfiles-versions/backups/$datets created." fi if [ -f ~/.bashrc ]; then cp ~/.bashrc ~/dotfiles-versions/backups/$datets/.bashrc-old - echo "Existing .bashrc file found in homefolder. .bashrc-old created" + echo ":: Existing .bashrc file found in homefolder. .bashrc-old created" fi elif [ $? -eq 130 ]; then exit 130 else - echo "Backup skipped." + echo ":: Backup skipped." fi echo "" fi diff --git a/.install/copy.sh b/.install/copy.sh index f8f801e..262b81f 100644 --- a/.install/copy.sh +++ b/.install/copy.sh @@ -23,7 +23,7 @@ if [[ ! $(tty) == *"pts"* ]] && [ -d ~/dotfiles ]; then 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." + echo "The script will overwrite existing files but will not remove additional files or folders from your custom configuration." fi fi if [ ! -d ~/dotfiles ]; then diff --git a/.install/hook.sh b/.install/hook.sh index bf98385..99b2597 100755 --- a/.install/hook.sh +++ b/.install/hook.sh @@ -5,11 +5,11 @@ if [ -f ~/dotfiles-versions/hook.sh ]; then echo -e "${GREEN}" figlet "Hook" echo -e "${NONE}" - echo "The script has detected a hook.sh script." + echo ":: The script has detected a hook.sh script." if gum confirm "Do you want to run the script now?"; then source ~/dotfiles-versions/hook.sh - echo "hook.sh executed!" + echo ":: hook.sh executed!" else - echo "Execution of hook.sh skipped." + echo ":: Execution of hook.sh skipped." fi fi diff --git a/.install/keyboard.sh b/.install/keyboard.sh index a596ac8..0db08db 100755 --- a/.install/keyboard.sh +++ b/.install/keyboard.sh @@ -14,7 +14,7 @@ _setupKeyboardLayout() { echo "Start typing = Search, RETURN = Confirm, CTRL-C = Cancel" keyboard_layout=$(localectl list-x11-keymap-layouts | gum filter --height 15 --placeholder "Find your keyboard layout...") echo "" - echo "Keyboard layout changed to $keyboard_layout" + echo ":: Keyboard layout changed to $keyboard_layout" echo "" _confirmKeyboard } @@ -32,7 +32,7 @@ _confirmKeyboard() { } if [ "$restored" == "1" ]; then - echo "You have already restored your settings into the new installation." + echo ":: You have already restored your settings into the new installation." else _confirmKeyboard @@ -48,6 +48,6 @@ else sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/autostart.sh echo "" - echo "Keyboard setup updated successfully." + echo ":: Keyboard setup updated successfully." echo "PLEASE NOTE: You can update your keyboard layout later in ~/dotfiles/hypr/conf/keyboard.conf" fi diff --git a/.install/library.sh b/.install/library.sh index 28fdb1c..2854a2f 100755 --- a/.install/library.sh +++ b/.install/library.sh @@ -54,7 +54,7 @@ _installPackagesPacman() { toInstall=(); for pkg; do if [[ $(_isInstalledPacman "${pkg}") == 0 ]]; then - echo "${pkg} is already installed."; + echo ":: ${pkg} is already installed."; continue; fi; toInstall+=("${pkg}"); @@ -88,7 +88,7 @@ _installPackagesYay() { toInstall=(); for pkg; do if [[ $(_isInstalledYay "${pkg}") == 0 ]]; then - echo "${pkg} is already installed."; + echo ":: ${pkg} is already installed."; continue; fi; toInstall+=("${pkg}"); @@ -130,20 +130,20 @@ _installSymLink() { if [ -L "${symlink}" ]; then rm ${symlink} ln -s ${linksource} ${linktarget} - echo "Symlink ${linksource} -> ${linktarget} created." + echo ":: Symlink ${linksource} -> ${linktarget} created." else if [ -d ${symlink} ]; then rm -rf ${symlink}/ ln -s ${linksource} ${linktarget} - echo "Symlink for directory ${linksource} -> ${linktarget} created." + echo ":: Symlink for directory ${linksource} -> ${linktarget} created." else if [ -f ${symlink} ]; then rm ${symlink} ln -s ${linksource} ${linktarget} - echo "Symlink to file ${linksource} -> ${linktarget} created." + echo ":: Symlink to file ${linksource} -> ${linktarget} created." else ln -s ${linksource} ${linktarget} - echo "New symlink ${linksource} -> ${linktarget} created." + echo ":: New symlink ${linksource} -> ${linktarget} created." fi fi fi diff --git a/.install/preparation.sh b/.install/preparation.sh index 95ab762..438030d 100644 --- a/.install/preparation.sh +++ b/.install/preparation.sh @@ -4,19 +4,19 @@ echo -e "${GREEN}" figlet "Preparation" echo -e "${NONE}" -echo "Preparing temporary folders for the installation." +echo ":: Preparing temporary folders for the installation." if [ ! -d ~/dotfiles-versions ]; then mkdir ~/dotfiles-versions - echo "~/dotfiles-versions folder created." + echo ":: ~/dotfiles-versions folder created." fi if [ ! -d ~/dotfiles-versions/$version ]; then mkdir ~/dotfiles-versions/$version - echo "~/dotfiles-versions/$version folder created." + echo ":: ~/dotfiles-versions/$version folder created." else - echo "The folder ~/dotfiles-versions/$version already exists from previous installations." + echo ":: The folder ~/dotfiles-versions/$version already exists from previous installations." rm -rf ~/dotfiles-versions/$version mkdir ~/dotfiles-versions/$version - echo "Clean build prepared for the installation." + echo ":: Clean build prepared for the installation." fi rsync -a -I --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/ if [[ $(_isFolderEmpty ~/dotfiles-versions/$version/) == 0 ]] ;then @@ -25,5 +25,5 @@ if [[ $(_isFolderEmpty ~/dotfiles-versions/$version/) == 0 ]] ;then echo "Execution of rsync -a -I --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/ is required." exit fi -echo "dotfiles $version successfully prepared in ~/dotfiles-versions/$version/" +echo ":: dotfiles $version successfully prepared in ~/dotfiles-versions/$version/" echo "" diff --git a/.install/wallpaper.sh b/.install/wallpaper.sh index de2220f..ecd8dc2 100644 --- a/.install/wallpaper.sh +++ b/.install/wallpaper.sh @@ -28,7 +28,7 @@ if [ ! -d ~/wallpaper ]; then echo "Default wallpapers installed successfully." fi else - echo "~/wallpaper folder already exists." + echo ":: ~/wallpaper folder already exists." fi echo "" diff --git a/.install/yay.sh b/.install/yay.sh index 6b8083e..9ca0f0b 100644 --- a/.install/yay.sh +++ b/.install/yay.sh @@ -5,9 +5,9 @@ echo -e "${GREEN}" figlet "yay" echo -e "${NONE}" if sudo pacman -Qs yay > /dev/null ; then - echo "yay is already installed!" + echo ":: yay is already installed!" else - echo "yay is not installed. Will be installed now!" + echo ":: yay is not installed. Starting the installation!" _installPackagesPacman "base-devel" SCRIPT=$(realpath "$0") temp_path=$(dirname "$SCRIPT") @@ -16,6 +16,6 @@ else cd ~/yay-git makepkg -si cd $temp_path - echo "yay has been installed successfully." + echo ":: yay has been installed successfully." fi echo "" \ No newline at end of file diff --git a/dunst/dunstrc b/dunst/dunstrc index 2c02f58..bb11204 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -137,7 +137,7 @@ # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. - line_height = 3 + line_height = 1 # Possible values are: # full: Allow a small subset of html markup in notifications: @@ -181,7 +181,7 @@ # Vertical alignment of message text and icon. # Possible values are "top", "center" and "bottom". - vertical_alignment = center + vertical_alignment = top # Show age of message if message is older than show_age_threshold # seconds. @@ -211,7 +211,7 @@ enable_recursive_icon_lookup = true # Set icon theme (only used for recursive icon lookup) - icon_theme = Adwaita + icon_theme = "Papirus-Dark,Adwaita" # You can also set multiple icon themes, with the leftmost one being used first. # icon_theme = "Adwaita, breeze"