diff --git a/.install/confirm-start.sh b/.install/confirm-start.sh index 8545021..db66c1a 100644 --- a/.install/confirm-start.sh +++ b/.install/confirm-start.sh @@ -2,9 +2,7 @@ # Confirm Start # ------------------------------------------------------ -echo "IMPORTANT: Please make sure that your system and your packages are up to date (sudo pacman -Syu or yay)." echo "You can cancel the installation at any time with CTRL + C" -echo "If you have already installed a window manager like sway, please backup your .config folder." SCRIPT=$(realpath "$0") SCRIPTPATH=$(dirname "$SCRIPT") if [ $SCRIPTPATH = "/home/$USER/dotfiles" ]; then @@ -17,21 +15,21 @@ if [ $SCRIPTPATH = "/home/$USER/dotfiles" ]; then fi fi if [ ! -d ~/dotfiles ];then - if gum confirm "DO YOU WANT TO START THE INSTALLATION NOW?" ;then + if gum confirm "DO YOU WANT TO START THE INSTALLATION OF THE ML4W DOTFILES NOW?" ;then echo "Installation started." elif [ $? -eq 130 ]; then exit 130 else - echo "Installation canceled." + echo ":: Installation canceled." exit; fi else - if gum confirm "DO YOU WANT TO START THE UPDATE NOW?" ;then - echo "Update started." + if gum confirm "DO YOU WANT TO START THE UPDATE OF YOUR ML4W DOTFILES NOW?" ;then + echo ":: Update started." elif [ $? -eq 130 ]; then exit 130 else - echo "Update canceled." + echo ":: Update canceled." exit; fi fi diff --git a/.install/hyprland-dotfiles.sh b/.install/hyprland-dotfiles.sh index 1afca8b..a90d318 100644 --- a/.install/hyprland-dotfiles.sh +++ b/.install/hyprland-dotfiles.sh @@ -35,5 +35,5 @@ fi if [ -d ~/dotfiles-versions/$version/swappy ]; then _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config fi -echo "Symbolic links created." +echo ":: Symbolic links created." echo \ No newline at end of file diff --git a/.install/qtile-dotfiles.sh b/.install/qtile-dotfiles.sh index bd1de72..65ae219 100644 --- a/.install/qtile-dotfiles.sh +++ b/.install/qtile-dotfiles.sh @@ -35,4 +35,4 @@ fi if [ -d ~/dotfiles-versions/$version/swappy ]; then _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config fi -echo "Symbolic links created." +echo ":: Symbolic links created." diff --git a/.install/updatesystem.sh b/.install/updatesystem.sh new file mode 100644 index 0000000..ce775f9 --- /dev/null +++ b/.install/updatesystem.sh @@ -0,0 +1,11 @@ +# ------------------------------------------------------ +# Update System +# ------------------------------------------------------ + +echo -e "${GREEN}" +figlet "System Update" +echo -e "${NONE}" +echo "It's important that your system is up-to-date before you proceed with the installation of the ML4W Dotfiles." +if gum confirm "Do you want to update the packages of your system with yay now?" ;then + yay +fi diff --git a/.version/name b/.version/name index 642c63c..60c8344 100644 --- a/.version/name +++ b/.version/name @@ -1 +1 @@ -2.8.3 \ No newline at end of file +2.8.3.1 \ No newline at end of file diff --git a/.version/version b/.version/version index 2f0bd1c..2a9d55f 100644 --- a/.version/version +++ b/.version/version @@ -1 +1 @@ -2830 \ No newline at end of file +2831 \ No newline at end of file diff --git a/README.md b/README.md index dcac17f..0fb2c40 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ML4W dotfiles 2.8.3 +# ML4W Dotfiles 2.8.3.1 An advanced configuration of Hyprland and Qtile for Arch Linux based distributions. This package includes an installation script to install and setup the required components. @@ -46,14 +46,19 @@ The installation script will create a backup from an previous dotfiles installat If possible, please create a snapshot of your current system if snapper or Timeshift is installed and available. -## Reference Installation +## ML4W Installer App -The reference installation for the ML4W dotfiles is based on Arch Linux installed with archinstal and the minimal profile. +The easiest way to install the ML4W Dotfiles is to use the ML4W Dotfiles Installer App. You can download the app here. (Right click + Save link as...) -Please watch the video on YouTube: https://youtu.be/kHG5czrQ7WA +``` +# Start the App from your terminal with +./ML4W_Dotfiles_Installer.AppImage +``` ## Installation with GIT +You can also install the dotfiles by cloning the latest main release: + ``` # 1.) Change into your Downloads folder (create the folder if not available) cd ~/Downloads @@ -71,6 +76,8 @@ cd dotfiles ## Installation with GIT of the rolling release +You can install the dotfiles by cloning the latest development version from the rolling release: + ``` # 1.) Change into your Downloads folder (create the folder if not available) cd ~/Downloads @@ -121,10 +128,6 @@ cd dotfiles ``` -## ML4W dotfiles Installer - -You can also use the ML4W dotfiles installer script to download and install the latest release: https://gitlab.com/stephan-raabe/installer - ## Installation Hook The installation script will prepare the configuration files in a folder ~/dotfiles-versions/[version] before copy the files into the final destination in ~/dotfiles diff --git a/apps/ML4W_Dotfiles_Installer.AppImage b/apps/ML4W_Dotfiles_Installer.AppImage new file mode 100755 index 0000000..b9b753b Binary files /dev/null and b/apps/ML4W_Dotfiles_Installer.AppImage differ diff --git a/apps/ML4W_Welcome-x86_64.AppImage b/apps/ML4W_Welcome-x86_64.AppImage index 8bcd73a..1029a5b 100755 Binary files a/apps/ML4W_Welcome-x86_64.AppImage and b/apps/ML4W_Welcome-x86_64.AppImage differ diff --git a/hypr/conf/layout.conf b/hypr/conf/layout.conf index 0ebf764..dc78a62 100644 --- a/hypr/conf/layout.conf +++ b/hypr/conf/layout.conf @@ -14,7 +14,3 @@ master { gestures { workspace_swipe = false } - -device:epic-mouse-v1 { - sensitivity = -0.5 -} diff --git a/hypr/conf/ml4w.conf b/hypr/conf/ml4w.conf index cfa1d13..9219d27 100644 --- a/hypr/conf/ml4w.conf +++ b/hypr/conf/ml4w.conf @@ -4,32 +4,22 @@ windowrulev2 = float,class:(com.ml4w.welcome) windowrulev2 = size 700 600,class:(com.ml4w.welcome) -windowrulev2 = nomaximizerequest,class:(com.ml4w.welcome) -windowrulev2 = nofullscreenrequest,class:(com.ml4w.welcome) windowrulev2 = center,class:(com.ml4w.welcome) windowrulev2 = float,class:(ml4w-welcome.py) windowrulev2 = size 400 500,class:(ml4w-welcome.py) -windowrulev2 = nomaximizerequest,class:(ml4w-welcome.py) -windowrulev2 = nofullscreenrequest,class:(ml4w-welcome.py) windowrulev2 = center,class:(ml4w-welcome.py) windowrulev2 = float,class:(com.ml4w.dotfilessettings) windowrulev2 = size 700 600,class:(com.ml4w.dotfilessettings) -windowrulev2 = nomaximizerequest,class:(com.ml4w.dotfilessettings) -windowrulev2 = nofullscreenrequest,class:(com.ml4w.dotfilessettings) windowrulev2 = move 10% 20%,class:(com.ml4w.dotfilessettings) windowrulev2 = float,class:(ml4w-dotfiles-settings.py) windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py) -windowrulev2 = nomaximizerequest,class:(ml4w-dotfiles-settings.py) -windowrulev2 = nofullscreenrequest,class:(ml4w-dotfiles-settings.py) windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py) windowrulev2 = float,class:(dotfiles-floating) windowrulev2 = size 1000 800,class:(dotfiles-floating) -windowrulev2 = nomaximizerequest,class:(dotfiles-floating) -windowrulev2 = nofullscreenrequest,class:(dotfiles-floating) windowrulev2 = center,class:(dotfiles-floating) env = APPIMAGELAUNCHER_DISABLE,1 \ No newline at end of file diff --git a/install.sh b/install.sh index a643fd7..08a7e40 100755 --- a/install.sh +++ b/install.sh @@ -36,6 +36,7 @@ echo "" source .install/required.sh source .install/confirm-start.sh source .install/yay.sh +source .install/updatesystem.sh source .install/backup.sh source .install/preparation.sh source .install/installer.sh