fix: install ohmyzsh only if haven't

.bashrc

@@ -109,7 +109,7 @@ alias setkb='setxkbmap de;echo "Keyboard set back to de."'
 alias res1='xrandr --output DisplayPort-0 --mode 2560x1440 --rate 120'
 alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120'
 
-export PATH="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH"
+export PATH="/usr/lib/ccache/bin/:$PATH"
 
 # -----------------------------------------------------
 # DEVELOPMENT

.install/cleanup.sh

@@ -13,6 +13,24 @@ 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."

.install/fcitx5.sh

@@ -1,24 +0,0 @@
-# ------------------------------------------------------
-# Select fcitx5 or not
-# ------------------------------------------------------
-echo -e "${GREEN}"
-figlet "fcitx5"
-echo -e "${NONE}"
-
-if gum confirm "Do you want to install fcitx5 and chinese input method?" ;then
-    packagesPacman=(
-        "fcitx5"
-        "fcitx5-chinese-addons"
-        "fcitx5-configtool"
-        "fcitx5-gtk"
-        "fcitx5-qt"
-    );
-    packagesYay=(
-        "fcitx5-skin-seasons"
-    );
-    source .install/install-packages.sh
-    echo -e "\n# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-    echo "# fcitx5 support" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-    echo "# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-    echo "source = ~/dotfiles/hypr/conf/fcitx5.conf" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-fi

.install/hidpi.sh

@@ -1,21 +0,0 @@
-
-# ------------------------------------------------------
-# hidpi support
-# ------------------------------------------------------
-
-echo -e "${GREEN}"
-figlet "hidpi"
-echo -e "${NONE}"
-
-hidpiconfirm="Do you want 2x hidpi scale?"
-if gum confirm "$hidpiconfirm"; then
-    sed -i -E 's/size = [0-9]+(\.[0-9]+)?/size = 16/' ~/dotfiles-versions/$version/alacritty/alacritty.toml
-    sed -i -E 's/[0-9]+(\.[0-9]+)?/16/' ~/dotfiles-versions/$version/.settings/rofi-font.rasi
-    echo -e '\n# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
-    echo -e '# HiDPI Scaling' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
-    echo -e '# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
-    echo -e 'source = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
-    sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf
-    sed -i -E 's/24/32/' ~/dotfiles-versions/$version/hypr/conf/cursor.conf
-    echo ":: finished hidpi patch."
-fi

.install/hyprland-dotfiles.sh

@@ -5,9 +5,6 @@
 if [ -d ~/dotfiles-versions/$version/alacritty ]; then
     _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/kitty ]; then
-    _installSymLink kitty ~/.config/kitty ~/dotfiles/kitty/ ~/.config
-fi
 if [ -d ~/dotfiles-versions/$version/vim ]; then
     _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
 fi
@@ -46,12 +43,5 @@ fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
     _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
 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
-    if [ ! -d ~/.local/share/icons ]; then mkdir -pv ~/.local/share/icons; fi
-    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors ~/.local/share/icons/
-fi
 echo ":: Symbolic links created."
 echo

.install/packages/general-packages.sh

@@ -1,57 +1,65 @@
 packagesPacman=(
     "pacman-contrib"
     "vim"
-    "bat"
+    "bluez"
-    "fzf"
+    "bluez-utils"
-    "zsh"
-    "fastfetch"
-    "ranger"
-    "btop"
     "neovim"
     "wget"
     "unzip"
     "alacritty" 
+    "chromium" 
     "dunst" 
     "starship"
     "mpv" 
     "thunar"
     "nautilus" 
+    "mousepad"
     "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" 
     "python-pywal"
+    "python-gobject"
     "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"
+    "bibata-cursor-theme" 
-    "orchis-theme"
     "trizen"
-    "google-chrome"
+    "pacseek"
 );

.install/packages/hyprland-packages.sh

