diff --git a/.install/general-packages.sh b/.install/general-packages.sh index d66d481..d0e9c2c 100644 --- a/.install/general-packages.sh +++ b/.install/general-packages.sh @@ -44,6 +44,7 @@ packagesPacman=( "network-manager-applet" "xarchiver" "thunar-archive-plugin" + "zip" "fuse2" "gtk4" "libadwaita" diff --git a/.install/hyprland-dotfiles.sh b/.install/hyprland-dotfiles.sh index 72122df..1afca8b 100644 --- a/.install/hyprland-dotfiles.sh +++ b/.install/hyprland-dotfiles.sh @@ -2,55 +2,38 @@ # Install dotfiles # ------------------------------------------------------ -if [ ! $mode == "dev" ]; then - if [ -d ~/dotfiles-versions/$version/alacritty ]; then - _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/vim ]; then - _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/nvim ]; then - _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/starship ]; then - _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml - fi - if [ -d ~/dotfiles-versions/$version/rofi ]; then - _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/dunst ]; then - _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/hypr ]; then - _installSymLink hypr ~/.config/hypr ~/dotfiles/hypr/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/waybar ]; then - _installSymLink waybar ~/.config/waybar ~/dotfiles/waybar/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/swaylock ]; then - _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/wlogout ]; then - _installSymLink wlogout ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/swappy ]; then - _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config - fi - - #if [ -d ~/dotfiles-versions/$version/gtk ]; then - # _installSymLink .gtkrc-2.0 ~/.gtkrc-2.0 ~/dotfiles/gtk/.gtkrc-2.0 ~/.gtkrc-2.0 - #fi - #if [ -d ~/dotfiles-versions/$version/gtk ]; then - # _installSymLink .Xresources ~/.Xresources ~/dotfiles/gtk/.Xresources ~/.Xresources - #fi - #if [ -d ~/dotfiles-versions/$version/gtk ]; then - # _installSymLink gtk-3.0 ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/ - #fi - #if [ -d ~/dotfiles-versions/$version/gtk ]; then - # _installSymLink gtk-4.0 ~/.config/gtk-4.0 ~/dotfiles/gtk/gtk-4.0/ ~/.config/ - #fi -else - echo "Skipped: DEV MODE!" +if [ -d ~/dotfiles-versions/$version/alacritty ]; then + _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/vim ]; then + _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/nvim ]; then + _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/starship ]; then + _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml +fi +if [ -d ~/dotfiles-versions/$version/rofi ]; then + _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/dunst ]; then + _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/hypr ]; then + _installSymLink hypr ~/.config/hypr ~/dotfiles/hypr/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/waybar ]; then + _installSymLink waybar ~/.config/waybar ~/dotfiles/waybar/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/swaylock ]; then + _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/wlogout ]; then + _installSymLink wlogout ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/swappy ]; then + _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config fi echo "Symbolic links created." -echo "" \ No newline at end of file +echo \ No newline at end of file diff --git a/.install/qtile-dotfiles.sh b/.install/qtile-dotfiles.sh index 3e4721d..bd1de72 100644 --- a/.install/qtile-dotfiles.sh +++ b/.install/qtile-dotfiles.sh @@ -2,42 +2,37 @@ # Install dotfiles # ------------------------------------------------------ -if [ ! $mode == "dev" ]; then - if [ -d ~/dotfiles-versions/$version/alacritty ]; then - _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/vim ]; then - _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/nvim ]; then - _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/starship ]; then - _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml - fi - if [ -d ~/dotfiles-versions/$version/rofi ]; then - _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/dunst ]; then - _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/qtile ]; then - _installSymLink qtile ~/.config/qtile ~/dotfiles/qtile/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/picom ]; then - _installSymLink picom ~/.config/picom ~/dotfiles/picom/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/qtile ]; then - _installSymLink .xinitrc ~/.xinitrc ~/dotfiles/qtile/.xinitrc ~/.xinitrc - fi - if [ -d ~/dotfiles-versions/$version/swaylock ]; then - _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config - fi - if [ -d ~/dotfiles-versions/$version/swappy ]; then - _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config - fi -else - echo "Skipped: DEV MODE!" +if [ -d ~/dotfiles-versions/$version/alacritty ]; then + _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/vim ]; then + _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/nvim ]; then + _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/starship ]; then + _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml +fi +if [ -d ~/dotfiles-versions/$version/rofi ]; then + _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/dunst ]; then + _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/qtile ]; then + _installSymLink qtile ~/.config/qtile ~/dotfiles/qtile/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/picom ]; then + _installSymLink picom ~/.config/picom ~/dotfiles/picom/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/qtile ]; then + _installSymLink .xinitrc ~/.xinitrc ~/dotfiles/qtile/.xinitrc ~/.xinitrc +fi +if [ -d ~/dotfiles-versions/$version/swaylock ]; then + _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config +fi +if [ -d ~/dotfiles-versions/$version/swappy ]; then + _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config fi echo "Symbolic links created." -echo "" \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index ea71c5d..6029ecc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,15 +1,19 @@ Version 2.8.1 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8 -------------------------------------------------------- +General: +- xarchiver and zip added for thunar + ML4W Welcome App: -- Terminal can be set for Thunar -- Opens systeminfo of Hyprland +- Opens Hyprland systeminfo from the about menu +- Timeshift can be installed from the settings menu +- Terminal for Thunar can be set from the settings menu Hyprland: - Bugfix timeshift detection in installupdates.sh Qtile: -- +- Polybar removed from the dotfiles Version 2.8 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8 diff --git a/apps/ML4W_Welcome-x86_64.AppImage b/apps/ML4W_Welcome-x86_64.AppImage index f017604..27179c0 100755 Binary files a/apps/ML4W_Welcome-x86_64.AppImage and b/apps/ML4W_Welcome-x86_64.AppImage differ diff --git a/hypr/conf/windowrules/default.conf b/hypr/conf/windowrules/default.conf index 69dd42e..a6d3cf6 100644 --- a/hypr/conf/windowrules/default.conf +++ b/hypr/conf/windowrules/default.conf @@ -8,4 +8,3 @@ windowrule = tile,^(Chromium)$ windowrule = float,^(pavucontrol)$ windowrule = float,^(blueman-manager)$ windowrule = float,^(nm-connection-editor)$ - diff --git a/scripts/installtimeshift.sh b/scripts/installtimeshift.sh new file mode 100755 index 0000000..affb8d5 --- /dev/null +++ b/scripts/installtimeshift.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# _____ _ _ _ __ _ +# |_ _(_)_ __ ___ ___ ___| |__ (_)/ _| |_ +# | | | | '_ ` _ \ / _ \/ __| '_ \| | |_| __| +# | | | | | | | | | __/\__ \ | | | | _| |_ +# |_| |_|_| |_| |_|\___||___/_| |_|_|_| \__| +# + +sleep 1 +clear +figlet "Timeshift" + +_isInstalledYay() { + package="$1"; + check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")"; + if [ -n "${check}" ] ; then + echo 0; #'0' means 'true' in Bash + return; #true + fi; + echo 1; #'1' means 'false' in Bash + return; #false +} + +if [[ $(_isInstalledYay "timeshift") == "0" ]] ;then + echo ":: Timeshift is already installed" + sleep 3 +else + if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then + yay -S timeshift + fi +fi \ No newline at end of file diff --git a/scripts/installupdates.sh b/scripts/installupdates.sh index ea89e20..057a1aa 100755 --- a/scripts/installupdates.sh +++ b/scripts/installupdates.sh @@ -5,22 +5,14 @@ # | || | | \__ \ || (_| | | | | |_| | |_) | (_| | (_| | || __/\__ \ # |___|_| |_|___/\__\__,_|_|_| \___/| .__/ \__,_|\__,_|\__\___||___/ # |_| -# by Stephan Raabe (2023) +# by Stephan Raabe (2024) # ----------------------------------------------------- # Required: yay trizen timeshift btrfs-grub # ----------------------------------------------------- sleep 1 clear - -cat <<"EOF" - _ _ _ _ -| | | |_ __ __| | __ _| |_ ___ ___ -| | | | '_ \ / _` |/ _` | __/ _ \/ __| -| |_| | |_) | (_| | (_| | || __/\__ \ - \___/| .__/ \__,_|\__,_|\__\___||___/ - |_| - +figlet "Updates" EOF _isInstalledYay() { diff --git a/scripts/setthunarterminal.sh b/scripts/thunarterminal.sh similarity index 98% rename from scripts/setthunarterminal.sh rename to scripts/thunarterminal.sh index abd3d93..b452cf3 100755 --- a/scripts/setthunarterminal.sh +++ b/scripts/thunarterminal.sh @@ -15,4 +15,4 @@ if [ -f ~/dotfiles/.settings/terminal.sh ]; then else echo "ERROR: ~/dotfiles/.settings/terminal.sh not found" fi -sleep 3 \ No newline at end of file +sleep 3