diff --git a/.bashrc b/.bashrc index 062053e..a9918bb 100644 --- a/.bashrc +++ b/.bashrc @@ -135,7 +135,7 @@ cat ~/.cache/wal/sequences # ----------------------------------------------------- echo "" if [[ $(tty) == *"pts"* ]]; then - pfetch + fastfetch else if [ -f /bin/qtile ]; then echo "Start Qtile X11 with command Qtile" diff --git a/.install/hyprland-dotfiles.sh b/.install/hyprland-dotfiles.sh index 3c4e761..022afc4 100644 --- a/.install/hyprland-dotfiles.sh +++ b/.install/hyprland-dotfiles.sh @@ -40,5 +40,8 @@ fi if [ -d ~/dotfiles-versions/$version/swappy ]; then _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config fi +if [ -d ~/dotfiles-versions/$version/fastfetch ]; then + _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config +fi echo ":: Symbolic links created." echo diff --git a/.install/packages/general-packages.sh b/.install/packages/general-packages.sh index de23501..888ceb4 100644 --- a/.install/packages/general-packages.sh +++ b/.install/packages/general-packages.sh @@ -53,10 +53,10 @@ packagesPacman=( "guvcview" "jq" "rofi-wayland" + "fastfetch" ); packagesYay=( - "pfetch" "bibata-cursor-theme" "trizen" "pacseek" diff --git a/.install/packages/hyprland-packages.sh b/.install/packages/hyprland-packages.sh index 35c57dc..ee5d7b9 100644 --- a/.install/packages/hyprland-packages.sh +++ b/.install/packages/hyprland-packages.sh @@ -12,9 +12,7 @@ packagesPacman=( ); packagesYay=( - "swww" "wlogout" "nwg-look" - "emote" "eww" ); diff --git a/.version/name b/.version/name index 0a35d8c..8ce9507 100644 --- a/.version/name +++ b/.version/name @@ -1 +1 @@ -2.9 \ No newline at end of file +2.9.1BETA1 \ No newline at end of file diff --git a/.version/version b/.version/version index 7b34ebb..e036d95 100644 --- a/.version/version +++ b/.version/version @@ -1 +1 @@ -2900 \ No newline at end of file +2910 \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index bb361da..1e68feb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +Version 2.9.1 +https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9 +-------------------------------------------------------- +- Hyprpaper is the default wallpaper engine. swww will not be installed by the installer anymore. You can still switch to swww in the Dotfiles Settings App (System tab) but you need to install swww manually with yay -S swww +- pfetch has been replaced with fastfetch + Version 2.9 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9 -------------------------------------------------------- diff --git a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage index fa0f251..0a8ef41 100755 Binary files a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage and b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage differ diff --git a/apps/ML4W_Dotfiles_Uninstaller.AppImage b/apps/ML4W_Dotfiles_Uninstaller.AppImage index 79432b7..660f78a 100755 Binary files a/apps/ML4W_Dotfiles_Uninstaller.AppImage and b/apps/ML4W_Dotfiles_Uninstaller.AppImage differ diff --git a/eww/scripts/launch_app.sh b/eww/scripts/launch_app.sh index 9285adc..5929e1a 100755 --- a/eww/scripts/launch_app.sh +++ b/eww/scripts/launch_app.sh @@ -1,11 +1,12 @@ #!/bin/bash if [[ "$1" == "--welcome" ]]; then - $HOME/dotfiles/apps/ML4W_Welcome-x86_64.AppImage + $HOME/dotfiles/apps/ML4W_Welcome-x86_64.AppImage & elif [[ "$1" == "--dotfiles" ]]; then - $HOME/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage + $HOME/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage & elif [[ "$1" == "--hyprland" ]]; then - $HOME/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage + $HOME/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage & else echo "ERROR: $1 not found" fi +$HOME/dotfiles/eww/ml4w-sidebar/launch.sh & \ No newline at end of file diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc new file mode 100644 index 0000000..67c8c05 --- /dev/null +++ b/fastfetch/config.jsonc @@ -0,0 +1,20 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "small" + }, + "modules": [ + "title", + "os", + "kernel", + "uptime", + "packages", + "memory", + "shell", + "display", + "de", + "wmtheme", + "font", + "cpu" + ] +} diff --git a/setup.sh b/setup.sh new file mode 100755 index 0000000..63c8322 --- /dev/null +++ b/setup.sh @@ -0,0 +1,54 @@ +#!/bin/bash +clear + +# Some colors +GREEN='\033[0;32m' +NONE='\033[0m' + +# Header +echo -e "${GREEN}" +cat <<"EOF" + ____ _ +/ ___| ___| |_ _ _ _ __ +\___ \ / _ \ __| | | | '_ \ + ___) | __/ |_| |_| | |_) | +|____/ \___|\__|\__,_| .__/ + |_| + +EOF +echo "for ML4W Hyprland Settings App" +echo +echo -e "${NONE}" +echo "This script will download the ML4W Dotfiles and start the installation." +echo +while true; do + read -p "DO YOU WANT TO START THE INSTALLATION NOW? (Yy/Nn): " yn + case $yn in + [Yy]* ) + echo "Installation started." + echo + break;; + [Nn]* ) + echo "Installation canceled." + exit; + break;; + * ) echo "Please answer yes or no.";; + esac +done + +# Change into your Downloads directory +cd ~/Downloads + +# Remove existing folder +if [ -d ~/Downloads/dotfiles ] ;then + rm -rf ~/Downloads/dotfiles +fi + +# Clone the packages +git clone --depth 1 https://gitlab.com/stephan-raabe/dotfiles.git + +# Change into the folder +cd ml4w-hyprland-settings + +# Start the script +./install.sh