@@ -9,11 +9,9 @@ packagesPacman=(
     "slurp"
     "swappy"
     "cliphist"
-    "kitty"
 );
 
 packagesYay=(
-    "pyprland"
     "wlogout"
     "nwg-look"
     "eww"

.install/qtile-dotfiles.sh

@@ -35,7 +35,4 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
-    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
-fi
 echo ":: Symbolic links created."

.install/wallpaper.sh

@@ -5,17 +5,16 @@ echo -e "${GREEN}"
 figlet "Wallpapers"
 echo -e "${NONE}"
 if [ ! -d ~/wallpaper ]; then
-    echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?"
+    echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
     echo "If not, the script will install 3 default wallpapers in ~/wallpaper/"
     echo ""
     if gum confirm "Do you want to download the repository?" ;then
-        # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
+        wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
-        # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
+        unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
-        # if [ ! -d ~/wallpaper/ ]; then
+        if [ ! -d ~/wallpaper/ ]; then
-        #     mkdir ~/wallpaper
+            mkdir ~/wallpaper
-        # fi
+        fi
-        # cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        cp ~/Downloads/wallpaper-main/* ~/wallpaper/
-        git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper
         echo "Wallpapers from the repository installed successfully."
     elif [ $? -eq 130 ]; then
         exit 130

.install/zsh.sh

@@ -7,13 +7,16 @@ echo "Please select the zsh plugin manager:"
 zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "oh my zsh" "zinit")
 if [[ "${zsh_manager}" == *"oh my zsh"* ]]; then
     source .install/install-packages.sh
-    RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+    if [ ! -d ~/.oh-my-zsh ]; then
-	git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+        RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-	git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
+    fi
-	_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_ohmyzsh ~/.zshrc
+    git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+    git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
+    _installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_ohmyzsh ~/.zshrc
 else
     packagesYay=("zinit");
-	source .install/install-packages.sh
+    source .install/install-packages.sh
     _installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~/.zshrc
 fi
 _installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~/

.settings/browser.sh

@@ -1 +1 @@
-google-chrome-stable
+chromium

.settings/editor.sh

@@ -1 +1 @@
-~/dotfiles/.settings/terminal.sh -e vim
+mousepad

.settings/networkmanager.sh

@@ -0,0 +1 @@
+nm-connection-editor

.settings/rofi-border-radius.rasi

@@ -1,3 +0,0 @@
-* {
-    border-radius:  15px;
-}

.settings/rofi-border.rasi

@@ -1,3 +1 @@
-* {
+* { border-width: 3px; }
-    border-width:   2px;
-}

.settings/software.sh

@@ -0,0 +1 @@
+alacritty -e pacseek

.zshrc_ohmyzsh

@@ -42,7 +42,7 @@ export PATH=$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
 
 export LANG=en_US.UTF-8
 
-export EDITOR='vim'
+export EDITOR='nvim'
 
 export MAKEFLAGS='-j$(nproc)'
 export CFLAGS='-march=native -O2 -pipe'
@@ -55,8 +55,16 @@ alias wakemac="wakeonlan  18:C0:4D:8D:56:0E"
 alias ls="eza --icons=auto"
 alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
 alias bat="bat --paging=never"
+alias code="code --ozone-platform=wayland --enable-wayland-ime"
 # fix ssh if in kitty
