Updates

.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/before_restore.sh

@@ -1,6 +1,7 @@
 # ------------------------------------------------------
-# install fish
+# Modify existing files before restore starts
 # ------------------------------------------------------
-packagesPacman=("fish");
+
-packagesYay=();
+if [ -d ~/dotfiles ] ;then
-source .install/install-packages.sh
+    echo ":: Modify existing files"
+fi

.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/diagnosis.sh

@@ -19,6 +19,7 @@ if gum confirm "Do you want to run a short system check?" ;then
     _commandExists "wlogout" "wlogout"
     _commandExists "eww" "eww"
     _commandExists "magick" "imagemagick"
+    _commandExists "waypaper" "waypaper"
 
 elif [ $? -eq 130 ]; then
     exit 130

.install/displaymanager.sh

@@ -63,10 +63,15 @@ if [ -z "${dmsel}" ] ;then
 fi
 if [ "$dmsel" == "Install sddm and theme" ] ;then
 
+    if [ -d /usr/share/sddm/themes/sugar-candy/ ] ;then
+        sudo rm -rf /usr/share/sddm/themes/sugar-candy/
+        echo ":: Sugar Candy folder removed"
+    fi
+
     disman=0
     # Try to force the installation of sddm
     echo ":: Install sddm"
-    yay -S --noconfirm sddm --ask 4
+    yay -S --noconfirm sddm sddm-sugar-candy-git --ask 4
 
     # Enable sddm
     if [ -f /etc/systemd/system/display-manager.service ]; then
@@ -74,41 +79,24 @@ if [ "$dmsel" == "Install sddm and theme" ] ;then
     fi
     sudo systemctl enable sddm.service
 
-    # Create sddm.conf.d folder
     if [ ! -d /etc/sddm.conf.d/ ]; then
         sudo mkdir /etc/sddm.conf.d
-        echo ":: Folder /etc/sddm.conf.d created."
+        echo "Folder /etc/sddm.conf.d created."
     fi
 
-    # Copy sddm.conf
     sudo cp sddm/sddm.conf /etc/sddm.conf.d/
-    echo ":: File /etc/sddm.conf.d/sddm.conf updated."
+    echo "File /etc/sddm.conf.d/sddm.conf updated."
 
