Merge branch 'upstream-custom' into dev

update: get my laptop layout back
Merge branch 'upstream-main' into upstream-custom
2024-06-05 05:57:18 -04:00 · 2024-06-05 05:56:08 -04:00 · 2024-06-05 05:50:17 -04:00 · 2024-06-04 16:52:47 -04:00 · 2024-06-04 16:52:29 -04:00 · 2024-05-28 16:20:13 -04:00
128 changed files with 3264 additions and 800 deletions
@@ -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="/usr/lib/ccache/bin/:$PATH"
+export PATH="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH"

 # -----------------------------------------------------
 # DEVELOPMENT
@@ -1,7 +0,0 @@
-# ------------------------------------------------------
-# Modify existing files before restore starts
-# ------------------------------------------------------
-
-if [ -d ~/dotfiles ] ;then
-    echo ":: Modify existing files"
-fi
@@ -19,7 +19,6 @@ 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
@@ -63,15 +63,10 @@ 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 sddm-sugar-candy-git --ask 4
+    yay -S --noconfirm sddm --ask 4

    # Enable sddm
    if [ -f /etc/systemd/system/display-manager.service ]; then
@@ -79,24 +74,41 @@ 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
@@ -0,0 +1,24 @@
+# ------------------------------------------------------
+# 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
@@ -0,0 +1,17 @@
+
+# ------------------------------------------------------
+# 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\n# hidpi scale\nsource = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/conf/custom.conf
+    sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf
+    echo ":: finished hidpi patch."
+fi
@@ -5,6 +5,9 @@
 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
@@ -37,14 +40,14 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
    _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/eww ]; then
+if [ -d ~/dotfiles-versions/$version/swappy ]; then
    _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
 fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/waypaper ]; then
-    _installSymLink waypaper ~/.config/waypaper ~/dotfiles/waypaper/ ~/.config
+if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
+    _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
 fi
 echo ":: Symbolic links created."
 echo
@@ -1,6 +1,12 @@
 packagesPacman=(
    "pacman-contrib"
    "vim"
+    "bat"
+    "fzf"
+    "zsh"
+    "fastfetch"
+    "ranger"
+    "btop"
    "bluez"
    "bluez-utils"
    "neovim"
@@ -19,6 +25,7 @@ packagesPacman=(
    "ttf-fira-sans" 
    "ttf-fira-code"
    "ttf-firacode-nerd"
+    "ttf-firacode-nerd" 
    "figlet" 
    "vlc" 
    "eza" 
@@ -59,7 +66,7 @@ packagesPacman=(
 );

 packagesYay=(
-    "bibata-cursor-theme" 
+    "vimix-cursors"
    "trizen"
    "pacseek"
 );
@@ -9,12 +9,13 @@ packagesPacman=(
    "slurp"
    "swappy"
    "cliphist"
+    "kitty"
 );

 packagesYay=(
+    "pyprland"
    "wlogout"
    "nwg-look"
    "eww"
    "hyprshade"
-    "waypaper"
 );
@@ -35,4 +35,7 @@ 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."
@@ -8,7 +8,7 @@ echo

 # Check for required packages
 echo "Checking that required packages for the installation are installed..."
-_installPackagesPacman "rsync" "gum" "figlet" "python" "git";
+_installPackagesPacman "rsync" "gum" "figlet" "python";

 # Double check rsync
 if ! command -v rsync &> /dev/null; then
@@ -24,11 +24,7 @@ input {
        # for laptop
        # natural_scroll = yes
        # middle_button_emulation = true
-        # clickfinger_behavior = false          
+        # clickfinger_behavior = 1          
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}
@@ -22,14 +22,9 @@ input {
        # natural_scroll = false

        # for laptop
-        natural_scroll = true
+        natural_scroll = yes
        middle_button_emulation = true
-        clickfinger_behavior = false
-        disable_while_typing = true
+        clickfinger_behavior = 1  
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}
@@ -5,16 +5,17 @@ echo -e "${GREEN}"
 figlet "Wallpapers"
 echo -e "${NONE}"
 if [ ! -d ~/wallpaper ]; then
-    echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
+    echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?"
    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
-        unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
-        if [ ! -d ~/wallpaper/ ]; then
-            mkdir ~/wallpaper
-        fi
-        cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
+        # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
+        # if [ ! -d ~/wallpaper/ ]; then
+        #     mkdir ~/wallpaper
+        # fi
+        # 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
@@ -0,0 +1,3 @@
+* {
+    border-radius:  15px;
+}
@@ -1 +1,3 @@
-* { border-width: 3px; }
+* {
+    border-width:   2px;
+}
@@ -1,26 +0,0 @@
-{
-    "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"
-         ]
-    }
-}
@@ -1 +1 @@
-2.9.2
+2.9.1.1
@@ -1 +1 @@
-2920
+2911
@@ -0,0 +1,128 @@
+# 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
+
+# If you come from bash you might have to change your $PATH.
+export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+# ZSH_THEME="robbyrussell"
+ZSH_THEME="powerlevel10k/powerlevel10k"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# 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"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+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"
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+eval $(thefuck --alias)
+eval "$(fzf --zsh)"
+
+# -----------------------------------------------------
+# PYWAL
+# -----------------------------------------------------
+cat ~/.cache/wal/sequences
+
+export EDITOR=nvim
@@ -1,24 +1,3 @@
-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.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)
- Keybindings rofi menu updated with keybinding description. Open with right mouse click on Apps waybar module
- Fixed bug of ML4W Hyprland Settings App with Hyprland 0.41.0
-
 Version 2.9.1.1
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
 --------------------------------------------------------
@@ -1,8 +1,8 @@
-# ML4W Dotfiles 2.9.2
+# ML4W Dotfiles 2.9.1.1

 An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.

-[![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))
+[![Screenshot](screenshots/screenshot2.png "Screenshot")](screenshots/screenshot2.png)

 The ML4W Dotfiles are available as 

@@ -37,7 +37,11 @@ You can also visit the [ML4W Discord Server](https://discord.gg/c4fJK7Za3g) to s

 ## Screenshots

-[![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/screenshot1.png "Screenshot")](screenshots/screenshot1.png)
+
+[![Screenshot](screenshots/screenshot3.png "Screenshot")](screenshots/screenshot3.png)
+
+[![Screenshot](screenshots/screenshot4.png "Screenshot")](screenshots/screenshot5.png)

 ## Wallpaper repository

@@ -51,8 +55,6 @@ THANK YOU very much for all your support, contributions and ideas:
 - Don Williams: https://github.com/dwilliam62
 - Teodor Orzechowski: https://gitlab.com/sq6gtt
 - Jamie Deppeler: https://gitlab.com/bknight2k
- Yingjie Wang: https://gitlab.com/GaugeAndGravity
- Daniel Gerber: https://gitlab.com/dan.john.gerber
 - https://gitlab.com/muee

 and many more...
@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0

 [font.normal]
 family = "FiraCode Nerd Font"
@@ -0,0 +1 @@
+--ozone-platform=wayland --enable-wayland-ime
@@ -1,110 +1,165 @@
-//  Thanks to Bina
+// Note that you must replace the image path to an existing image to display it.
+
 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "logo": {
-      "padding": {
-      "top": 2
-      }
-  },
+    // "logo": {
+    //     "type": "iterm",
+    //     "source": "/Users/carter/Desktop/apple1.png",
+    //     "width": 28,
+    //     "height": 12
+    // },
    "display": {
-        "separator": " ➜  "
+    //    "separator": "  "
+        "separator": " "
    },
    "modules": [
-      "break",
-      "break",
-      "break",
-       {
-          "type": "os",
-          "key": "OS   ",
-          "keyColor": "31",  // = color1
-      },
-      {
-          "type": "kernel",
-          "key": " ├  ",
-          "keyColor": "31",
-      },
-      {
-          "type": "packages",
-          "format": "{} (pacman)",
-          "key": " ├ 󰏖 ",
-          "keyColor": "31",  
-      },
-      {
-          "type": "shell",
-          "key": " └  ",
-          "keyColor": "31", 
-      },
-      "break",
-      {
-          "type": "wm",
-          "key": "WM   ",
-          "keyColor": "32", 
-      },
-      {
-          "type": "wmtheme",
-          "key": " ├ 󰉼 ",
-          "keyColor": "32",
-      },
-      {
-          "type": "icons",
-          "key": " ├ 󰀻 ",
-          "keyColor": "32",
-      },
-      {
-          "type": "cursor",
-          "key": " ├  ",
-          "keyColor": "32", 
-      },
-      {
-          "type": "terminal",
-          "key": " ├  ",
-          "keyColor": "32",
-      },
-      {
-          "type": "terminalfont",
-          "key": " └  ",
-          "keyColor": "32", 
-      },
-      "break",
        {
            "type": "host",
-          "format": "{5} {1} Type {2}",
-          "key": "PC   ",
-          "keyColor": "33",
+            "key": "╭─󰌢",
+            "keyColor": "green"
        },
        {
            "type": "cpu",
-          "format": "{1} ({3}) @ {7} GHz",
-          "key": " ├  ",
-          "keyColor": "33",
+            "key": "├─󰻠",
+            "keyColor": "green"
        },
        {
            "type": "gpu",
-          "format": "{1} {2} @ {12} GHz",            
-          "key": " ├ 󰢮 ",
-          "keyColor": "33",
-      },
-      {
-          "type": "memory",
-          "key": " ├  ",
-          "keyColor": "33",
-      },
-      {
-          "type": "swap",
-          "key": " ├ 󰓡 ",
-          "keyColor": "33",
+            "key": "├─󰍛",
+            "keyColor": "green"
        },
        {
            "type": "disk",
-          "key": " ├ 󰋊 ",
-          "keyColor": "33",
+            "key": "├─",
+            "keyColor": "green"
        },
        {
-          "type": "monitor",
-          "key": " └  ",
-          "keyColor": "33",
+            "type": "memory",
+            "key": "├─󰑭",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "├─󰓡",
+            "keyColor": "green"
+        },
+        {
+            "type": "display",
+            "key": "├─󰍹",
+            "keyColor": "green"
+        },
+        {
+            "type": "battery",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "poweradapter",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "gamepad",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "bluetooth",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "sound",
+            "key": "╰─",
+            "keyColor": "green"
        },
        "break",
+
+        {
+            "type": "shell",
+            "key": "╭─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "terminal",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "terminalfont",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "lm",
+            "key": "├─󰧨",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "de",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "wm",
+            "key": "├─",
+            "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": "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󱓻"
+        }
    ]
 }