-[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
+    alias ssh="kitty +kitten ssh"
+fi
+
+# -----------------------------------------------------
+# Completion
+# -----------------------------------------------------
+[[ -f /home/wyj/.dart-cli-completion/zsh-config.zsh ]] && . /home/wyj/.dart-cli-completion/zsh-config.zsh || true
 
 # -----------------------------------------------------
 # evals

.zshrc_zinit

@@ -46,7 +46,9 @@ eval "$(fzf --zsh)"
 # Miscs
 # -----------------------------------------------------
 # fix ssh if in kitty
-[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
+    alias ssh="kitty +kitten ssh"
+fi
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

Vimix-hyprcursors/manifest.hl

@@ -1,4 +0,0 @@
-name = Extracted Theme
-description = Automatically extracted with hyprcursor-util
-version = 0.1
-cursors_directory = hyprcursors

alacritty/alacritty.toml

@@ -1,5 +1,5 @@
 [font]
-size = 16.0
+size = 12.0
 
 [font.normal]
 family = "FiraCode Nerd Font"
@@ -11,6 +11,3 @@ opacity = 0.7
 [window.padding]
 x = 15
 y = 15
-
-[selection]
-save_to_clipboard = true

chrome-flags.conf

@@ -1 +0,0 @@
---ozone-platform=wayland --enable-wayland-ime

fastfetch/config.jsonc

@@ -1,165 +1,110 @@
-// Note that you must replace the image path to an existing image to display it.
+//  Thanks to Bina
-
 {
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    // "logo": {
+  "logo": {
-    //     "type": "iterm",
+      "padding": {
-    //     "source": "/Users/carter/Desktop/apple1.png",
+      "top": 2
-    //     "width": 28,
+      }
-    //     "height": 12
+  },
-    // },
+  "display": {
-    "display": {
+        "separator": " ➜  "
-    //    "separator": "  "
+  },
-        "separator": " "
+  "modules": [
-    },
+      "break",
-    "modules": [
+      "break",
-        {
+      "break",
-            "type": "host",
+       {
-            "key": "╭─󰌢",
+          "type": "os",
-            "keyColor": "green"
+          "key": "OS   ",
-        },
+          "keyColor": "31",  // = color1
-        {
+      },
-            "type": "cpu",
+      {
-            "key": "├─󰻠",
+          "type": "kernel",
-            "keyColor": "green"
+          "key": " ├  ",
-        },
+          "keyColor": "31",
-        {
+      },
-            "type": "gpu",
+      {
-            "key": "├─󰍛",
+          "type": "packages",
-            "keyColor": "green"
+          "format": "{} (pacman)",
-        },
+          "key": " ├ 󰏖 ",
-        {
+          "keyColor": "31",  
-            "type": "disk",
+      },
-            "key": "├─",
+      {
-            "keyColor": "green"
+          "type": "shell",
-        },
+          "key": " └  ",
-        {
+          "keyColor": "31", 
-            "type": "memory",
+      },
-            "key": "├─󰑭",
+      "break",
-            "keyColor": "green"
+      {
-        },
+          "type": "wm",
-        {
+          "key": "WM   ",
-            "type": "swap",
+          "keyColor": "32", 
-            "key": "├─󰓡",
+      },
-            "keyColor": "green"
+      {
-        },
+          "type": "wmtheme",
-        {
+          "key": " ├ 󰉼 ",
-            "type": "display",
+          "keyColor": "32",
-            "key": "├─󰍹",
+      },
-            "keyColor": "green"
+      {
-        },
+          "type": "icons",
-        {
+          "key": " ├ 󰀻 ",
-            "type": "battery",
+          "keyColor": "32",
-            "key": "├─",
+      },
-            "keyColor": "green"
+      {
-        },
+          "type": "cursor",
-        {
+          "key": " ├  ",
-            "type": "poweradapter",
+          "keyColor": "32", 
-            "key": "├─",
+      },
-            "keyColor": "green"
+      {
-        },
+          "type": "terminal",
-        {
+          "key": " ├  ",
-            "type": "gamepad",
+          "keyColor": "32",
-            "key": "├─",
+      },
-            "keyColor": "green"
+      {
-        },
+          "type": "terminalfont",
-        {
+          "key": " └  ",
-            "type": "bluetooth",
+          "keyColor": "32", 
-            "key": "├─",
+      },
-            "keyColor": "green"
+      "break",
-        },
+      {
-        {
+          "type": "host",
-            "type": "sound",
+          "format": "{5} {1} Type {2}",
-            "key": "╰─",
+          "key": "PC   ",
-            "keyColor": "green"
+          "keyColor": "33",
-        },
+      },
-        "break",
+      {
-
+          "type": "cpu",
-        {
+          "format": "{1} ({3}) @ {7} GHz",
-            "type": "shell",
+          "key": " ├  ",
-            "key": "╭─",
+          "keyColor": "33",
-            "keyColor": "yellow"
+      },
-        },
+      {
-        {
+          "type": "gpu",
-            "type": "terminal",
+          "format": "{1} {2} @ {12} GHz",            
-            "key": "├─",
+          "key": " ├ 󰢮 ",
-            "keyColor": "yellow"
+          "keyColor": "33",
-        },
+      },
-        {
+      {
-            "type": "terminalfont",
+          "type": "memory",
-            "key": "├─",
+          "key": " ├  ",
-            "keyColor": "yellow"
+          "keyColor": "33",
-        },
+      },
-        {
+      {
-            "type": "lm",
+          "type": "swap",
-            "key": "├─󰧨",
+          "key": " ├ 󰓡 ",
-            "keyColor": "yellow"
+          "keyColor": "33",
-        },
+      },
-        {
+      {
-            "type": "de",
+          "type": "disk",
-            "key": "├─",
+          "key": " ├ 󰋊 ",
-            "keyColor": "yellow"
+          "keyColor": "33",
-        },
+      },
-        {
+      {
-            "type": "wm",
+          "type": "monitor",
-            "key": "├─",
+          "key": " └  ",
-            "keyColor": "yellow"
+          "keyColor": "33",
-        },
+      },
-        {
+      "break",
-            "type": "theme",
+      "break",
-            "key": "├─󰉼",
+  ]
-            "keyColor": "yellow"
-        },
-        {
-            "type": "icons",
-            "key": "╰─󰀻",
-            "keyColor": "yellow"
-        },
-
-        "break",
-        {
-            "type": "title",
-            "key": "╭─",
-            "format": "{1}@{2}",
-            "keyColor": "blue"
-        },
-        {
-            "type": "os",
-            "key": "├─󰣇", // Just get your distro's logo off nerdfonts.com
-            "keyColor": "blue"
-        },
-        {
-            "type": "kernel",
-            "key": "├─",
-            "format": "{1} {2}",
-            "keyColor": "blue"
-        },
-        {
-            "type": "packages",
-            "key": "├─󰏖",
-            "keyColor": "blue"
-        },
-        {
-            "type": "uptime",
-            "key": "├─󰅐",
-            "keyColor": "blue"
-        },
-        {
-            "type": "media",
-            "key": "├─󰝚",
-            "keyColor": "blue"
-        },
-        {
-            "type": "localip",
-            "key": "╰─󰩟",
-            "compact": true,
-            "keyColor": "blue"
-        },
-        "break",
-        {
-            "type": "custom",
-            "format": " \u001b[90m󱓻  \u001b[31m󱓻  \u001b[32m󱓻  \u001b[33m󱓻  \u001b[34m󱓻  \u001b[35m󱓻  \u001b[36m󱓻  \u001b[37m󱓻  \u001b[38m󱓻  \u001b[39m󱓻"
-        }
-    ]
 }
-

hypr/conf/animation.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/animations-high.conf
+source = ~/dotfiles/hypr/conf/animations/default.conf

hypr/conf/autostart.conf

@@ -29,8 +29,8 @@ exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
 # Start ewww daemon
 exec-once = ~/dotfiles/hypr/scripts/eww.sh
 
-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

hypr/conf/cursor.conf

@@ -1,2 +1 @@
-exec-once = hyprctl setcursor Vimix-hyprcursors 24
+exec-once = hyprctl setcursor Bibata-Modern-Ice 24
-env = HYPRCURSOR_THEME,Vimix-hyprcursors

hypr/conf/decoration.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/decorations/custom.conf
+source = ~/dotfiles/hypr/conf/decorations/default.conf

hypr/conf/decorations/custom.conf

@@ -1,25 +0,0 @@
-# ----------------------------------------------------- 
-# General window decoration
-# name: "Default"
-# ----------------------------------------------------- 
-
-decoration {
-    rounding = 10
-    blur {
-        enabled = true
-        size = 10
-        passes = 3
-        new_optimizations = on
-        ignore_opacity = true
-        xray = false
-        blurls = waybar
-    }
-    active_opacity = 1.0
-    inactive_opacity = 0.8
-    fullscreen_opacity = 1.0
-
-    drop_shadow = true
-    shadow_range = 30
-    shadow_render_power = 3
-    col.shadow = 0x66000000
-}

hypr/conf/fcitx5.conf

@@ -1,5 +0,0 @@
-exec-once = fcitx5-remote -r
-exec-once = fcitx5 -d --replace
-exec-once = fcitx5-remote -r
-
-bind=$mainMod CTRL, E, exec, pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r

hypr/conf/hidpi.conf

@@ -1,6 +0,0 @@
-xwayland {
-  force_zero_scaling = true
-}
-
-env = GDK_SCALE,2
-env = QT_SCALE_FACTOR,2

hypr/conf/keybinding.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/keybindings/custom.conf
+source = ~/dotfiles/hypr/conf/keybindings/default.conf

hypr/conf/keybindings/custom.conf

@@ -1,100 +0,0 @@
-# -----------------------------------------------------
-# Key bindings
-# name: "Default"
-# -----------------------------------------------------
-
-# SUPER KEY
-$mainMod = SUPER
-
-# Applications
-bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
-bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
-bind = $mainMod SHIFT, E, exec, emote
-
-# Windows
-bind = $mainMod, Q, killactive
-bind = $mainMod, F, fullscreen
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
-bind = $mainMod, T, togglefloating
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
-bind = $mainMod, J, togglesplit
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-bind = $mainMod SHIFT, right, resizeactive, 100 0
-bind = $mainMod SHIFT, left, resizeactive, -100 0
-bind = $mainMod SHIFT, up, resizeactive, 0 -100
-bind = $mainMod SHIFT, down, resizeactive, 0 100
-bind = $mainMod, G, togglegroup
-
-# Actions
-bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
-bind = $mainMod CTRL, Q, exec, wlogout
-bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
-bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
-bind = $mainMod, SPACE, exec, rofi -show drun -replace -i
-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, C, exec, ~/dotfiles/scripts/cliphist.sh
-bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
-bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
-bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
-bind = $mainMod CTRL, P, exec, hyprpicker -a
-bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
-bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh
-
-# Workspaces
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-bind = $mainMod CTRL, down, workspace, empty
-bind = $mainMod CTRL, left, workspace, e-1
-bind = $mainMod CTRL, right, workspace, e+1
-
-# Fn keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
-bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')"
-bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')"
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bind = , XF86AudioPlay, exec, playerctl play-pause
-bind = , XF86AudioPause, exec, playerctl pause
-bind = , XF86AudioNext, exec, playerctl next
-bind = , XF86AudioPrev, exec, playerctl previous
-bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bind = , XF86Calculator, exec, qalculate-gtk
-bind = , XF86Lock, exec, hyprlock
-bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh
-
-# Passthrough SUPER KEY to Virtual Machine
-bind = $mainMod, P, submap, passthru
-submap = passthru
-bind = SUPER, Escape, submap, reset
-submap = reset
-
-# Pyprland
-bind = $mainMod SHIFT, RETURN, exec, pypr toggle term

hypr/conf/keyboard.conf

@@ -3,7 +3,7 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 # -----------------------------------------------------
 input {
-    kb_layout = us
+    kb_layout = de
     kb_variant = 
     kb_model =
     kb_options =
@@ -11,9 +11,7 @@ input {
     follow_mouse = 1
     mouse_refocus=false
     touchpad {
-        natural_scroll = true
+        natural_scroll = false
-        disable_while_typing=true
-        tap-to-click=true
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }

hypr/conf/layouts/laptop.conf

@@ -12,12 +12,5 @@ master {
 }
 
 gestures {
-  workspace_swipe=true
+    workspace_swipe = true
-  workspace_swipe_fingers=3
-  workspace_swipe_distance=400
-  workspace_swipe_invert=true
-  workspace_swipe_min_speed_to_force=30
-  workspace_swipe_cancel_ratio=0.5
-  workspace_swipe_create_new=true
-  workspace_swipe_forever=true
 }

hypr/conf/misc.conf

@@ -5,6 +5,4 @@
 misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
-    enable_swallow = true
-    swallow_regex = ^(Alacritty)$
 }

hypr/conf/monitors/4k.conf

@@ -1,6 +0,0 @@
-# ----------------------------------------------------- 
-# Monitor Setup
-# name: "Default"
-# ----------------------------------------------------- 
-
-monitor=,preferred,auto,2

hypr/conf/monitors/dual.conf

@@ -1,10 +0,0 @@
-# ----------------------------------------------------- 
-# Monitor Setup
-# name: "Default"
-# ----------------------------------------------------- 
-
-monitor=DP-1,preferred,0x0,2
-monitor=HDMI-A-1,3840x2160,1920x-275,2,transform,1
-
-workspace=1,monitor:DP-1
-exec-once=hyprctl dispatch workspace 1

hypr/conf/windowrule.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/windowrules/custom.conf
+source = ~/dotfiles/hypr/conf/windowrules/default.conf

hypr/conf/windowrules/custom.conf

@@ -1,21 +0,0 @@
-# -----------------------------------------------------
-# Window rules
-# -----------------------------------------------------
-
-windowrule = tile,^(Microsoft-edge)$
-windowrule = tile,^(Brave-browser)$
-windowrule = tile,^(Chromium)$
-windowrule = float,^(pavucontrol)$
-windowrule = float,^(blueman-manager)$
-windowrule = float,^(nm-connection-editor)$
-windowrule = float,^(qalculate-gtk)$
-windowrule = float,^(showmethekey-gtk)$
-windowrule = pin,^(showmethekey-gtk)$
-layerrule = blur, gtk-layer-shell
-layerrule = blur, logout_dialog
-
-windowrule = float,title=^(Mathematica)$
-windowrule = opacity 0.75, ^(Code)$
-windowrule = opacity 0.75, ^(code-url-handler)$
-windowrule = float,^(QQ)$
-windowrule = float,^(fdm)$

hypr/conf/windows/default.conf

@@ -6,7 +6,7 @@
 general {
     gaps_in = 10
     gaps_out = 14
-    border_size = 2
+    border_size = 3
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle

hypr/pyprland.toml

@@ -1,12 +0,0 @@
-[pyprland]
-
-plugins = [
-  "scratchpads",
-  "magnify",
-]
-
-[scratchpads.term]
-animation = "fromTop"
-command = "kitty --class kitty-dropterm"
-class = "kitty-dropterm"
-size = "75% 60%"

hypr/scripts/gtk.sh

@@ -29,7 +29,7 @@ gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
 gsettings set "$gnome_schema" font-name "$font_name"
 gsettings set "$gnome_schema" color-scheme "prefer-dark"
 
-# if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
+if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
-#     echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
+    echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
-#     hyprctl setcursor $cursor_theme $cursor_size
+    hyprctl setcursor $cursor_theme $cursor_size
-# fi
+fi

install.sh

@@ -45,7 +45,6 @@ source .install/remove.sh
 source .install/general.sh
 source .install/packages/general-packages.sh
 source .install/install-packages.sh
-source .install/fcitx5.sh
 source .install/profile.sh
 if [[ $profile == *"Hyprland"* ]]; then
     echo -e "${GREEN}"
@@ -62,7 +61,6 @@ if [[ $profile == *"Qtile"* ]]; then
     source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
-source .install/hidpi.sh
 source .install/displaymanager.sh
 source .install/issue.sh
 source .install/restore.sh

kitty/kitty.conf

@@ -1,14 +0,0 @@
-font_family     Fira Code Nerd Font
-font_size 	    14.0
-bold_font       auto
-italic_font      auto
-bold_italic_font auto
-
-background_opacity 0.7
-
-confirm_os_window_close 0
-
-enable_audio_bell no
-
-selection_foreground #000000
-selection_background #F5FBFF

rofi/config-cliphist.rasi

@@ -38,13 +38,12 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
     width:                        400px;
     x-offset:                     -14px;
-    y-offset:                     14px;
+    y-offset:                     65px;
     spacing:                      0px;
     padding:                      0px;
     margin:                       0px; 
@@ -57,7 +56,7 @@ window {
     anchor:                       northeast;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -121,7 +120,6 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
-    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -134,7 +132,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -162,8 +160,7 @@ listview {
     padding:                      10px;
     margin:                       0px;
     background-color:             @background;
-    border:                       0px;
+    border:0px;
-    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -173,7 +170,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
 }
 

rofi/config-compact.rasi

@@ -39,7 +39,6 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
@@ -58,7 +57,7 @@ window {
     anchor:                       north;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -122,7 +121,6 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
-    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -135,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -163,8 +161,7 @@ listview {
     padding:                      10px;
     margin:                       0px;
     background-color:             @background;
-    border:                       0px;
+    border:0px;
-    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -174,7 +171,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
 }
 

rofi/config-power.rasi

@@ -38,7 +38,6 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
@@ -57,7 +56,7 @@ window {
     anchor:                       center;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -133,7 +132,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -171,7 +170,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
 }
 

rofi/config-screenshot.rasi

@@ -38,7 +38,6 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
@@ -57,7 +56,7 @@ window {
     anchor:                       center;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -133,7 +132,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -171,7 +170,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
 }
 

rofi/config-short.rasi

@@ -38,7 +38,6 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
@@ -58,7 +57,7 @@ window {
     anchor:                       northeast;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -134,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -172,7 +171,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
 }
 

rofi/config-themes.rasi

@@ -38,13 +38,12 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
     width:                        400px;
     x-offset:                     0px;
-    y-offset:                     14px;
+    y-offset:                     65px;
     spacing:                      0px;
     padding:                      0px;
     margin:                       0px; 
@@ -57,7 +56,7 @@ window {
     anchor:                       north;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -121,7 +120,6 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
-    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -134,7 +132,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -162,8 +160,7 @@ listview {
     padding:                      10px;
     margin:                       0px;
     background-color:             @background;
-    border:                       0px;
+    border:0px;
-    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -173,7 +170,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
 }
 

rofi/config-wallpaper.rasi

@@ -33,13 +33,12 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
     width:                        761px;
     x-offset:                     0px;
-    y-offset:                     14px;
+    y-offset:                     65px;
     spacing:                      0px;
     padding:                      0px;
     margin:                       0px; 
@@ -52,7 +51,7 @@ window {
     anchor:                       north;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -115,7 +114,6 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
-    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -128,7 +126,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -157,7 +155,6 @@ listview {
     fixed-columns:                true;    
     background-color:             @background;
     border:                       0px;
-    border-radius:                0px;
     flow:                         horizontal;      
 }
 
@@ -168,7 +165,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
     orientation:                  vertical;
 }

rofi/config.rasi

@@ -39,7 +39,6 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
-@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {
@@ -51,14 +50,14 @@ window {
     margin:                       0px; 
     color:                        #FFFFFF;
     border:                       @border-width;
-    border-color:                 @foreground;
+    border-color:                 #FFFFFF;
     cursor:                       "default";
     transparency:                 "real";
     location:                     center;
     anchor:                       center;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             transparent;
 }
 
@@ -100,7 +99,7 @@ inputbar {
     text-color:                   @foreground;
     spacing:                      10px;
     padding:                      15px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border-color:                 @foreground;
     background-color:             @background;
     children:                     [ "textbox-prompt-colon", "entry" ];
@@ -122,7 +121,6 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
-    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -135,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -173,7 +171,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                @border-radius;
+    border-radius:                10px;
     border:                       @border-width;
 }
 

scripts/filemanager.sh

@@ -0,0 +1 @@
+thunar

scripts/installtimeshift.sh

@@ -0,0 +1,42 @@
+#!/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