-    # Download and install sugar candy theme if not exists
-    if [ ! -d /usr/share/sddm/themes/sugar-candy ]; then
-        if [ -f ~/Downloads/sddm-sugar-candy-master.zip ] ;then
-            rm ~/Downloads/sddm-sugar-candy-master.zip
-        fi
-        wget -P ~/Downloads/ https://framagit.org/MarianArlt/sddm-sugar-candy/-/archive/master/sddm-sugar-candy-master.zip
-        if [ -f ~/Downloads/sddm-sugar-candy-master.zip ] ;then
-            unzip -o -q ~/Downloads/sddm-sugar-candy-master.zip -d ~/Downloads/
-            if [ ! -d /usr/share/sddm/themes/sugar-candy ] ;then
-                sudo mkdir -p /usr/share/sddm/themes/sugar-candy
-            fi
-            sudo cp -r ~/Downloads/sddm-sugar-candy-master/* /usr/share/sddm/themes/sugar-candy
-            echo ":: SDDM Sugar Candy Theme installed"
-        else
-            echo "ERROR: Sugar Candy Download not found"
-        fi
-    fi    
-
-    # Install background wallpaper for sddm
     if [ -f /usr/share/sddm/themes/sugar-candy/theme.conf ]; then
+
+        # Cache file for holding the current wallpaper
         sudo cp wallpapers/default.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/current_wallpaper.jpg
-        echo ":: Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
+        echo "Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
+
         sudo cp sddm/theme.conf /usr/share/sddm/themes/sugar-candy/
         sudo sed -i 's/CURRENTWALLPAPER/'"current_wallpaper.jpg"'/' /usr/share/sddm/themes/sugar-candy/theme.conf
-        echo ":: File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
+        echo "File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
+
     fi
 
 elif [ "$dmsel" == "Deactivate current display manager" ] ;then

.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,15 +43,8 @@ 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
+if [ -d ~/dotfiles-versions/$version/waypaper ]; then
-    _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
+    _installSymLink waypaper ~/.config/waypaper ~/dotfiles/waypaper/ ~/.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
-if [ -d ~/dotfiles-versions/$version/ranger ]; then
-    _installSymLink ranger ~/.config/ranger ~/dotfiles/ranger/ ~/.config
 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"
+    "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

@@ -3,19 +3,18 @@ packagesPacman=(
     "hyprpaper"
     "hyprlock"
     "hypridle"
-    #    "xdg-desktop-portal-hyprland"
+    "xdg-desktop-portal-hyprland" 
     "waybar" 
     "grim" 
     "slurp"
     "swappy"
     "cliphist"
-    "kitty"
+);
-)
 
 packagesYay=(
-    "pyprland"
     "wlogout"
     "nwg-look"
     "eww"
     "hyprshade"
-)
+    "waypaper"
+);

.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/required.sh

@@ -8,7 +8,7 @@ echo
 
 # Check for required packages
 echo "Checking that required packages for the installation are installed..."
-_installPackagesPacman "rsync" "gum" "figlet" "python";
+_installPackagesPacman "rsync" "gum" "figlet" "python" "git";
 
 # Double check rsync
 if ! command -v rsync &> /dev/null; then

.install/restore.sh

@@ -14,14 +14,6 @@ _showRestoreOptions() {
         restorelist+="~/dotfiles/.bashrc "
         selectedlist+="~/dotfiles/.bashrc,"
     fi
-    if [ -f ~/dotfiles/.zshrc ]; then
-        restorelist+="~/dotfiles/.zshrc "
-        selectedlist+="~/dotfiles/.zshrc,"
-    fi
-    if [ -f ~/dotfiles/.p10k.zsh ]; then
-        restorelist+="~/dotfiles/.p10k.zsh "
-        selectedlist+="~/dotfiles/.p10k.zsh,"
-    fi
     if [ -d ~/dotfiles/.settings ]; then
         restorelist+="~/dotfiles/.settings "
         selectedlist+="~/dotfiles/.settings,"

.install/templates/keyboard-default.conf

@@ -24,7 +24,7 @@ input {
         # for laptop
         # natural_scroll = yes
         # middle_button_emulation = true
-        # clickfinger_behavior = 1          
+        # clickfinger_behavior = false          
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }

.install/templates/keyboard-laptop.conf

@@ -24,7 +24,7 @@ input {
         # for laptop
         natural_scroll = true
         middle_button_emulation = true
-        clickfinger_behavior = true
+        clickfinger_behavior = false
         disable_while_typing = true
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.

.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

@@ -1,22 +0,0 @@
-# ------------------------------------------------------
-# install zsh and zinit
-# ------------------------------------------------------
-packagesPacman=("zsh");
-
-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
-    if [ ! -d ~/.oh-my-zsh ]; then
-        RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-    fi
-    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
-    _installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~/.zshrc
-fi
-_installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~/

.install/zshfish.sh

@@ -1,25 +0,0 @@
-# ------------------------------------------------------
-# Select additional shell
-# ------------------------------------------------------
-echo -e "${GREEN}"
-figlet "Zsh Fish"
-echo -e "${NONE}"
-echo "Please select if you want to install zsh or fish."
-echo
-zshfish=$(gum choose --no-limit --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "zsh" "fish")
-
-if [ -z "${zshfish}" ] ;then
-    echo ":: No shell selected. Keep using bash."
-else
-    echo "Please select your default shell."
-	echo
-	shell=$(echo -e "bash\n$zshfish" | gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) ")
-    if [[ $zshfish == *"zsh"* ]]; then
-		echo ":: zsh selected"
-		source .install/zsh.sh
-	fi
-	if [[ $zshfish == *"fish"* ]]; then
-		echo ":: fish selected"
-		source .install/fish.sh
-	fi
-fi

.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

.settings/terminal.sh

@@ -1 +1 @@
-kitty
+alacritty

.settings/waybar-quicklinks.json

@@ -0,0 +1,26 @@
+{
+    "custom/quicklink1": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/browser.sh",
+        "tooltip-format": "Open browser"
+    }, 
+    /*
+    "custom/quicklink1": {
+        "format": "",
+        "on-click": "firefox",
+        "tooltip-format": "Open Firefox"
+    },
+    */ 
+    "custom/quicklink2": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/filemanager.sh",
+        "tooltip-format": "Open filemanager"
+    }, 
+    "group/quicklinks": {
+        "orientation": "horizontal",
+        "modules": [
+            "custom/quicklink1",
+            "custom/quicklink2"
+         ]
+    }
+}

.version/name

@@ -1 +1 @@
-2.9.1.2
+2.9.2

.version/version

@@ -1 +1 @@
-2912
+2920

.zshrc_ohmyzsh