+
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/default.conf
+source = ~/dotfiles/hypr/conf/animations/animations-high.conf
@@ -20,17 +20,17 @@ 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

-# Initialize waypaper
-exec-once = waypaper --restore
+exec-once = pypr

-# Launch Waybar
-exec-once = ~/dotfiles/waybar/launch.sh

 # Start autostart cleanup
 exec-once = ~/dotfiles/hypr/scripts/cleanup.sh
@@ -1 +1 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Vimix 24
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/decorations/default.conf
+source = ~/dotfiles/hypr/conf/decorations/custom.conf
@@ -0,0 +1,25 @@
+# ----------------------------------------------------- 
+# 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
+}
@@ -2,4 +2,11 @@
 # 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_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = MOZ_ENABLE_WAYLAND,1
+env = GDK_SCALE,1
@@ -2,5 +2,13 @@
 # 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
@@ -0,0 +1,5 @@
+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
@@ -0,0 +1,6 @@
+xwayland {
+  force_zero_scaling = true
+}
+
+env = GDK_SCALE,2
+env = QT_SCALE_FACTOR=2
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/keybindings/default.conf
+source = ~/dotfiles/hypr/conf/keybindings/custom.conf
@@ -0,0 +1,97 @@
+# ----------------------------------------------------- 
+# 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, period, 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 CTRL, RETURN, 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 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
+bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+
+# 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
@@ -7,88 +7,90 @@
 $mainMod = SUPER

 # Applications
-bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh # Open the terminal
-bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh # Open the browser
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh # Open the filemanager
+bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
+bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh

 # Windows
-bind = $mainMod, Q, killactive # Kill active window
-bind = $mainMod, F, fullscreen # Set active window to fullscreen
-bind = $mainMod, T, togglefloating # Toggle active windows into floating mode
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh # Toggle all windows into floating mode
-bind = $mainMod, J, togglesplit # Toggle split
-bind = $mainMod, left, movefocus, l # Move focus left
-bind = $mainMod, right, movefocus, r # Move focus right
-bind = $mainMod, up, movefocus, u # Move focus up
-bind = $mainMod, down, movefocus, d # Move focus down
-bindm = $mainMod, mouse:272, movewindow # Move window with the mouse
-bindm = $mainMod, mouse:273, resizewindow # Resize window with the mouse
-bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
-bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
-bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
-bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
-bind = $mainMod, G, togglegroup # Toggle window group
+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 SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh # Toggle animations
-bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh # Take a screenshot
-bind = $mainMod CTRL, Q, exec, wlogout # Start wlogout
-bind = $mainMod SHIFT, W, exec, waypaper --random # Change the wallpaper
-bind = $mainMod CTRL, W, exec, waypaper # Open wallpaper selector
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i # Open application launcher
-bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh # Show keybindings
-bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh # Reload waybar
-bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh # Toggle waybar
-bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh # Reload hyprland config
-bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh # Open clipboard manager
-bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh # Open waybar theme switcher
-bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
-bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh # Toggle screenshader
-bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh # Toggle game mode
+bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh
+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 CTRL, RETURN, 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, 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
+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 # Open workspace 1
-bind = $mainMod, 2, workspace, 2 # Open workspace 2
-bind = $mainMod, 3, workspace, 3 # Open workspace 3
-bind = $mainMod, 4, workspace, 4 # Open workspace 4
-bind = $mainMod, 5, workspace, 5 # Open workspace 5
-bind = $mainMod, 6, workspace, 6 # Open workspace 6
-bind = $mainMod, 7, workspace, 7 # Open workspace 7
-bind = $mainMod, 8, workspace, 8 # Open workspace 8
-bind = $mainMod, 9, workspace, 9 # Open workspace 9
-bind = $mainMod, 0, workspace, 10 # Open workspace 10
-bind = $mainMod SHIFT, 1, movetoworkspace, 1 # Move active window to workspace 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2 # Move active window to workspace 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3 # Move active window to workspace 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4 # Move active window to workspace 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5 # Move active window to workspace 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6 # Move active window to workspace 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7 # Move active window to workspace 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8 # Move active window to workspace 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9 # Move active window to workspace 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Move active window to workspace 10
-bind = $mainMod, mouse_down, workspace, e+1 # Open next workspace
-bind = $mainMod, mouse_up, workspace, e-1 # Open previous workspace
-bind = $mainMod CTRL, down, workspace, empty # Open the next empty workspace
-
-# Passthrough SUPER KEY to Virtual Machine
-bind = $mainMod, P, submap, passthru # Passthrough SUPER key to virtual machine
-submap = passthru
-bind = SUPER, Escape, submap, reset # Get SUPER key back from virtual machine
-submap = reset
+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

 # Fn keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% # Increase brightness by 10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- # Reduce brightness by 10%
-bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% # Increase volume by 5%
-bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% # Reduce volume by 5%
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # Toggle mute
-bind = , XF86AudioPlay, exec, playerctl play-pause # Audio play pause
-bind = , XF86AudioPause, exec, playerctl pause # Audio pause
-bind = , XF86AudioNext, exec, playerctl next # Audio next
-bind = , XF86AudioPrev, exec, playerctl previous # Audio previous
-bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle # Toggle microphone
-bind = , XF86Calculator, exec, qalculate-gtk # Open calculator
-bind = , XF86Lock, exec, hyprlock # Open screenlock
-bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
+bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
+bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
+bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -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
@@ -3,7 +3,7 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 # -----------------------------------------------------
 input {
-    kb_layout = de
+    kb_layout = us
    kb_variant =
    kb_model =
    kb_options =
@@ -11,7 +11,9 @@ input {
    follow_mouse = 1
    mouse_refocus=false
    touchpad {
-        natural_scroll = false
+        natural_scroll = true
+        disable_while_typing=true
+        tap-to-click=true
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
@@ -8,8 +8,7 @@ dwindle {
 }

 master {
-    # new_is_master = true
-    # new_status = master
+    new_is_master = true
 }

 gestures {
@@ -8,10 +8,16 @@ dwindle {
 }

 master {
-    # new_is_master = true
-    # new_status = master
+    new_is_master = true
 }

 gestures {
  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
 }
@@ -5,4 +5,6 @@
 misc {
    disable_hyprland_logo = true
    disable_splash_rendering = true
+    enable_swallow = true
+    swallow_regex = ^(Alacritty)$
 }
@@ -2,22 +2,10 @@
 # ML4W configurations
 # ----------------------------------------------------- 

-# Pavucontrol floating
-windowrulev2 = float,class:(.*org.pulseaudio.pavucontrol.*)
-windowrulev2 = size 700 600,class:(.*org.pulseaudio.pavucontrol.*)
-windowrulev2 = center,class:(.*org.pulseaudio.pavucontrol.*)
+windowrulev2 = float,class:(.*chat.openai.com.*)
+windowrulev2 = size 500 50%,class:(.*chat.openai.com.*)
+windowrulev2 = move 20 70,class:(.*chat.openai.com.*)

-# OpenAI ChatGPT floating
-windowrulev2 = float,title:(.*chat.openai.com.*)
-windowrulev2 = size 500 50%,title:(.*chat.openai.com.*)
-windowrulev2 = move 20 70,title:(.*chat.openai.com.*)
-
-# ML4W Welcome App floating
-windowrulev2 = float,class:(.*waypaper.*)
-windowrulev2 = size 800 700,class:(.*waypaper.*)
-windowrulev2 = center,class:(.*waypaper.*)
-
-# ML4W Welcome App floating
 windowrulev2 = float,class:(com.ml4w.welcome)
 windowrulev2 = size 700 600,class:(com.ml4w.welcome)
 windowrulev2 = center,class:(com.ml4w.welcome)
@@ -26,7 +14,6 @@ windowrulev2 = float,class:(ml4w-welcome.py)
 windowrulev2 = size 400 500,class:(ml4w-welcome.py)
 windowrulev2 = center,class:(ml4w-welcome.py)

-# ML4W Settings App floating
 windowrulev2 = float,class:(com.ml4w.dotfilessettings)
 windowrulev2 = size 700 600,class:(com.ml4w.dotfilessettings)
 windowrulev2 = move 10% 20%,class:(com.ml4w.dotfilessettings)
@@ -35,40 +22,19 @@ windowrulev2 = float,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py)

-# ML4W Hyprland App floating
-windowrulev2 = float,class:(com.ml4w.hyprland.settings)
-windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
-windowrulev2 = center,class:(com.ml4w.hyprland.settings)
+windowrulev2 = float,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = size 700 600,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = center,class:(com.ml4w.hyprlandsettings)

 windowrulev2 = float,class:(ml4w-hyprland-settings.py)
 windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
 windowrulev2 = center,class:(ml4w-hyprland-settings.py)

-# General floating
 windowrulev2 = float,class:(dotfiles-floating)
 windowrulev2 = size 1000 800,class:(dotfiles-floating)
 windowrulev2 = center,class:(dotfiles-floating)

-# XDG Desktop Portal
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-# QT
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-
-# GTK
-env = GDK_SCALE,1
-
-# Mozilla
-env = MOZ_ENABLE_WAYLAND,1
-
-# Set the cursor size for xcursor
-env = XCURSOR_SIZE,24
-
-# Disable appimage launcher by default
 env = APPIMAGELAUNCHER_DISABLE,1
+env = XCURSOR_SIZE,24
+env = XDG_CURRENT_DESKTOP,Hyprland

@@ -0,0 +1,6 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=,preferred,auto,2
@@ -0,0 +1,10 @@
+# ----------------------------------------------------- 
+# 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
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/windowrules/default.conf
+source = ~/dotfiles/hypr/conf/windowrules/custom.conf
@@ -0,0 +1,19 @@
+# ----------------------------------------------------- 
+# 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 = float,^(QQ)$
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -6,9 +6,8 @@
 general {
    gaps_in = 10
    gaps_out = 14
-    border_size = 3
+    border_size = 2
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -43,7 +43,6 @@ input-field {

 label {
    monitor =
-    #clock
    text = cmd[update:1000] echo "$TIME"
    color = rgba(200, 200, 200, 1.0)
    font_size = 55
@@ -1,3 +1,3 @@
-preload = $HOME/wallpaper/default.jpg
-wallpaper = ,$HOME/wallpaper/default.jpg
+preload = $HOME/wallpaper/hyprland.jpg
+wallpaper = ,$HOME/wallpaper/hyprland.jpg
 splash = false
@@ -0,0 +1,12 @@
+[pyprland]
+
+plugins = [
+  "scratchpads",
+  "magnify",
+]
+
+[scratchpads.term]
+animation = "fromTop"
+command = "kitty --class kitty-dropterm"
+class = "kitty-dropterm"
+size = "75% 60%"
@@ -46,7 +46,6 @@ _commandExists "swww" "swww"
 _commandExists "eww" "eww"
 _commandExists "magick" "imagemagick"
 _commandExists "figlet" "figlet"
-_commandExists "waypaper" "waypaper"

 echo
 echo "Press return to exit"
@@ -7,18 +7,13 @@
 #

 if [ -f ~/.cache/gamemode ] ;then
-    hyprctl reload
+    hyprctl keyword animations:enabled true
+    hyprctl keyword decoration:blur:enabled true
    rm ~/.cache/gamemode
    notify-send "Gamemode deactivated" "Animations and blur enabled"
 else
-    hyprctl --batch "\
-        keyword animations:enabled 0;\
-        keyword decoration:drop_shadow 0;\
-        keyword decoration:blur:enabled 0;\
-        keyword general:gaps_in 0;\
-        keyword general:gaps_out 0;\
-        keyword general:border_size 1;\
-        keyword decoration:rounding 0"
+    hyprctl keyword animations:enabled false
+    hyprctl keyword decoration:blur:enabled false
    touch ~/.cache/gamemode
    notify-send "Gamemode activated" "Animations and blur disabled"
 fi
@@ -21,29 +21,13 @@ config_file=${config_file/source=~/}
 config_file="/home/$USER$config_file"
 echo "Reading from: $config_file"

-keybinds=""
-
-# Detect Start String
-while read -r line
-do
-    if [[ "$line" == "bind"* ]]; then
-
-        line="$(echo "$line" | sed 's/$mainMod/SUPER/g')"
-        line="$(echo "$line" | sed 's/bind = //g')"
-        line="$(echo "$line" | sed 's/bindm = //g')"
-
-        IFS='#' 
-        read -a strarr <<<"$line" 
-        kb_str=${strarr[0]}
-        cm_str=${strarr[1]}
-
-        IFS=',' 
-        read -a kbarr <<<"$kb_str" 
-
-        item="${kbarr[0]}  + ${kbarr[1]}"$'\r'"${cm_str:1}"
-        keybinds=$keybinds$item$'\n'
-    fi 
-done < "$config_file"
-
+# ----------------------------------------------------- 
+# Parse keybindings
+# ----------------------------------------------------- 
+keybinds=$(grep -oP '(?<=bind = ).*' $config_file)
+keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'| sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g')
+# ----------------------------------------------------- 
+# Show keybindings in rofi
+# ----------------------------------------------------- 
 sleep 0.2
-rofi -dmenu -i -markup -eh 2 -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
+rofi -dmenu -i -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
@@ -1,5 +0,0 @@
-#!/bin/bash
-generated_versions="$HOME/.cache/ml4w-wallpaper-generated"
-rm $HOME/.cache/ml4w-wallpaper-generated/*
-echo ":: Wallpaper cache cleared"
-notify-send "Wallpaper cache cleared"
@@ -9,79 +9,97 @@
 # by Stephan Raabe (2024) 
 # ----------------------------------------------------- 

-# ----------------------------------------------------- 
-# Get selected wallpaper
-# ----------------------------------------------------- 
-echo ":: Using wallpaper $1"
-wallpaper=$1
-
-# ----------------------------------------------------- 
-# Check to use wallpaper cache
-# ----------------------------------------------------- 
-use_cache=0
-if [ -f $HOME/dotfiles/.settings/wallpaper_cache ] ;then
-    use_cache=1
+# Cache file for holding the current wallpaper
+wallpaper_folder="$HOME/wallpaper"
+if [ -f ~/dotfiles/.settings/wallpaper-folder.sh ] ;then
+    source ~/dotfiles/.settings/wallpaper-folder.sh
 fi
-
-if [ "$use_cache" == "1" ] ;then
-    echo ":: Using Wallpaper Cache"
-else
-    echo ":: Wallpaper Cache disabled"
-fi
-
-# ----------------------------------------------------- 
-# File and folder names
-# ----------------------------------------------------- 
-force_generate=0
-generated_versions="$HOME/.cache/ml4w-wallpaper-generated"
+used_wallpaper="$HOME/.cache/used_wallpaper"
 cache_file="$HOME/.cache/current_wallpaper"
-blurred_wallpaper="$HOME/.cache/blurred_wallpaper.png"
-square_wallpaper="$HOME/.cache/square_wallpaper.png"
+blurred="$HOME/.cache/blurred_wallpaper.png"
+square="$HOME/.cache/square_wallpaper.png"
 rasi_file="$HOME/.cache/current_wallpaper.rasi"
 blur_file="$HOME/dotfiles/.settings/blur.sh"

 blur="50x30"
 blur=$(cat $blur_file)

+# Create cache file if not exists
+if [ ! -f $cache_file ] ;then
+    touch $cache_file
+    echo "$wallpaper_folder/default.jpg" > "$cache_file"
+fi
+
 # Create rasi file if not exists
 if [ ! -f $rasi_file ] ;then
    touch $rasi_file
    echo "* { current-image: url(\"$wallpaper_folder/default.jpg\", height); }" > "$rasi_file"
 fi

-# Create folder with generated versions of wallpaper if not exists
-if [ ! -d $generated_versions ] ;then
-    mkdir $generated_versions
+current_wallpaper=$(cat "$cache_file")
+
+case $1 in
+
+    # Load wallpaper from .cache of last session 
+    "init")
+        sleep 1
+        if [ -f $cache_file ]; then
+            wal -q -i $current_wallpaper
+        else
+            wal -q -i $wallpaper_folder/
        fi
+    ;;
+
+    # Select wallpaper with rofi
+    "select")
+        sleep 0.2
+        selected=$( find "$wallpaper_folder" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort -R | while read rfile
+        do
+            echo -en "$rfile\x00icon\x1f$wallpaper_folder/${rfile}\n"
+        done | rofi -dmenu -i -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
+        if [ ! "$selected" ]; then
+            echo "No wallpaper selected"
+            exit
+        fi
+        wal -q -i $wallpaper_folder/$selected
+    ;;
+
+    # Randomly select wallpaper 
+    *)
+        wal -q -i $wallpaper_folder/
+    ;;
+
+esac

 # ----------------------------------------------------- 
-# Current wallpaper
+# Load current pywal color scheme
 # ----------------------------------------------------- 
-current_wallpaper=$wallpaper
-current_wallpaper_filename=$(basename $current_wallpaper)
-echo ":: Current Wallpaper: $current_wallpaper"
-echo ":: Current Wallpaper Filename: $current_wallpaper_filename"
-newwall=$current_wallpaper_filename
-
-# ----------------------------------------------------- 
-# Execute pywal
-# ----------------------------------------------------- 
-echo ":: Execute wallpaper"
-wal -q -i $wallpaper
 source "$HOME/.cache/wal/colors.sh"

 # ----------------------------------------------------- 
-# Wallpaper Effects
+# get wallpaper image name
 # ----------------------------------------------------- 
+newwall=$(echo $wallpaper | sed "s|$wallpaper_folder/||g")

+# ----------------------------------------------------- 
+# Reload waybar with new colors
+# -----------------------------------------------------
+~/dotfiles/waybar/launch.sh
+
+# ----------------------------------------------------- 
+# Set the new wallpaper
+# -----------------------------------------------------
+transition_type="wipe"
+# transition_type="outer"
+# transition_type="random"
+
+cp $wallpaper $HOME/.cache/
+mv $HOME/.cache/$newwall $used_wallpaper
+
+# Load Wallpaper Effect
 if [ -f $HOME/dotfiles/.settings/wallpaper-effect.sh ] ;then
    effect=$(cat $HOME/dotfiles/.settings/wallpaper-effect.sh)
    if [ ! "$effect" == "off" ] ;then
-        used_wallpaper=$generated_versions/$effect-$newwall
-        if [ -f $generated_versions/$effect-$newwall ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-            echo ":: Use cached wallpaper $effect-$newwall"
-        else
-            echo ":: Generate new cached wallpaper $effect-$newwall with effect $effect"
        if [ "$1" == "init" ] ;then
            echo ":: Init"
        else
@@ -89,55 +107,83 @@ if [ -f $HOME/dotfiles/.settings/wallpaper-effect.sh ] ;then
        fi
        source $HOME/dotfiles/hypr/effects/wallpaper/$effect
    fi
-        echo ":: Loading wallpaper $generated_versions/$effect-$newwall with effect $effect"
-        killall -e hyprpaper & 
-        sleep 1; 
+fi
+
+wallpaper_engine=$(cat $HOME/dotfiles/.settings/wallpaper-engine.sh)
+if [ "$wallpaper_engine" == "swww" ] ;then
+    # swww
+    echo ":: Using swww"
+    swww img $used_wallpaper \
+        --transition-bezier .43,1.19,1,.4 \
+        --transition-fps=60 \
+        --transition-type=$transition_type \
+        --transition-duration=0.7 \
+        --transition-pos "$( hyprctl cursorpos )"
+elif [ "$wallpaper_engine" == "hyprpaper" ] ;then
+    # hyprpaper
+    echo ":: Using hyprpaper"
+    killall hyprpaper
    wal_tpl=$(cat $HOME/dotfiles/.settings/hyprpaper.tpl)
-        echo $wal_tpl
    output=${wal_tpl//WALLPAPER/$used_wallpaper}
    echo "$output" > $HOME/dotfiles/hypr/hyprpaper.conf
-        hyprpaper & > /dev/null 2>&1
+    hyprpaper &
 else
-        echo ":: Wallpaper effect is set to off"
+    echo ":: Wallpaper Engine disabled"
 fi
+
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
+else
+    sleep 1
+    dunstify "Changing wallpaper ..." "with image $newwall" -h int:value:25 -h string:x-dunst-stack-tag:wallpaper
+    
+    # ----------------------------------------------------- 
+    # Reload Hyprctl.sh
+    # -----------------------------------------------------
+    $HOME/.config/ml4w-hyprland-settings/hyprctl.sh &
 fi

 # ----------------------------------------------------- 
 # Created blurred wallpaper
 # -----------------------------------------------------
-if [ -f $generated_versions/blur-$blur-$newwall.png ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-    echo ":: Use cached wallpaper blur-$blur-$newwall.png"
-else
-    echo ":: Generate new cached wallpaper blur-$blur-$newwall with blur $blur"
 if [ "$1" == "init" ] ;then
    echo ":: Init"
 else
    dunstify "Creating blurred version ..." "with image $newwall" -h int:value:50 -h string:x-dunst-stack-tag:wallpaper
 fi
-    magick $wallpaper -resize 75% $blurred_wallpaper
+
+magick $used_wallpaper -resize 75% $blurred
 echo ":: Resized to 75%"
 if [ ! "$blur" == "0x0" ] ;then
-        magick $blurred_wallpaper -blur $blur $blurred_wallpaper
-        cp $blurred_wallpaper $generated_versions/blur-$blur-$newwall.png
+    magick $blurred -blur $blur $blurred
    echo ":: Blurred"
 fi
-    cp $generated_versions/blur-$blur-$newwall.png $blurred_wallpaper
-fi
-cp $generated_versions/blur-$blur-$newwall.png $blurred_wallpaper

 # ----------------------------------------------------- 
-# Created square wallpaper
+# Created quare wallpaper
 # -----------------------------------------------------
-if [ -f $generated_versions/square-$newwall.png ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-    echo ":: Use cached wallpaper square-$newwall.png"
-else
-    echo ":: Generate new cached wallpaper square-$newwall"
 if [ "$1" == "init" ] ;then
    echo ":: Init"
 else
    dunstify "Creating square version ..." "with image $newwall" -h int:value:75 -h string:x-dunst-stack-tag:wallpaper
 fi
-    magick $wallpaper -gravity Center -extent 1:1 $square_wallpaper
-    cp $square_wallpaper $generated_versions/square-$newwall.png
+magick $wallpaper -gravity Center -extent 1:1 $square
+echo ":: Square version created"
+
+# ----------------------------------------------------- 
+# Write selected wallpaper into .cache files
+# ----------------------------------------------------- 
+echo "$wallpaper" > "$cache_file"
+echo "* { current-image: url(\"$blurred\", height); }" > "$rasi_file"
+
+# ----------------------------------------------------- 
+# Send notification
+# ----------------------------------------------------- 
+
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
+else
+    dunstify "Wallpaper procedure complete!" "with image $newwall" -h int:value:100 -h string:x-dunst-stack-tag:wallpaper
 fi
-cp $generated_versions/square-$newwall.png $square_wallpaper
+
+echo "DONE!"
@@ -15,7 +15,7 @@ killall -e xdg-desktop-portal-kde
 killall -e xdg-desktop-portal-lxqt
 killall -e xdg-desktop-portal-wlr
 killall -e xdg-desktop-portal-gtk
-killall -e xdg-desktop-portal
+killall xdg-desktop-portal
 sleep 1

 # start xdg-desktop-portal-hyprland
@@ -34,7 +34,7 @@ else
 fi
 echo ""
 source .install/required.sh
-source .install/confirm_start.sh
+source .install/confirm-start.sh
 source .install/paralleldownloads.sh
 source .install/yay.sh
 source .install/updatesystem.sh
@@ -44,45 +44,39 @@ source .install/installer.sh
 source .install/remove.sh
 source .install/general.sh
 source .install/packages/general-packages.sh
-source .install/install_packages.sh
+source .install/install-packages.sh
+source .install/fcitx5.sh
 source .install/profile.sh
 if [[ $profile == *"Hyprland"* ]]; then
    echo -e "${GREEN}"
    figlet "Hyprland"
    echo -e "${NONE}"
    source .install/packages/hyprland-packages.sh
-    source .install/install_packages.sh
+    source .install/install-packages.sh
 fi
 if [[ $profile == *"Qtile"* ]]; then
    echo -e "${GREEN}"
    figlet "Qtile"
    echo -e "${NONE}"
    source .install/packages/qtile-packages.sh
-    source .install/install_packages.sh
+    source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
+source .install/hidpi.sh
 source .install/displaymanager.sh
 source .install/issue.sh
-
-# Modify existing files before restore starts
-source .install/before_restore.sh
-
-# Restore configuration and settings
 source .install/restore.sh
-
-# Setup the input devices
 source .install/keyboard.sh
-
 source .install/neovim.sh
 source .install/hook.sh
 source .install/vm.sh
 source .install/copy.sh
 source .install/init-pywal.sh
 if [[ $profile == *"Hyprland"* ]]; then
-    source .install/hyprland_dotfiles.sh
+    source .install/hyprland-dotfiles.sh
 fi
 if [[ $profile == *"Qtile"* ]]; then
-    source .install/qtile_dotfiles.sh
+    source .install/qtile-dotfiles.sh
 fi
 source .install/settings.sh
 source .install/apps.sh
@@ -0,0 +1,14 @@
+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
@@ -31,13 +31,3 @@ set ttyfast                 " Speed up scrolling in Vim
 " set spell                 " enable spell check (may need to download language package)
 " set noswapfile            " disable creating swap file
 " set backupdir=~/.cache/vim " Directory to store backup files.
-
-hi NonText ctermbg=none guibg=NONE
-hi Normal guibg=NONE ctermbg=NONE
-hi NormalNC guibg=NONE ctermbg=NONE
-hi SignColumn ctermbg=NONE ctermfg=NONE guibg=NONE
-
-hi Pmenu ctermbg=NONE ctermfg=NONE guibg=NONE
-hi FloatBorder ctermbg=NONE ctermfg=NONE guibg=NONE
-hi NormalFloat ctermbg=NONE ctermfg=NONE guibg=NONE
-hi TabLine ctermbg=None ctermfg=None guibg=None
@@ -38,12 +38,13 @@ 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:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -56,7 +57,7 @@ window {
    anchor:                       northeast;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -120,6 +121,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -132,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -161,6 +163,7 @@ listview {
    margin:                       0px;
    background-color:             @background;
    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -170,7 +173,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -39,6 +39,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -57,7 +58,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -121,6 +122,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -133,7 +135,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -162,6 +164,7 @@ listview {
    margin:                       0px;
    background-color:             @background;
    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -171,7 +174,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -56,7 +57,7 @@ window {
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -132,7 +133,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -170,7 +171,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -56,7 +57,7 @@ window {
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -132,7 +133,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -170,7 +171,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -57,7 +58,7 @@ window {
    anchor:                       northeast;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -133,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -171,7 +172,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,12 +38,13 @@ 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:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -56,7 +57,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -120,6 +121,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -132,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -161,6 +163,7 @@ listview {
    margin:                       0px;
    background-color:             @background;
    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -170,7 +173,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -33,12 +33,13 @@ 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:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -51,7 +52,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -114,6 +115,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -126,7 +128,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -155,7 +157,7 @@ listview {
    fixed-columns:               true;
    background-color:             @background;
    border:                       0px;
-    flow:                         horizontal;      
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -165,7 +167,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
    orientation:                  vertical;
 }
@@ -39,6 +39,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -50,14 +51,14 @@ window {
    margin:                       0px; 
    color:                        #FFFFFF;
    border:                       @border-width;
-    border-color:                 #FFFFFF;
+    border-color:                 @foreground;
    cursor:                       "default";
    transparency:                 "real";
    location:                     center;
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -99,7 +100,7 @@ inputbar {
    text-color:                   @foreground;
    spacing:                      10px;
    padding:                      15px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border-color:                 @foreground;
    background-color:             @background;
    children:                     [ "textbox-prompt-colon", "entry" ];
@@ -121,6 +122,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -133,7 +135,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -171,7 +173,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -25,7 +25,7 @@ sleep 0.2
 # ----------------------------------------------------- 
 # Default theme: /THEMEFOLDER;/VARIATION
 # ----------------------------------------------------- 
-themestyle="/ml4w-blur;/ml4w-blur/white"
+themestyle="/ml4w;/ml4w/light"

 # ----------------------------------------------------- 
 # Get current theme information from .cache/.themestyle.sh
@@ -38,7 +38,7 @@ else
 fi

 IFS=';' read -ra arrThemes <<< "$themestyle"
-echo ":: Theme: ${arrThemes[0]}"
+echo "Theme: ${arrThemes[0]}"

 if [ ! -f ~/dotfiles/waybar/themes${arrThemes[1]}/style.css ]; then
    themestyle="/ml4w;/ml4w/light"
@@ -11,8 +11,6 @@
 {
    // Workspaces
    "hyprland/workspaces" : {
-        "on-scroll-up": "hyprctl dispatch workspace r-1",
-        "on-scroll-down": "hyprctl dispatch workspace r+1",        
        "on-click": "activate",
        "active-only": false,
        "all-outputs": true,
@@ -35,7 +33,8 @@
        "on-click": "activate",
        "on-click-middle": "close",
        "ignore-list": [
-           "Alacritty"
+           "Alacritty",
+           "alacritty-dropterm"
        ],
        "app_ids-mapping": {
            "firefoxdeveloperedition": "firefox-developer-edition"
@@ -110,7 +109,7 @@
    // Wallpaper
    "custom/wallpaper": {
        "format": "",
-        "on-click": "waypaper",
+        "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper-effects.sh",
        "tooltip-format": "Left: Select a wallpaper\nRight: Select wallpaper effect"
    },
@@ -136,6 +135,20 @@
        "tooltip": false
    },

+    // Filemanager Launcher
+    "custom/filemanager": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/filemanager.sh",
+        "tooltip-format": "Open the filemanager"
+    },
+
+    // Browser Launcher
+    "custom/browser": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/browser.sh",
+        "tooltip-format": "Open the browser"
+    },    
+
    // ChatGPT Launcher
    "custom/chatgpt": {
        "format": " ",
@@ -147,7 +160,7 @@
    "custom/calculator": {
        "format": "",
        "on-click": "qalculate-gtk",
-        "tooltip-format": "Open calculator"
+        "tooltip": false
    },

    // Windows VM
@@ -301,6 +314,15 @@
        ]
    },

+    // Group Quicklinks
+    "group/quicklinks": {
+        "orientation": "horizontal",
+        "modules": [
+            "custom/browser",
+            "custom/filemanager",
+         ]
+    },
+
    // Network
    "network": {
        "format": "{ifname}",
@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="white" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="black" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>
@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="white" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="white" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>
@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="#19cddb" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="#19cddb" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
@@ -0,0 +1,47 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+ @import '../../../../../.cache/wal/colors-waybar.css';
+
+ @define-color backgroundlight @color5;
+ @define-color backgrounddark @color11;
+ @define-color workspacesbackground1 @color5;
+ @define-color workspacesbackground2 @color11;
+ @define-color bordercolor @color11;
+ @define-color textcolor1 #FFFFFF;
+ @define-color textcolor2 #FFFFFF;
+ @define-color textcolor3 #FFFFFF;
+ @define-color iconcolor #FFFFFF;
+ 
+ @define-color base   #1e1e2e;
+ @define-color mantle #181825;
+ @define-color crust  #11111b;
+ 
+ @define-color text     #cdd6f4;
+ @define-color subtext0 #a6adc8;
+ @define-color subtext1 #bac2de;
+ 
+ @define-color surface0 #313244;
+ @define-color surface1 #45475a;
+ @define-color surface2 #585b70;
+ 
+ @define-color overlay0 #6c7086;
+ @define-color overlay1 #7f849c;
+ @define-color overlay2 #9399b2;
+ 
+ @define-color blue      #89b4fa;
+ @define-color lavender  #b4befe;
+ @define-color sapphire  #74c7ec;
+ @define-color sky       #89dceb;
+ @define-color teal      #94e2d5;
+ @define-color green     #a6e3a1;
+ @define-color yellow    #f9e2af;
+ @define-color peach     #fab387;
+ @define-color maroon    #eba0ac;
+ @define-color red       #f38ba8;
+ @define-color mauve     #cba6f7;
+ @define-color pink      #f5c2e7;
+ @define-color flamingo  #f2cdcd;
+ @define-color rosewater #f5e0dc;
+
+ @import '../style.css';
@@ -0,0 +1,70 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Top -Laptop ### //
+{
+    "include": "~/dotfiles/waybar/themes/custom/modules.json",
+    "layer": "top",
+    //"mode": "dock",
+    "exclusive": true,
+    "passthrough": false,
+    "position": "top",
+    "spacing": 3,
+    "fixed-center": true,
+    "ipc": true,
+    "margin-top": 3,
+    "margin-left": 8,
+    "margin-right": 8,
+
+    "modules-left": [
+        "hyprland/workspaces#pacman",
+        "custom/separator#dot-line",
+        "cpu",
+        "custom/separator#dot-line",
+        "temperature",
+        "custom/separator#dot-line",
+        "memory",
+        "custom/separator#dot-line",
+        "custom/weather",
+        "custom/separator#blank_3",
+        "custom/cava_mviz",
+        ],
+
+    "modules-center": [
+        "custom/menu",
+        "custom/separator#dot-line",
+        "idle_inhibitor",
+        "custom/separator#dot-line",
+        "clock",
+        "custom/separator#dot-line",
+        "custom/light_dark",
+        "custom/separator#dot-line",
+        "custom/lock",
+        //],
+        "custom/separator#dot-line",
+        "custom/hint",
+        ],
+
+    "modules-right": [
+        "network#speed",
+        "custom/separator#dot-line",
+        "custom/swaync",
+        "tray",
+        "mpris",
+        "custom/separator#dot-line",
+        "bluetooth",
+        "custom/separator#dot-line",
+        "battery",
+        "custom/separator#dot-line",
+        "backlight",
+        "custom/separator#dot-line",
+        "pulseaudio",
+        "custom/separator#dot-line",
+        "pulseaudio#microphone",
+        "custom/separator#dot-line",
+        "keyboard-state",
+        "custom/separator#dot-line",
+        "custom/keyboard",
+        "custom/separator#dot-line",
+        "custom/power",
+        ],
+    }
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="Custum 4k"
@@ -0,0 +1,708 @@
+//* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
+/* Waybar Modules */
+
+{
+    // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
+    // CIRCLES Style
+    "hyprland/workspaces": {
+        "active-only": false,
+        "all-outputs": true,
+        "format": "{icon}",
+        "show-special": false,
+        "on-click": "activate",
+        "on-scroll-up": "hyprctl dispatch workspace e+1",
+        "on-scroll-down": "hyprctl dispatch workspace e-1",
+        "persistent-workspaces": {
+            "1": [],
+            "2": [],
+            "3": [],
+            "4": [],
+            "5": [],
+        },
+        "format-icons": {
+            "active": "",
+            "default": "",
+        },
+    },
+    // ROMAN Numerals style
+    "hyprland/workspaces#roman": {
+        "active-only": false,
+        "all-outputs": true,
+        "format": "{icon}",
+        "show-special": false,
+        "on-click": "activate",
+        "on-scroll-up": "hyprctl dispatch workspace e+1",
+        "on-scroll-down": "hyprctl dispatch workspace e-1",
+        "persistent-workspaces": {
+            "1": [],
+            "2": [],
+            "3": [],
+            "4": [],
+            "5": [],
+        },
+        "format-icons": {
+            "1": "I",
+            "2": "II",
+            "3": "III",
+            "4": "IV",
+            "5": "V",
+            "6": "VI",
+            "7": "VII",
+            "8": "VIII",
+            "9": "IX",
+            "10": "X",
+        },
+    },
+    // PACMAN Style
+    "hyprland/workspaces#pacman": {
+        "active-only": false,
+        "all-outputs": true,
+        "format": "{icon}",
+        "on-click": "activate",
+        "on-scroll-up": "hyprctl dispatch workspace e+1",
+        "on-scroll-down": "hyprctl dispatch workspace e-1",
+        "show-special": false,
+        "persistent-workspaces": {
+            "1": [],
+            "2": [],
+            "3": [],
+            "4": [],
+            "5": [],
+        },
+        "format": "{icon}",
+        "format-icons": {
+            "active": " 󰮯 ",
+            "default": "󰊠",
+            "persistent": "󰊠",
+        },
+    },
+    "hyprland/workspaces#kanji": {
+        "disable-scroll": true,
+        "all-outputs": true,
+        "format": "{icon}",
+        "persistent-workspaces": {
+            "1": [],
+            "2": [],
+            "3": [],
+            "4": [],
+            "5": [],
+        },
+        "format-icons": {
+            "1": "一",
+            "2": "二",
+            "3": "三",
+            "4": "四",
+            "5": "五",
+            "6": "六",
+            "7": "七",
+            "8": "八",
+            "9": "九",
+            "10": "十",
+        }
+    },
+    //  NUMBERS and ICONS style
+    "hyprland/workspaces#4": {
+        "format": "{name}",
+        "format": " {name} {icon} ",
+        //"format": " {icon} ",
+        "show-special": false,
+        "on-click": "activate",
+        "on-scroll-up": "hyprctl dispatch workspace e+1",
+        "on-scroll-down": "hyprctl dispatch workspace e-1",
+        "all-outputs": true,
+        "sort-by-number": true,
+        "format-icons": {
+            "1": " ",
+            "2": " ",
+            "3": " ",
+            "4": " ",
+            "5": " ",
+            "6": " ",
+            "7": "",
+            "8": " ",
+            "9": "",
+            "10": "10",
+            "focused": "",
+            "default": "",
+        },
+    },
+    // GROUP
+    "group/motherboard": {
+        "orientation": "horizontal",
+        "modules": [
+            "cpu",
+            "memory",
+            "temperature",
+            "disk",
+        ]
+    },
+    "group/laptop": {
+        "orientation": "horizontal",
+        "modules": [
+            "backlight",
+            "battery",
+        ]
+    },
+    "group/audio": {
+        "orientation": "horizontal",
+        "modules": [
+            "pulseaudio",
+            "pulseaudio#microphone",
+        ]
+    },
+    "backlight": {
+        "interval": 2,
+        "align": 0,
+        "rotate": 0,
+        //"format": "{icon} {percent}%",
+        "format-icons": [
+            " ",
+            " ",
+            " ",
+            "󰃝 ",
+            "󰃞 ",
+            "󰃟 ",
+            "󰃠 "
+        ],
+        "format": "{icon}",
+        //"format-icons": ["","","","","","","","","","","","","","",""],
+        "tooltip-format": "backlight {percent}%",
+        "icon-size": 10,
+        "on-click": "",
+        "on-click-middle": "",
+        "on-click-right": "",
+        "on-update": "",
+        "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
+        "smooth-scrolling-threshold": 1,
+    },
+    "battery": {
+        //"interval": 5,
+        "align": 0,
+        "rotate": 0,
+        //"bat": "BAT1",
+        //"adapter": "ACAD",
+        "full-at": 100,
+        "design-capacity": false,
+        "states": {
+            "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{icon} {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": "󱘖 {capacity}%",
+        "format-alt-click": "click",
+        "format-full": "{icon} Full",
+        "format-alt": "{icon} {time}",
+        "format-icons": [
+            "󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
+        ],
+        "format-time": "{H}h {M}min",
+        "tooltip": true,
+        "tooltip-format": "{timeTo} {power}w",
+        "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
+        "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
+    },
+    "bluetooth": {
+        "format": "",
+        "format-disabled": "󰂳",
+        "format-connected": "󰂱 {num_connections}",
+        "tooltip-format": " {device_alias}",
+        "tooltip-format-connected": "{device_enumerate}",
+        "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
+        "tooltip": true,
+        "on-click": "blueman-manager",
+    },
+    "clock": {
+        "interval": 1,
+        //"format": " {:%I:%M %p}", // AM PM format
+        "format": " {:%H:%M:%S}",
+        "format-alt": " {:%H:%M   %Y, %d %B, %A}",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+            "mode": "year",
+            "mode-mon-col": 3,
+            "weeks-pos": "right",
+            "on-scroll": 1,
+            "format": {
+                "months": "<span color='#ffead3'><b>{}</b></span>",
+                "days": "<span color='#ecc6d9'><b>{}</b></span>",
+                "weeks": "<span color='#99ffdd'><b>W{}</b></span>",
+                "weekdays": "<span color='#ffcc66'><b>{}</b></span>",
+                "today": "<span color='#ff6699'><b><u>{}</u></b></span>"
+            }
+        }
+    },
+    "actions": {
+        "on-click-right": "mode",
+        "on-click-forward": "tz_up",
+        "on-click-backward": "tz_down",
+        "on-scroll-up": "shift_up",
+        "on-scroll-down": "shift_down"
+    },
+    "cpu": {
+        "format": "{usage}% 󰍛",
+        "interval": 1,
+        "format-alt-click": "click",
+        "format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
+        "format-icons": [
+            "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"
+        ],
+        "on-click-right": "gnome-system-monitor",
+    },
+    "disk": {
+        "interval": 30,
+        //"format": "󰋊",
+        "path": "/",
+        //"format-alt-click": "click",
+        "format": "{percentage_used}% 󰋊",
+        //"tooltip": true,
+        "tooltip-format": "{used} used out of {total} on {path} ({percentage_used}%)",
+    },
+    "hyprland/language": {
+        "format": "Lang: {}",
+        "format-en": "US",
+        "format-tr": "Korea",
+        "keyboard-name": "at-translated-set-2-keyboard",
+        "on-click": "hyprctl switchxkblayout $SET_KB next"
+    },
+    "hyprland/submap": {
+        "format": "<span style=\"italic\">  {}</span>", // Icon: expand-arrows-alt
+        "tooltip": false,
+    },
+    "hyprland/window": {
+        "format": "{}",
+        "max-length": 40,
+        "separate-outputs": true,
+        "offscreen-css": true,
+        "offscreen-css-text": "(inactive)",
+        "rewrite": {
+            "(.*) — Mozilla Firefox": " $1",
+            "(.*) - fish": "> [$1]",
+            "(.*) - zsh": "> [$1]",
+            "(.*) - $term": "> [$1]",
+        },
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": " ",
+            "deactivated": " ",
+        }
+    },
+    "keyboard-state": {
+        //"numlock": true,
+        "capslock": true,
+        "format": {
+            "numlock": "N {icon}",
+            "capslock": "󰪛 {icon}",
+        },
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        },
+    },
+    "memory": {
+        "interval": 10,
+        "format": "{used:0.1f}G 󰾆",
+        "format-alt": "{percentage}% 󰾆",
+        "format-alt-click": "click",
+        "tooltip": true,
+        "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
+        "on-click-right": "kitty --title btop sh -c 'btop'"
+    },
+    "mpris": {
+        "interval": 10,
+        "format": "{player_icon} ",
+        "format-paused": "{status_icon} <i>{dynamic}</i>",
+        "on-click-middle": "playerctl play-pause",
+        "on-click": "playerctl previous",
+        "on-click-right": "playerctl next",
+        "scroll-step": 5.0,
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+        "smooth-scrolling-threshold": 1,
+        "player-icons": {
+            "chromium": "",
+            "default": "",
+            "firefox": "",
+            "kdeconnect": "",
+            "mopidy": "",
+            "mpv": "󰐹",
+            "spotify": "",
+            "vlc": "󰕼",
+        },
+        "status-icons": {
+            "paused": "󰐎",
+            "playing": "",
+            "stopped": "",
+        },
+        // "ignored-players": ["firefox"]
+        "max-length": 30,
+    },
+    "network": {
+        "format": "{ifname}",
+        "format-wifi": "{icon}",
+        "format-ethernet": "󰌘",
+        "format-disconnected": "󰌙",
+        "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
+        "format-linked": "󰈁 {ifname} (No IP)",
+        "tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
+        "tooltip-format-ethernet": "{ifname} 󰌘",
+        "tooltip-format-disconnected": "󰌙 Disconnected",
+        "max-length": 50,
+        "format-icons": [
+            "󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
+        ]
+    },
+    "network#speed": {
+        "interval": 1,
+        "format": "{ifname}",
+        "format-wifi": "{icon}  {bandwidthUpBytes}  {bandwidthDownBytes}",
+        "format-ethernet": "󰌘   {bandwidthUpBytes}  {bandwidthDownBytes}",
+        "format-disconnected": "󰌙",
+        "tooltip-format": "{ipaddr}",
+        "format-linked": "󰈁 {ifname} (No IP)",
+        "tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
+        "tooltip-format-ethernet": "{ifname} 󰌘",
+        "tooltip-format-disconnected": "󰌙 Disconnected",
+        "max-length": 50,
+        "format-icons": [
+            "󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
+        ]
+    },
+    "pulseaudio": {
+        "format": "{icon} {volume}%",
+        "format-bluetooth": "{icon} 󰂰 {volume}%",
+        "format-muted": "󰖁",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": [
+                "", "", "󰕾",  ""
+            ],
+            "ignored-sinks": [
+                "Easy Effects Sink"
+            ],
+        },
+        "scroll-step": 5.0,
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
+        "on-click-right": "pavucontrol -t 3",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+        "tooltip-format": "{icon} {desc} | {volume}%",
+        "smooth-scrolling-threshold": 1,
+    },
+    "pulseaudio#microphone": {
+        "format": "{format_source}",
+        "format-source": " {volume}%",
+        "format-source-muted": "",
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
+        "on-click-right": "pavucontrol -t 4",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
+        "tooltip-format": "{source_desc} | {source_volume}%",
+        "scroll-step": 5,
+    },
+    "temperature": {
+        "interval": 10,
+        "tooltip": true,
+        "hwmon-path": [
+            "/sys/class/hwmon/hwmon1/temp1_input",
+            "/sys/class/thermal/thermal_zone0/temp"
+        ],
+        //"thermal-zone": 0,
+        "critical-threshold": 82,
+        "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": [
+            "󰈸"
+        ],
+        "on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+    },
+    "tray": {
+        "icon-size": 18,
+        "spacing": 4,
+    },
+    "wireplumber": {
+        "format": "{icon} {volume} %",
+        "format-muted": " Mute",
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
+        "on-click-right": "pavucontrol -t 3",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+        "format-icons": [
+            "", "", "󰕾", ""
+        ],
+    },
+    "wlr/taskbar": {
+        "format": "{icon} {name} ",
+        "icon-size": 15,
+        "all-outputs": false,
+        "tooltip-format": "{title}",
+        "on-click": "activate",
+        "on-click-middle": "close",
+        "ignore-list": [
+            "wofi",
+            "rofi",
+        ]
+    },
+    "custom/cycle_wall": {
+        "format": " ",
+        "exec": "echo ; echo 󰸉 wallpaper select",
+        "on-click": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+        "on-click-right": "~/.config/hypr/UserScripts/WallpaperRandom.sh",
+        "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+    "custom/hint": {
+        "format": "󰺁 HINT!",
+        "exec": "echo ; echo  Key Hints SUPER H",
+        "on-click": "~/.config/hypr/scripts/KeyHints.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+    "custom/keyboard": {
+        "exec": "cat ~/.cache/kb_layout",
+        "interval": 1,
+        "format": " {}",
+        "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
+    },
+    "custom/light_dark": {
+        "format": "󰔎{}",
+        "exec": "echo ; echo 󰔎 Dark-Light switcher",
+        "on-click": "~/.config/hypr/scripts/DarkLight.sh",
+        "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
+        "on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+        "interval": 86400, // once every day
+        "tooltip": true
+    },
+    "custom/lock": {
+        "format": "󰌾{}",
+        "exec": "echo ; echo 󰷛  screen lock",
+        "interval": 86400, // once every day
+        "tooltip": true,
+        "on-click": "~/.config/hypr/scripts/LockScreen.sh",
+    },
+    "custom/menu": {
+        "format": "{}",
+        "exec": "echo ; echo 󱓟 app launcher",
+        "interval": 86400, // once every day
+        "tooltip": true,
+        "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window",
+        "on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+        "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh",
+    },
+    // This is a custom cava visualizer
+    "custom/cava_mviz": {
+        "exec": "~/.config/hypr/scripts/WaybarCava.sh",
+        "format": "{}"
+    },
+    "custom/playerctl": {
+        "format": "<span>{}</span>",
+        "return-type": "json",
+        "max-length": 35,
+        "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
+        "on-click-middle": "playerctl play-pause",
+        "on-click": "playerctl previous",
+        "on-click-right": "playerctl next",
+        "scroll-step": 5.0,
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+        "smooth-scrolling-threshold": 1,
+    },
+    "custom/power": {
+        "format": "⏻ ",
+        "exec": "echo ; echo 󰟡 power // blur",
+        "on-click": "~/.config/hypr/scripts/Wlogout.sh",
+        "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+    "custom/swaync": {
+        "tooltip": true,
+        "format": "{icon} {}",
+        "format-icons": {
+            "notification": "<span foreground='red'><sup></sup></span>",
+            "none": "",
+            "dnd-notification": "<span foreground='red'><sup></sup></span>",
+            "dnd-none": "",
+            "inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "inhibited-none": "",
+            "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "dnd-inhibited-none": ""
+        },
+        "return-type": "json",
+        "exec-if": "which swaync-client",
+        "exec": "swaync-client -swb",
+        "on-click": "sleep 0.1 && swaync-client -t -sw",
+        "on-click-right": "swaync-client -d -sw",
+        "escape": true,
+    },
+    // NOTE:! This is only for Arch and Arch Based Distros  depend: pacman-contrib
+    "custom/updater": {
+        "format": " {}",
+        "exec": "checkupdates | wc -l",
+        "exec-if": "[[ $(checkupdates | wc -l) ]]",
+        "interval": 15,
+        "on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
+    },
+    "custom/weather": {
+        "format": "{}",
+        "format-alt": "{alt}: {}",
+        "format-alt-click": "click",
+        "interval": 3600,
+        "return-type": "json",
+        "exec": "~/.config/hypr/UserScripts/Weather.sh",
+        //"exec": "~/.config/hypr/UserScripts/Weather.py",
+        "exec-if": "ping wttr.in -c1",
+        "tooltip": true,
+    },
+    // Separators
+    "custom/separator#dot": {
+        "format": "",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#dot-line": {
+        "format": "",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#line": {
+        "format": "|",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#blank": {
+        "format": "",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#blank_2": {
+        "format": "  ",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#blank_3": {
+        "format": "   ",
+        "interval": "once",
+        "tooltip": false
+    },
+    // Modules below are for vertical layout
+    "backlight#vertical": {
+        "interval": 2,
+        "align": 0.35,
+        "rotate": 1,
+        "format": "{icon}",
+        //"format-icons": ["󰃞", "󰃟", "󰃠"],
+        "format-icons": [
+            "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""
+        ],
+        "on-click": "",
+        "on-click-middle": "",
+        "on-click-right": "",
+        "on-update": "",
+        "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
+        "smooth-scrolling-threshold": 1,
+        "tooltip-format": "{percent}%",
+    },
+    "clock#vertical": {
+        "format": "\n{:%H\n%M\n%S\n\n \n%d\n%m\n%y}",
+        "interval": 1,
+        //"format": "\n{:%I\n%M\n%p\n\n \n%d\n%m\n%y}",
+        "tooltip": true,
+        "tooltip-format": "{calendar}",
+        "calendar": {
+            "mode": "year",
+            "mode-mon-col": 3,
+            "format": {
+                "today": "<span color='#0dbc79'>{}</span>",
+            }
+        }
+    },
+    "cpu#vertical": {
+        "format": "󰍛\n{usage}%",
+        "interval": 1,
+        "on-click-right": "gnome-system-monitor",
+    },
+    "memory#vertical": {
+        "interval": 10,
+        "format": "󰾆\n{percentage}%",
+        "format-alt": "󰾆\n{used:0.1f}G",
+        "format-alt-click": "click",
+        "tooltip": true,
+        "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
+        "on-click-right": "kitty --title btop sh -c 'btop'",
+    },
+    "pulseaudio#vertical": {
+        "format": "{icon}",
+        "format-bluetooth": "󰂰",
+        "format-muted": "󰖁",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": [
+                "", "", "󰕾", ""
+            ],
+            "tooltip-format": "{icon} {desc} | {volume}%",
+            "ignored-sinks": [
+                "Easy Effects Sink"
+            ],
+        },
+        "scroll-step": 5.0,
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
+        "on-click-right": "pavucontrol -t 3",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+        "tooltip-format": "{icon} {desc} | {volume}%",
+        "smooth-scrolling-threshold": 1,
+    },
+    "pulseaudio#microphone_vertical": {
+        "format": "{format_source}",
+        "format-source": "󰍬",
+        "format-source-muted": "󰍭",
+        "on-click-right": "pavucontrol",
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
+        "max-volume": 100,
+        "tooltip": true,
+        "tooltip-format": "{source_desc} | {source_volume}%",
+    },
+    "temperature#vertical": {
+        "interval": 10,
+        "tooltip": true,
+        "hwmon-path": [
+            "/sys/class/hwmon/hwmon1/temp1_input",
+            "/sys/class/thermal/thermal_zone0/temp"
+        ],
+        //"thermal-zone": 0,
+        "critical-threshold": 80,
+        "format-critical": "{icon}\n{temperatureC}°C",
+        "format": " {icon}",
+        "format-icons": [
+            "󰈸"
+        ],
+        "on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+    },
+    "custom/power_vertical": {
+        "format": "⏻",
+        "exec": "echo ; echo 󰟡 power // blur",
+        "on-click": "~/.config/hypr/scripts/Wlogout.sh",
+        "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyj	72a185c97e	Merge branch 'upstream-custom' into dev	2024-06-05 05:57:18 -04:00
wyj	3bc6335304	update: get my laptop layout back	2024-06-05 05:56:08 -04:00
wyj	ac677d9bb9	Merge branch 'upstream-main' into upstream-custom	2024-06-05 05:50:17 -04:00
wyj	1331fab4fb	Merge branch 'upstream-custom' into dev	2024-06-04 16:52:47 -04:00
wyj	245ab326fd	update: use drawer to have idle_inhibiner	2024-06-04 16:52:29 -04:00
wyj	0a4d1b5a6a	Merge branch 'upstream-custom' into dev	2024-05-28 16:20:13 -04:00
wyj	5326446dd7	fix: typo: ture->true	2024-05-28 16:19:42 -04:00
wyj	60fc0572f0	Merge branch 'upstream-custom' into dev	2024-05-28 15:13:02 -04:00
wyj	827adc2140	update: add DP-2 in waybar	2024-05-28 15:12:43 -04:00
wyj	2b45dd70d5	Merge branch 'upstream-custom' into dev	2024-05-28 02:19:43 -04:00
wyj	d890fad373	feat: add window swallow	2024-05-28 02:19:29 -04:00
wyj	b6507b5b36	Merge branch 'upstream-custom' into dev	2024-05-27 03:37:54 -04:00
wyj	604242d58d	fix: change workspace button style order	2024-05-27 03:37:38 -04:00
wyj	dc31d31fb0	Merge branch 'upstream-custom' into dev	2024-05-27 00:28:16 -04:00
wyj	a479750bd7	update: add laptop touchpad and gestures	2024-05-26 19:21:50 -04:00
wyj	9971614a64	update: add laptop touchpad and gestures	2024-05-26 19:20:39 -04:00
wyj	308cf54c19	Merge branch 'upstream-custom' into dev	2024-05-26 19:08:43 -04:00
wyj	08947e991c	update: battery icon and space	2024-05-26 18:47:31 -04:00
wyj	3ca359ce96	fix: add kitty config	2024-05-26 18:41:55 -04:00
wyj	a6ee6ced28	Merge branch 'upstream-custom' into dev	2024-05-26 18:34:53 -04:00
wyj	8a05e91018	update: add ttf-firacode-nerd	2024-05-26 18:24:11 -04:00
wyj	43e564e47a	update: waybar	2024-05-26 18:22:25 -04:00
wyj	1f63a28eeb	Merge branch 'upstream-custom' into dev	2024-05-26 02:54:37 -04:00
wyj	6cf2a43c2c	update: waybar	2024-05-26 02:54:26 -04:00
wyj	967c5bbc57	update: remove pfetch	2024-05-26 02:06:39 -04:00
wyj	ca4b934dcf	update: change cursor to vimix	2024-05-26 02:05:37 -04:00
wyj	507143360d	Merge branch 'upstream-custom' into dev	2024-05-26 01:59:43 -04:00
wyj	2a3b26adb7	update: add main monitor settings to dual	2024-05-26 01:59:26 -04:00
wyj	23467523ed	Merge branches 'upstream-hidpi' and 'upstream-custom' into dev	2024-05-26 01:48:19 -04:00
wyj	d01229183c	fix: kitty-dropterm	2024-05-26 01:44:50 -04:00
wyj	20643e9048	update: change default animation	2024-05-26 01:30:03 -04:00
wyj	8828e93f78	update: add an empty line in custum.conf	2024-05-26 01:26:57 -04:00
wyj	50e0fca95c	Merge branch 'upstream-custom' into dev	2024-05-26 01:18:34 -04:00
wyj	e01895d286	update: use us keyboad layout	2024-05-26 01:11:33 -04:00
wyj	6a943e7e61	Merge branch 'upstream-custom' into dev	2024-05-26 00:53:54 -04:00
wyj	985b12cc6e	update: wazbar	2024-05-26 00:50:57 -04:00
wyj	24f4e6e424	update: use kitty as drop-down term	2024-05-25 14:46:40 -04:00
wyj	dd8866242e	fix: add pyprland to packages	2024-05-23 19:00:19 -04:00
wyj	2a649838a4	Merge branch 'upstream-custom' into dev	2024-05-23 18:21:10 -04:00
wyj	8fc4cb9d9e	feat: add pyprland and term dropdown	2024-05-23 03:18:10 -04:00
wyj	73d4480014	feat: add chrome-flags.conf	2024-05-23 01:35:44 -04:00
wyj	efb387ef14	update: change wallpapers to my own	2024-05-22 00:19:43 -04:00
wyj	9f9ea20ee3	Merge branches 'upstream-custom' and 'zshfish' into dev	2024-05-22 00:13:06 -04:00
wyj	3e99847d8b	update: copy a waybar config	2024-05-22 00:12:43 -04:00
wyj	bc37c0e612	Merge branch 'upstream-custom' into dev	2024-05-21 19:17:57 -04:00
wyj	c1542e026c	update: new colors in fastfetch	2024-05-21 19:16:39 -04:00
wyj	d9bdf7e748	feat: add .zshrc	2024-05-20 23:01:49 -04:00
wyj	567a892f8b	Merge branch 'upstream-hidpi' into dev	2024-05-18 16:29:10 -04:00
wyj	c99a2809ce	fix: hidpi.sh	2024-05-18 16:28:58 -04:00
wyj	23f8294d48	Merge branch 'upstream-custom' into dev	2024-05-18 00:47:50 -04:00
wyj	dd5a4b76ae	update: float QQ	2024-05-17 13:14:19 -04:00
wyj	63a3e3e222	Merge branch 'upstream-hidpi' into dev	2024-05-17 02:10:30 -04:00
wyj	08096e83ff	update: font size=16 for alacritty	2024-05-17 02:09:53 -04:00
wyj	89623ce4f3	Merge branch 'upstream-hidpi' into dev	2024-05-17 01:59:09 -04:00
wyj	a0f43ada10	fix: patch in ~/dotfiles-versions rather than in repository	2024-05-17 01:46:29 -04:00
wyj	8503665117	Merge branch 'upstream-custom' into dev	2024-05-10 17:05:22 -04:00
wyj	3a49bd1ad7	update: use fastfetch instead of neofetch	2024-05-10 17:05:12 -04:00
wyj	3dac8139fe	Merge branch 'upstream-custom' into dev	2024-05-10 17:03:13 -04:00
wyj	075a5df837	enhence: add fastfetch config	2024-05-10 17:02:55 -04:00
wyj	1e6940e88d	Merge branch 'upstream-custom' into dev	2024-05-08 01:57:08 -04:00
wyj	6500fe1c1a	enhence: add display selection in screenshot	2024-05-07 23:45:52 -04:00
wyj	90c646a8fe	Merge branches 'upstream-hidpi' and 'upstream-custom' into dev	2024-05-05 16:41:45 -04:00
wyj	77b6b90448	Merge branch 'upstream-main' into upstream-custom	2024-05-05 16:40:17 -04:00
wyj	b4a5e4d99c	Merge branch 'upstream-main' into upstream-hidpi	2024-05-05 16:34:49 -04:00
wyj	5c3bb19b01	Merge branch 'upstream-custom' into dev	2024-04-19 14:43:44 -04:00
wyj	149d10a285	update: add some custom packages	2024-04-19 14:43:23 -04:00
wyj	8f7e902f81	Merge branch 'upstream-custom' into dev	2024-04-19 02:49:05 -04:00
wyj	fd46e16738	update: make alacritty auto copy	2024-04-19 02:48:51 -04:00
wyj	3c8149ed0b	Merge branch 'upstream-custom' into dev	2024-04-15 19:53:45 -04:00
wyj	f68578bc48	update: idle... margin in waybar	2024-04-15 19:53:17 -04:00
wyj	c7fbe7c7f5	Merge branch 'upstream-custom' into dev	2024-04-15 13:18:02 -04:00
wyj	d46e796571	update: waybar ram icon	2024-04-15 13:17:46 -04:00
wyj	14a56275eb	update: wifi icon in waybar	2024-04-09 14:16:04 -04:00
wyj	cc4a4fb1c0	Merge branch 'upstream-custom' into dev	2024-04-05 16:20:49 -04:00
wyj	26654d87e9	fix: rofi border radius	2024-04-05 16:20:36 -04:00
wyj	056ffe440f	Merge branch 'fcitx5' into dev	2024-04-05 16:13:32 -04:00
wyj	b9025fbfb1	fix: fcitx5 conf	2024-04-05 16:13:19 -04:00
wyj	d7a50ce2fe	Merge branch 'fcitx5' into dev	2024-04-05 16:07:49 -04:00
wyj	7a4d9f7b21	fix: fcitx5 conf	2024-04-05 16:07:36 -04:00
wyj	2c3ff9e10d	Merge branch 'fcitx5' into dev	2024-04-05 15:50:17 -04:00
wyj	249e71d187	fix: fcitx5 conf	2024-04-05 15:50:00 -04:00
wyj	48eab0a6ab	Merge branch 'fcitx5' into dev	2024-04-05 15:31:39 -04:00
wyj	380b43ea30	new feat: fcitx5 install	2024-04-05 15:31:21 -04:00
wyj	607178e5a2	Merge branch 'upstream-custom' into dev	2024-04-05 02:59:58 -04:00
wyj	ee983e39db	update: waybar tray	2024-04-05 02:59:46 -04:00
wyj	71a63edafa	Merge branch 'upstream-custom' into dev	2024-04-05 01:34:01 -04:00
wyj	18bed6fbdf	update: rofi border-radius and position etc	2024-04-05 01:33:45 -04:00
wyj	091bbbfb1a	Merge branch 'upstream-custom' into dev	2024-04-04 22:12:38 -04:00
wyj	77cd4cf980	minor: space in cpu module in waybar	2024-04-04 05:10:16 -04:00
wyj	f095151882	update: better cpu icon in waybar	2024-04-04 04:52:18 -04:00
wyj	f058ea58f7	Merge branch 'upstream-custom' into dev	2024-04-04 04:45:50 -04:00
wyj	bc227bed49	minor: trail space	2024-04-04 04:44:25 -04:00
wyj	475fbc55cc	update: better battery in waybar	2024-04-04 04:42:52 -04:00
wyj	6a9270c276	Merge branch 'upstream-custom' into dev	2024-04-04 03:17:46 -04:00
wyj	1c96f24b09	update: new battary icons in waybar	2024-04-04 03:17:29 -04:00
wyj	71caefa11a	update: rm volume number from waybar	2024-04-04 02:29:48 -04:00
wyj	4b9812dc7f	update: add notify-sent to volume change	2024-04-04 00:02:50 -04:00
wyj	58966c14c8	Merge branch 'upstream-custom' into dev	2024-04-03 23:52:20 -04:00
wyj	20ce47fa20	update: add ~/.local/bin to PATH in bashrc (for zathura-pywal)	2024-04-03 22:27:27 -04:00
wyj	d2b6c0adcc	Merge branch 'upstream-custom' into dev	2024-04-03 17:32:04 -04:00
wyj	1763d37ee4	update: keep memory in waybar 0.1f	2024-04-03 17:31:32 -04:00
wyj	75759b18c3	Merge branch 'upstream-custom' into dev	2024-04-03 14:34:51 -04:00
wyj	b113e1f81d	update: keep idle-inh...	2024-04-03 14:34:31 -04:00
wyj	a1f6438b3c	Merge branch 'upstream-custom' into dev	2024-04-03 14:29:21 -04:00
wyj	289308a542	update: keep idle-inh...	2024-04-03 14:29:05 -04:00
wyj	87b7bed3fe	Merge branches 'upstream-hidpi' and 'upstream-custom' into dev	2024-04-03 14:23:18 -04:00
wyj	8c2be8fed6	Merge remote-tracking branch 'upstream/main' into upstream-custom	2024-04-03 14:22:56 -04:00
wyj	45214117ef	Merge remote-tracking branch 'upstream/main' into upstream-hidpi	2024-04-03 14:22:34 -04:00
wyj	07c38a02b5	Merge branch 'upstream-custom' into dev	2024-04-03 14:19:44 -04:00
wyj	beb717a961	update: custom waybar	2024-04-03 13:25:27 -04:00
wyj	fdbd7de334	Merge branch 'upstream-hidpi' into dev	2024-04-01 15:42:28 -04:00
wyj	0d4b85956e	fix: sed need -E	2024-04-01 15:42:06 -04:00
wyj	059396985d	Merge branch 'upstream-hidpi' into dev	2024-04-01 15:01:02 -04:00
wyj	8565146242	update: change the non-hidpi default font size in alacritty	2024-04-01 15:00:34 -04:00
wyj	d2a368d166	fix hidpi.sh: echo -e	2024-03-28 20:46:48 -04:00
wyj	c6678dcc96	update hidpi.sh: add finish output	2024-03-28 20:46:48 -04:00
wyj	b6156e3233	fix hidpi.sh	2024-03-28 20:46:48 -04:00
wyj	0da2e83f29	fix hidpi.sh: -i instead of -E	2024-03-28 20:46:48 -04:00
wyj	9f8b285ba3	update hidpi.sh: run always	2024-03-28 20:46:48 -04:00
wyj	671a47f09e	fix bug: missing fi	2024-03-28 20:46:48 -04:00
wyj	51a350c544	Merge branch 'upstream-custom' into dev	2024-03-28 19:30:46 -04:00
wyj	2e985927af	update: add custom blur waybar themes	2024-03-28 19:30:14 -04:00
wyj	8265c9fdea	update: add custom waybar themes	2024-03-28 19:26:19 -04:00
wyj	d28d59b6b8	Merge branch 'upstream-hidpi' into dev merge hidpi support	2024-03-28 13:05:00 -04:00
wyj	c1873060de	update: add custom settings	2024-03-28 13:02:10 -04:00
wyj	943cb53c93	add hidpi in install.sh	2024-03-28 01:45:39 -04:00
wyj	c3bfe46e79	add basic hidpi	2024-03-27 23:17:46 -04:00
@@ -1 +1 @@
 .9.2
 .9.1.1
				`@@ -0,0 +1 @@`
				`--ozone-platform=wayland --enable-wayland-ime`