diff --git a/.install/cleanup.sh b/.install/cleanup.sh index ca1ddc5..d06f0f6 100644 --- a/.install/cleanup.sh +++ b/.install/cleanup.sh @@ -13,24 +13,6 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then fi fi -# Check for running NetworkManager.service -if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then - echo ":: NetworkManager.service already running." -else - sudo systemctl enable NetworkManager.service - sudo systemctl start NetworkManager.service - echo ":: NetworkManager.service activated successfully." -fi - -# Check for running bluetooth.service -if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then - echo ":: bluetooth.service already running." -else - sudo systemctl enable bluetooth.service - sudo systemctl start bluetooth.service - echo ":: bluetooth.service activated successfully." -fi - if [ -d ~/dotfiles/hypr/settings/ ] ;then rm -rf ~/dotfiles/hypr/settings echo ":: ~/dotfiles/hypr/settings removed." diff --git a/.install/hyprland-dotfiles.sh b/.install/hyprland-dotfiles.sh index 551d6a8..3581321 100644 --- a/.install/hyprland-dotfiles.sh +++ b/.install/hyprland-dotfiles.sh @@ -49,5 +49,8 @@ fi if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config fi +if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then + _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors +fi echo ":: Symbolic links created." echo diff --git a/.install/packages/general-packages.sh b/.install/packages/general-packages.sh index a1c5962..368db4d 100644 --- a/.install/packages/general-packages.sh +++ b/.install/packages/general-packages.sh @@ -7,66 +7,50 @@ packagesPacman=( "fastfetch" "ranger" "btop" - "bluez" - "bluez-utils" "neovim" "wget" "unzip" - "alacritty" - "chromium" - "dunst" + "alacritty" + "dunst" "starship" - "mpv" + "mpv" "thunar" - "nautilus" - "mousepad" - "noto-fonts" - "otf-font-awesome" - "ttf-fira-sans" + "nautilus" + "noto-fonts" + "otf-font-awesome" + "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" - "ttf-firacode-nerd" - "figlet" - "vlc" - "eza" - "python-pip" - "python-psutil" - "python-rich" - "python-click" + "ttf-firacode-nerd" + "figlet" + "vlc" + "eza" + "python-pip" + "python-psutil" + "python-rich" "python-pywal" - "python-gobject" - "pavucontrol" - "tumbler" + "pavucontrol" + "tumbler" "papirus-icon-theme" - "breeze-icons" - "polkit-gnome" - "brightnessctl" "gum" "man-pages" - "nm-connection-editor" "gvfs" "xdg-user-dirs" "xdg-desktop-portal-gtk" - "networkmanager" - "network-manager-applet" "xarchiver" "thunar-archive-plugin" "zip" "fuse2" - "gtk4" - "libadwaita" "xdg-desktop-portal" "qalculate-gtk" "imagemagick" - "guvcview" "jq" "rofi-wayland" "fastfetch" - "blueman" ); packagesYay=( "vimix-cursors" "trizen" - "pacseek" + "google-chrome" ); diff --git a/.install/packages/hyprland-packages.sh b/.install/packages/hyprland-packages.sh index 987b371..4933ed2 100644 --- a/.install/packages/hyprland-packages.sh +++ b/.install/packages/hyprland-packages.sh @@ -3,9 +3,9 @@ packagesPacman=( "hyprpaper" "hyprlock" "hypridle" - "xdg-desktop-portal-hyprland" - "waybar" - "grim" + "xdg-desktop-portal-hyprland" + "waybar" + "grim" "slurp" "swappy" "cliphist" diff --git a/.settings/browser.sh b/.settings/browser.sh index e090179..988464c 100755 --- a/.settings/browser.sh +++ b/.settings/browser.sh @@ -1 +1 @@ -chromium +google-chrome-stable diff --git a/.settings/editor.sh b/.settings/editor.sh index 4401e48..58c11b4 100755 --- a/.settings/editor.sh +++ b/.settings/editor.sh @@ -1 +1 @@ -mousepad \ No newline at end of file +~/dotfiles/.settings/terminal.sh -e vim \ No newline at end of file diff --git a/.settings/networkmanager.sh b/.settings/networkmanager.sh index f3d8804..e69de29 100755 --- a/.settings/networkmanager.sh +++ b/.settings/networkmanager.sh @@ -1 +0,0 @@ -nm-connection-editor \ No newline at end of file diff --git a/.settings/software.sh b/.settings/software.sh index 61bd6e1..e69de29 100755 --- a/.settings/software.sh +++ b/.settings/software.sh @@ -1 +0,0 @@ -alacritty -e pacseek \ No newline at end of file diff --git a/Vimix-hyprcursors/hyprcursors/alias.hlc b/Vimix-hyprcursors/hyprcursors/alias.hlc new file mode 100644 index 0000000..57284db Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/alias.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/all-scroll.hlc b/Vimix-hyprcursors/hyprcursors/all-scroll.hlc new file mode 100644 index 0000000..4c592a6 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/all-scroll.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/bottom_left_corner.hlc b/Vimix-hyprcursors/hyprcursors/bottom_left_corner.hlc new file mode 100644 index 0000000..22df3ee Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/bottom_left_corner.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/bottom_right_corner.hlc b/Vimix-hyprcursors/hyprcursors/bottom_right_corner.hlc new file mode 100644 index 0000000..324d2ef Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/bottom_right_corner.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/bottom_side.hlc b/Vimix-hyprcursors/hyprcursors/bottom_side.hlc new file mode 100644 index 0000000..fd09725 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/bottom_side.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/cell.hlc b/Vimix-hyprcursors/hyprcursors/cell.hlc new file mode 100644 index 0000000..6d5afbc Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/cell.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/center_ptr.hlc b/Vimix-hyprcursors/hyprcursors/center_ptr.hlc new file mode 100644 index 0000000..4a0c020 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/center_ptr.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/col-resize.hlc b/Vimix-hyprcursors/hyprcursors/col-resize.hlc new file mode 100644 index 0000000..888ec0f Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/col-resize.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/color-picker.hlc b/Vimix-hyprcursors/hyprcursors/color-picker.hlc new file mode 100644 index 0000000..5631c76 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/color-picker.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/context-menu.hlc b/Vimix-hyprcursors/hyprcursors/context-menu.hlc new file mode 100644 index 0000000..600c84d Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/context-menu.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/copy.hlc b/Vimix-hyprcursors/hyprcursors/copy.hlc new file mode 100644 index 0000000..dcdba11 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/copy.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/crosshair.hlc b/Vimix-hyprcursors/hyprcursors/crosshair.hlc new file mode 100644 index 0000000..e4a0113 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/crosshair.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/default.hlc b/Vimix-hyprcursors/hyprcursors/default.hlc new file mode 100644 index 0000000..00b18f4 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/default.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/dnd-move.hlc b/Vimix-hyprcursors/hyprcursors/dnd-move.hlc new file mode 100644 index 0000000..58e7ef4 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/dnd-move.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/dnd-no-drop.hlc b/Vimix-hyprcursors/hyprcursors/dnd-no-drop.hlc new file mode 100644 index 0000000..fba6657 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/dnd-no-drop.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/down-arrow.hlc b/Vimix-hyprcursors/hyprcursors/down-arrow.hlc new file mode 100644 index 0000000..082d2f0 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/down-arrow.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/draft.hlc b/Vimix-hyprcursors/hyprcursors/draft.hlc new file mode 100644 index 0000000..bbeb545 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/draft.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/fleur.hlc b/Vimix-hyprcursors/hyprcursors/fleur.hlc new file mode 100644 index 0000000..fea1f30 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/fleur.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/help.hlc b/Vimix-hyprcursors/hyprcursors/help.hlc new file mode 100644 index 0000000..65adacc Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/help.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/left-arrow.hlc b/Vimix-hyprcursors/hyprcursors/left-arrow.hlc new file mode 100644 index 0000000..6f2c2ec Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/left-arrow.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/left_side.hlc b/Vimix-hyprcursors/hyprcursors/left_side.hlc new file mode 100644 index 0000000..78234ef Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/left_side.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/no-drop.hlc b/Vimix-hyprcursors/hyprcursors/no-drop.hlc new file mode 100644 index 0000000..5429b48 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/no-drop.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/not-allowed.hlc b/Vimix-hyprcursors/hyprcursors/not-allowed.hlc new file mode 100644 index 0000000..3a05688 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/not-allowed.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/openhand.hlc b/Vimix-hyprcursors/hyprcursors/openhand.hlc new file mode 100644 index 0000000..b9c9b98 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/openhand.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/pencil.hlc b/Vimix-hyprcursors/hyprcursors/pencil.hlc new file mode 100644 index 0000000..a052ea1 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/pencil.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/pirate.hlc b/Vimix-hyprcursors/hyprcursors/pirate.hlc new file mode 100644 index 0000000..e9ab8d9 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/pirate.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/pointer.hlc b/Vimix-hyprcursors/hyprcursors/pointer.hlc new file mode 100644 index 0000000..6562f8e Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/pointer.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/progress.hlc b/Vimix-hyprcursors/hyprcursors/progress.hlc new file mode 100644 index 0000000..5818a37 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/progress.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/right-arrow.hlc b/Vimix-hyprcursors/hyprcursors/right-arrow.hlc new file mode 100644 index 0000000..c998086 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/right-arrow.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/right_ptr.hlc b/Vimix-hyprcursors/hyprcursors/right_ptr.hlc new file mode 100644 index 0000000..d24ae29 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/right_ptr.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/right_side.hlc b/Vimix-hyprcursors/hyprcursors/right_side.hlc new file mode 100644 index 0000000..904cd5e Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/right_side.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/row-resize.hlc b/Vimix-hyprcursors/hyprcursors/row-resize.hlc new file mode 100644 index 0000000..2c6be18 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/row-resize.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/size_bdiag.hlc b/Vimix-hyprcursors/hyprcursors/size_bdiag.hlc new file mode 100644 index 0000000..aec8bff Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/size_bdiag.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/size_fdiag.hlc b/Vimix-hyprcursors/hyprcursors/size_fdiag.hlc new file mode 100644 index 0000000..291f2a0 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/size_fdiag.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/size_hor.hlc b/Vimix-hyprcursors/hyprcursors/size_hor.hlc new file mode 100644 index 0000000..8224cc7 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/size_hor.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/size_ver.hlc b/Vimix-hyprcursors/hyprcursors/size_ver.hlc new file mode 100644 index 0000000..6804b53 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/size_ver.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/text.hlc b/Vimix-hyprcursors/hyprcursors/text.hlc new file mode 100644 index 0000000..8dea530 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/text.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/top_left_corner.hlc b/Vimix-hyprcursors/hyprcursors/top_left_corner.hlc new file mode 100644 index 0000000..bc845a7 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/top_left_corner.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/top_right_corner.hlc b/Vimix-hyprcursors/hyprcursors/top_right_corner.hlc new file mode 100644 index 0000000..4d61184 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/top_right_corner.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/top_side.hlc b/Vimix-hyprcursors/hyprcursors/top_side.hlc new file mode 100644 index 0000000..4fb8fae Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/top_side.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/up-arrow.hlc b/Vimix-hyprcursors/hyprcursors/up-arrow.hlc new file mode 100644 index 0000000..1883dc5 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/up-arrow.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/vertical-text.hlc b/Vimix-hyprcursors/hyprcursors/vertical-text.hlc new file mode 100644 index 0000000..32a0af7 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/vertical-text.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/wait.hlc b/Vimix-hyprcursors/hyprcursors/wait.hlc new file mode 100644 index 0000000..c3fdb69 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/wait.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/wayland-cursor.hlc b/Vimix-hyprcursors/hyprcursors/wayland-cursor.hlc new file mode 100644 index 0000000..c899bef Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/wayland-cursor.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/x-cursor.hlc b/Vimix-hyprcursors/hyprcursors/x-cursor.hlc new file mode 100644 index 0000000..fb7f925 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/x-cursor.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/zoom-in.hlc b/Vimix-hyprcursors/hyprcursors/zoom-in.hlc new file mode 100644 index 0000000..d2f0f65 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/zoom-in.hlc differ diff --git a/Vimix-hyprcursors/hyprcursors/zoom-out.hlc b/Vimix-hyprcursors/hyprcursors/zoom-out.hlc new file mode 100644 index 0000000..e35a516 Binary files /dev/null and b/Vimix-hyprcursors/hyprcursors/zoom-out.hlc differ diff --git a/Vimix-hyprcursors/manifest.hl b/Vimix-hyprcursors/manifest.hl new file mode 100644 index 0000000..cfcc906 --- /dev/null +++ b/Vimix-hyprcursors/manifest.hl @@ -0,0 +1,4 @@ +name = Extracted Theme +description = Automatically extracted with hyprcursor-util +version = 0.1 +cursors_directory = hyprcursors diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf index 2716134..a88d4cb 100644 --- a/hypr/conf/autostart.conf +++ b/hypr/conf/autostart.conf @@ -34,6 +34,3 @@ exec-once = pypr # Start autostart cleanup exec-once = ~/dotfiles/hypr/scripts/cleanup.sh - -# Load configuration from ML4W Hyprland Settings App -exec = ~/.config/ml4w-hyprland-settings/hyprctl.sh diff --git a/hypr/conf/keybindings/default.conf b/hypr/conf/keybindings/default.conf index d9dc297..bc88632 100644 --- a/hypr/conf/keybindings/default.conf +++ b/hypr/conf/keybindings/default.conf @@ -40,7 +40,6 @@ bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh -bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh diff --git a/scripts/filemanager.sh b/scripts/filemanager.sh deleted file mode 100755 index af8fd0e..0000000 --- a/scripts/filemanager.sh +++ /dev/null @@ -1 +0,0 @@ -thunar \ No newline at end of file diff --git a/scripts/installtimeshift.sh b/scripts/installtimeshift.sh deleted file mode 100755 index 44c4859..0000000 --- a/scripts/installtimeshift.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/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 -} - -timeshift_installed=$(_isInstalledYay "timeshift") -grubbtrfs_installed=$(_isInstalledYay "grub-btrfs") - -if [[ $timeshift_installed == "0" ]] ;then - echo ":: Timeshift is already installed" -else - if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then - yay -S timeshift - fi -fi -if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "0" ]] ;then - echo ":: grub-btrfs is already installed" -else - echo ":: grub-btrfs is required to select a snapshot on grub bootloader." - if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then - yay -S grub-btrfs - fi -fi -sleep 3 diff --git a/scripts/installupdates.sh b/scripts/installupdates.sh deleted file mode 100755 index 2a2ad73..0000000 --- a/scripts/installupdates.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# ___ _ _ _ _ _ _ _ -# |_ _|_ __ ___| |_ __ _| | | | | | |_ __ __| | __ _| |_ ___ ___ -# | || '_ \/ __| __/ _` | | | | | | | '_ \ / _` |/ _` | __/ _ \/ __| -# | || | | \__ \ || (_| | | | | |_| | |_) | (_| | (_| | || __/\__ \ -# |___|_| |_|___/\__\__,_|_|_| \___/| .__/ \__,_|\__,_|\__\___||___/ -# |_| -# by Stephan Raabe (2024) -# ----------------------------------------------------- -# Required: yay trizen timeshift btrfs-grub -# ----------------------------------------------------- - -sleep 1 -clear -figlet "Updates" -echo -_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 -} - -# ------------------------------------------------------ -# Confirm Start -# ------------------------------------------------------ - -if gum confirm "DO YOU WANT TO START THE UPDATE NOW?" ;then - echo - echo ":: Update started." -elif [ $? -eq 130 ]; then - exit 130 -else - echo - echo ":: Update canceled." - exit; -fi - -if [[ $(_isInstalledYay "timeshift") == "0" ]] ;then - if gum confirm "DO YOU WANT TO CREATE A SNAPSHOT?" ;then - echo - c=$(gum input --placeholder "Enter a comment for the snapshot...") - sudo timeshift --create --comments "$c" - sudo timeshift --list - sudo grub-mkconfig -o /boot/grub/grub.cfg - echo ":: DONE. Snapshot $c created!" - echo - elif [ $? -eq 130 ]; then - echo ":: Snapshot canceled." - exit 130 - else - echo ":: Snapshot canceled." - fi - echo -fi - -yay - -notify-send "Update complete" -echo -echo ":: Update complete" -sleep 2 diff --git a/scripts/onedrive.sh b/scripts/onedrive.sh deleted file mode 100755 index ce2e28c..0000000 --- a/scripts/onedrive.sh +++ /dev/null @@ -1,12 +0,0 @@ -# ___ ____ _ -# / _ \ _ __ ___| _ \ _ __(_)_ _____ -# | | | | '_ \ / _ \ | | | '__| \ \ / / _ \ -# | |_| | | | | __/ |_| | | | |\ V / __/ -# \___/|_| |_|\___|____/|_| |_| \_/ \___| -# -# -# by Stephan Raabe (2023) -# ----------------------------------------------------- - -rclone --vfs-cache-mode writes mount OneDrive: ~/OneDrive & -notify-send "OneDrive connected" "Microsoft OneDrive successfully mounted." diff --git a/scripts/snapshot.sh b/scripts/snapshot.sh deleted file mode 100755 index 51c5d3e..0000000 --- a/scripts/snapshot.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# ____ _ _ -# / ___| _ __ __ _ _ __ ___| |__ ___ | |_ -# \___ \| '_ \ / _` | '_ \/ __| '_ \ / _ \| __| -# ___) | | | | (_| | |_) \__ \ | | | (_) | |_ -# |____/|_| |_|\__,_| .__/|___/_| |_|\___/ \__| -# |_| -# -# by Stephan Raabe (2024) -# ----------------------------------------------------- - -sleep 1 -clear -figlet "Snapshot" - -_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 -} - -timeshift_installed=$(_isInstalledYay "timeshift") -grubbtrfs_installed=$(_isInstalledYay "grub-btrfs") - -if [[ $timeshift_installed == "0" ]] ;then - c=$(gum input --placeholder "Enter a comment for the snapshot...") - sudo timeshift --create --comments "$c" - sudo timeshift --list - if [[ -d /boot/grub ]] ;then - if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "1" ]] ;then - if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then - yay -S grub-btrfs - - else - exit - fi - fi - sudo grub-mkconfig -o /boot/grub/grub.cfg - fi - echo "DONE. Snapshot $c created!" -else - echo "ERROR: Timeshift is not installed." - if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then - yay -S timeshift - echo - echo ":: Timeshift has been installed. Please restart this script." - if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "1" ]] ;then - echo ":: grub-btrfs is required to select a snapshot on grub bootloader." - if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then - yay -S grub-btrfs - else - exit - fi - fi - fi -fi \ No newline at end of file diff --git a/waybar/modules.json b/waybar/modules.json index 754ad89..64b2096 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -102,8 +102,7 @@ "return-type": "json", "exec": "~/dotfiles/scripts/updates.sh", "restart-interval": 60, - "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh", - "on-click-right": "~/dotfiles/.settings/software.sh" + "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh" }, // Wallpaper diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index 677ff08..453f2eb 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -100,7 +100,6 @@ "exec": "~/dotfiles/scripts/updates.sh", "restart-interval": 60, "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh", - "on-click-right": "~/dotfiles/.settings/software.sh", "tooltip": false },