@@ -1,88 +0,0 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# -----------------------------------------------------
-# Oh my zsh settings
-# -----------------------------------------------------
-
-# Path to your oh-my-zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
-
-# ZSH_THEME="robbyrussell"
-ZSH_THEME="powerlevel10k/powerlevel10k"
-
-# Uncomment the following line to use hyphen-insensitive completion.
-# Case-sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-zstyle ':omz:update' mode auto
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# You can also set it to another string to have that shown instead of the default red dots.
-# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
-# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
-COMPLETION_WAITING_DOTS="true"
-
-# -----------------------------------------------------
-# Plugins
-# -----------------------------------------------------
-plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
-
-source $ZSH/oh-my-zsh.sh
-
-# -----------------------------------------------------
-# Variables
-# -----------------------------------------------------
-export PATH=$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-# export MANPATH="/usr/local/man:$MANPATH"
-
-export LANG=en_US.UTF-8
-
-export EDITOR='nvim'
-
-export MAKEFLAGS='-j$(nproc)'
-export CFLAGS='-march=native -O2 -pipe'
-
-# -----------------------------------------------------
-# Alias
-# -----------------------------------------------------
-alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
-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
-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
-# -----------------------------------------------------
-eval $(thefuck --alias)
-eval "$(fzf --zsh)"
-
-# -----------------------------------------------------
-# PYWAL
-# -----------------------------------------------------
-cat ~/.cache/wal/sequences
-
-# -----------------------------------------------------
-# Custom
-# -----------------------------------------------------
-[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh
-
-# -----------------------------------------------------
-# miscs
-# -----------------------------------------------------
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

.zshrc_zinit

@@ -1,64 +0,0 @@
-# ---------------------------------------------------
-# Zinit and plugins
-# ---------------------------------------------------
-source /usr/share/zinit/zinit.zsh
-
-# Load powerlevel10k theme
-zinit ice depth"1" # git clone depth
-zinit light romkatv/powerlevel10k
-
-# Load plugins
-zinit light zsh-users/zsh-autosuggestions
-zinit light zdharma-continuum/fast-syntax-highlighting
-# oh-my-zsh plugins
-zi snippet OMZL::git.zsh
-zi snippet OMZP::git
-zi snippet OMZP::sudo
-zi snippet OMZP::colored-man-pages
-zi snippet OMZP::eza
-zi snippet OMZP::z
-# others
-zplugin ice as"program" pick"bin/git-dsf"
-zplugin light zdharma-continuum/zsh-diff-so-fancy
-
-# ----------------------------------------------------
-# Variables
-# ----------------------------------------------------
-export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-export EDITOR=vim
-
-# ----------------------------------------------------
-# Alias
-# ----------------------------------------------------
-alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
-alias wakemac="wakeonlan  18:C0:4D:8D:56:0E"
-alias eza="eza --icons=auto"
-alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
-alias bat="bat --paging=never"
-
-# -----------------------------------------------------
-# evals
-# -----------------------------------------------------
-eval $(thefuck --alias)
-eval "$(fzf --zsh)"
-
-# -----------------------------------------------------
-# Miscs
-# -----------------------------------------------------
-# fix ssh if in kitty
-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
-
-# -----------------------------------------------------
-# PYWAL
-# -----------------------------------------------------
-cat ~/.cache/wal/sequences
-
-# -----------------------------------------------------
-# Custom
-# -----------------------------------------------------
-[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh

CHANGELOG.md

@@ -1,5 +1,18 @@
+Version 2.9.2
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.2
+--------------------------------------------------------
+- Works with Hyprland 0.41.2
+- Introducing waypaper as new wallpaper selector
+- Wallpaper cache for generated wallpaper variants. Will speed up the change between wallpapers if cached files exists. https://gitlab.com/stephan-raabe/dotfiles/-/wikis/Home/Wallpapers#wallpaper-cache
+- You can define custom quicklinks in waybar: https://gitlab.com/stephan-raabe/dotfiles/-/wikis/Home/Waybar#define-your-quicklinks
+- New SVG icons in waybar for ML4W and ChatGPT
+- Default waybar theme changed to ml4w-blur/white
+- Alacritty: selected text will be copied to the primary clipboard
+- General/standard Hyprland environment configuration moved to ml4w.conf (will be re-used in kvm.conf and nvidia.conf)
+- The time format in hyprlock is now aligned with the waybar clock time format that is defined in the ML4W Settings App
+
 Version 2.9.1.2
-https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.2
 --------------------------------------------------------
 - Workspaces module in waybar updated to enable scroll to change the workspace https://gitlab.com/stephan-raabe/dotfiles/-/merge_requests/114
 - More functions deactivated in Game Mode (SUPER+ALT+G)

README.md

@@ -1,8 +1,8 @@
-# ML4W Dotfiles 2.9.1.2
+# ML4W Dotfiles 2.9.2
 
 An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
 
-[![Screenshot](screenshots/screenshot2.png "Screenshot")](screenshots/screenshot2.png)
+[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5715487b0af68f36295f4e37b634f17a/screenshot-20240627-113621.png "Screenshot")](![screenshots/screenshot2.png](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5715487b0af68f36295f4e37b634f17a/screenshot-20240627-113621.png))
 
 The ML4W Dotfiles are available as 
 
@@ -37,11 +37,7 @@ You can also visit the [ML4W Discord Server](https://discord.gg/c4fJK7Za3g) to s
 
 ## Screenshots
 
-[![Screenshot](screenshots/screenshot1.png "Screenshot")](screenshots/screenshot1.png)
+[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/b8dc6a841b6b04fe0b2d380377117a50/screenshot-20240627-113733.png "Screenshot")](![screenshots/screenshot1.png](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/b8dc6a841b6b04fe0b2d380377117a50/screenshot-20240627-113733.png))
-
-[![Screenshot](screenshots/screenshot3.png "Screenshot")](screenshots/screenshot3.png)
-
-[![Screenshot](screenshots/screenshot4.png "Screenshot")](screenshots/screenshot5.png)
 
 ## Wallpaper repository
 

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"
@@ -9,8 +9,8 @@ style = "Regular"
 opacity = 0.7
 
 [window.padding]
-x = 0
+x = 15
-y = 0
+y = 15
 
 [selection]
 save_to_clipboard = true

chrome-flags.conf

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

fastfetch/config.jsonc

@@ -1,181 +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",
-            "type": "shell",
+          "format": "{1} ({3}) @ {7} GHz",
-            "key": "╭─",
+          "key": " ├  ",
-            "keyColor": "yellow"
+          "keyColor": "33",
-        },
+      },
-        {
+      {
-            "type": "terminal",
+          "type": "gpu",
-            "key": "├─",
+          "format": "{1} {2} @ {12} GHz",            
-            "keyColor": "yellow"
+          "key": " ├ 󰢮 ",
-        },
+          "keyColor": "33",
-        {
+      },
-            "type": "editor",
+      {
-            "key": "├─",
+          "type": "memory",
-            "keyColor": "yellow"
+          "key": " ├  ",
-        },
+          "keyColor": "33",
-        {
+      },
-            "type": "terminalfont",
+      {
-            "key": "├─",
+          "type": "swap",
-            "keyColor": "yellow"
+          "key": " ├ 󰓡 ",
-        },
+          "keyColor": "33",
-        {
+      },
-            "type": "lm",
+      {
-            "key": "├─󰧨",
+          "type": "disk",
-            "keyColor": "yellow"
+          "key": " ├ 󰋊 ",
-        },
+          "keyColor": "33",
-        {
+      },
-            "type": "de",
+      {
-            "key": "├─",
+          "type": "monitor",
-            "keyColor": "yellow"
+          "key": " └  ",
-        },
+          "keyColor": "33",
-        {
+      },
-            "type": "wm",
+      "break",
-            "key": "├─",
+      "break",
-            "keyColor": "yellow"
+  ]
-        },
-        {
-            "type": "theme",
-            "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": "cpuusage",
-            "key": "├─",
-            "keyColor": "blue"
-        },
-        {
-            "type": "loadavg",
-            "key": "├─",
-            "keyColor": "blue"
-        },
-        {
-            "type": "processes",
-            "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

@@ -20,17 +20,20 @@ exec-once = hypridle
 # Load cliphist history
 exec-once = wl-paste --watch cliphist store
 
-# Initialize Wallpaper Engine
-exec-once = ~/dotfiles/hypr/scripts/init-wallpaper-engine.sh
-
 # Autostart ML4W App
 exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
 
 # Start ewww daemon
 exec-once = ~/dotfiles/hypr/scripts/eww.sh
 
-exec-once = pypr
+# Initialize waypaper
+exec-once = waypaper --restore
 
+# Launch Waybar
+exec-once = ~/dotfiles/waybar/launch.sh
 
 # 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 32
+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,31 +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
-
-    shadow {
-        enabled = true
-        range = 30
-        render_power = 3
-        color = 0x66000000
-    }
-    #drop_shadow = true
-    #shadow_range = 30
-    #shadow_render_power = 3
-    #col.shadow = 0x66000000
-}

hypr/conf/decorations/low.conf

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

hypr/conf/environments/default.conf

@@ -2,11 +2,4 @@
 # Environment Variables
 # name: "Default"
 # ----------------------------------------------------- 
-
+# Set in ml4w.conf
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = QT_QPA_PLATFORM,wayland
-env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = MOZ_ENABLE_WAYLAND,1

hypr/conf/environments/kvm.conf

@@ -2,13 +2,5 @@
 # Environment Variables
 # name: "KVM"
 # ----------------------------------------------------- 
-
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = QT_QPA_PLATFORM,wayland
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = MOZ_ENABLE_WAYLAND,1
-env = GDK_SCALE,1
 env = WLR_RENDERER_ALLOW_SOFTWARE, 1
 env = WLR_NO_HARDWARE_CURSORS, 1

hypr/conf/fcitx5.conf

@@ -1,7 +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
-
-env=QT_IM_MODULE,fcitx

hypr/conf/hidpi.conf

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