Merge branch 'upstream-hidpi' into dev

merge hidpi support

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "yazi/flavors/tokyo-night.yazi"]
-	path = yazi/flavors/tokyo-night.yazi
-	url = https://github.com/BennyOe/tokyo-night.yazi.git

.install/fcitx5.sh

@@ -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

.install/fish.sh

@@ -0,0 +1,6 @@
+# ------------------------------------------------------
+# install fish
+# ------------------------------------------------------
+packagesPacman=("fish");
+packagesYay=();
+source .install/install-packages.sh

.install/hidpi.sh

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

.install/packages/general-packages.sh

@@ -36,7 +36,7 @@ packagesPacman=(
     "man-pages"
     "gvfs"
     "xdg-user-dirs"
-#    "xdg-desktop-portal-gtk"
+    "xdg-desktop-portal-gtk"
     "xarchiver"
     "thunar-archive-plugin"
     "zip"
@@ -47,8 +47,6 @@ packagesPacman=(
     "jq"
     "rofi-wayland"
     "fastfetch"
-    "pipewire-pulse"
-    "wireplumber"
 );
 
 packagesYay=(

.install/packages/hyprland-packages.sh

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

.install/restore.sh

@@ -14,6 +14,14 @@ _showRestoreOptions() {
         restorelist+="~/dotfiles/.bashrc "
         selectedlist+="~/dotfiles/.bashrc,"
     fi
+    if [ -f ~/dotfiles/.zshrc ]; then
+        restorelist+="~/dotfiles/.zshrc "
+        selectedlist+="~/dotfiles/.zshrc,"
+    fi
+    if [ -f ~/dotfiles/.p10k.zsh ]; then
+        restorelist+="~/dotfiles/.p10k.zsh "
+        selectedlist+="~/dotfiles/.p10k.zsh,"
+    fi
     if [ -d ~/dotfiles/.settings ]; then
         restorelist+="~/dotfiles/.settings "
         selectedlist+="~/dotfiles/.settings,"
@@ -24,7 +32,7 @@ _showRestoreOptions() {
             then
                 restorelist+="~/dotfiles/hypr/hypridle.conf "
                 selectedlist+="~/dotfiles/hypr/hypridle.conf,"
-            fi        
+            fi
         fi
         if [ -f ~/dotfiles/hypr/conf/custom.conf ]; then
             restorelist+="~/dotfiles/hypr/conf/custom.conf "
@@ -75,13 +83,13 @@ _showRestoreOptions() {
     fi
     restoreselect=$(gum choose --no-limit --height 20 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " --selected="$selectedlist" $restorelist)
     if [ ! -z "$restoreselect" ] ;then
-        echo "Selected to restore:" 
+        echo "Selected to restore:"
         echo "$restoreselect"
         echo ""
         confirmrestore=$(gum choose "Start restore" "Change restore" "Skip restore")
         if [ "$confirmrestore" == "Start restore" ] ;then
             _startRestore
-        elif [ "$confirmrestore" == "Change restore" ]; then 
+        elif [ "$confirmrestore" == "Change restore" ]; then
             _showRestoreOptions
         else
             echo ":: Restore skipped."
@@ -94,7 +102,7 @@ _showRestoreOptions() {
             echo ":: Installation canceled."
             exit
         fi
-        if [ "$confirmrestore" == "Change restore" ]; then 
+        if [ "$confirmrestore" == "Change restore" ]; then
             echo ""
             _showRestoreOptions
         else
@@ -135,11 +143,11 @@ _startRestore() {
                 cp ~/dotfiles/hypr/conf/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/
                 echo ":: Hyprland keyboard.conf restored!"
             fi
-        fi        
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/monitor.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/monitor.conf ]; then
                 cp ~/dotfiles/hypr/conf/monitor.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo ":: Hyprland monitor.conf restored!"                
+                echo ":: Hyprland monitor.conf restored!"
             fi
         fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/keybinding.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
@@ -153,19 +161,19 @@ _startRestore() {
                 cp ~/dotfiles/hypr/conf/environment.conf ~/dotfiles-versions/$version/hypr/conf/
                 echo ":: Hyprland environment.conf restored!"
             fi
-        fi        
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/layout.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/layout.conf ]; then
                 cp ~/dotfiles/hypr/conf/layout.conf ~/dotfiles-versions/$version/hypr/conf/
                 echo ":: Hyprland layout.conf restored!"
             fi
-        fi        
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/windowrule.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/windowrule.conf ]; then
                 cp ~/dotfiles/hypr/conf/windowrule.conf ~/dotfiles-versions/$version/hypr/conf/
                 echo ":: Hyprland windowrule.conf restored!"
             fi
-        fi        
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/animation.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/animation.conf ]; then
                 cp ~/dotfiles/hypr/conf/animation.conf ~/dotfiles-versions/$version/hypr/conf/

.install/zsh.sh

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

.install/zshfish.sh

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

.zshrc_ohmyzsh

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

.zshrc_zinit

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

alacritty/alacritty.toml

@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0
 
 [font.normal]
 family = "FiraCode Nerd Font"

fastfetch/config.jsonc

@@ -85,7 +85,7 @@
         },
         {
             "type": "editor",
-            "key": "├─",
+            "key": "├──",
             "keyColor": "yellow"
         },
         {

hypr/conf/decorations/custom.conf

@@ -18,14 +18,8 @@ decoration {
     inactive_opacity = 0.8
     fullscreen_opacity = 1.0
 
-    shadow {
+    drop_shadow = true
-        enabled = true
+    shadow_range = 30
-        range = 30
+    shadow_render_power = 3
-        render_power = 3
+    col.shadow = 0x66000000
-        color = 0x66000000
-    }
-    #drop_shadow = true
-    #shadow_range = 30
-    #shadow_render_power = 3
-    #col.shadow = 0x66000000
 }

hypr/conf/environments/default.conf

@@ -10,4 +10,3 @@ env = QT_QPA_PLATFORMTHEME,qt6ct
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = MOZ_ENABLE_WAYLAND,1
-env = GDK_SCALE,1

hypr/conf/fcitx5.conf

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

hypr/conf/hidpi.conf

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

hypr/conf/keybindings/custom.conf

@@ -32,7 +32,6 @@ 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
-bind = $mainMod CTRL, Tab, changegroupactive, f
 
 # Actions
 bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh

hypr/conf/misc.conf

@@ -7,5 +7,4 @@ misc {
     disable_splash_rendering = true
     enable_swallow = true
     swallow_regex = ^(Alacritty|kitty|thunar)$
-    font_family = FiraCode Nerd Font
 }

hypr/conf/monitors/4k.conf

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

hypr/conf/windowrules/custom.conf

@@ -14,9 +14,8 @@ windowrule = pin,^(showmethekey-gtk)$
 layerrule = blur, gtk-layer-shell
 layerrule = blur, logout_dialog
 
-windowrule = float,title:^(Mathematica)$
+windowrule = float,title=^(Mathematica)$
 windowrule = opacity 0.75, ^(Code)$
-windowrule = opacity 0.75, ^(code-oss)$
 windowrule = opacity 0.75, ^(code-url-handler)$
 windowrule = float,^(QQ)$
 windowrule = float,^(wechat)$

hypr/conf/windows/default.conf

@@ -11,12 +11,3 @@ general {
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
 }
-
-group {
-    col.border_active = $color11
-    col.border_inactive = rgba(ffffffff)
-    groupbar {
-        col.active = $color11
-        col.inactive = $color13
-    }
-}

hypr/hyprland.conf

@@ -1,48 +1,48 @@
-#  _   _                  _                 _  
+#  _   _                  _                 _
-# | | | |_   _ _ __  _ __| | __ _ _ __   __| | 
+# | | | |_   _ _ __  _ __| | __ _ _ __   __| |
-# | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` | 
+# | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` |
-# |  _  | |_| | |_) | |  | | (_| | | | | (_| | 
+# |  _  | |_| | |_) | |  | | (_| | | | | (_| |
-# |_| |_|\__, | .__/|_|  |_|\__,_|_| |_|\__,_| 
+# |_| |_|\__, | .__/|_|  |_|\__,_|_| |_|\__,_|
-#        |___/|_|                              
+#        |___/|_|
-#  
+#
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # IMPORTANT: Don't overwrite ML4W configuration.
 # Create your own custom configuration variation instead.
 # https://gitlab.com/stephan-raabe/dotfiles#hyprland-configuration-variations
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Monitor
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/monitor.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Autostart
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/autostart.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Cursor
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/cursor.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Environment
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/environment.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Keyboard
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/keyboard.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Load pywal color file
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/.cache/wal/colors-hyprland.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Load configuration files
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/window.conf
 source = ~/dotfiles/hypr/conf/decoration.conf
 source = ~/dotfiles/hypr/conf/layout.conf
@@ -50,22 +50,22 @@ source = ~/dotfiles/hypr/conf/misc.conf
 source = ~/dotfiles/hypr/conf/keybinding.conf
 source = ~/dotfiles/hypr/conf/windowrule.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Animation
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/animation.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Custom
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/custom.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # ML4W Configuration
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/ml4w.conf
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Environment for xdg-desktop-portal-hyprland
-# ----------------------------------------------------- 
+# -----------------------------------------------------
-exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP

install.sh

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

kitty/kitty.conf

@@ -1,5 +1,5 @@
 font_family      Fira Code Nerd Font
-font_size        16.0
+font_size        14.0
 bold_font        auto
 italic_font      auto
 bold_italic_font auto

scripts/waybar-khal.py

@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-
-import subprocess
-import datetime
-import json
-from html import escape
-
-data = {}
-
-today = datetime.date.today().strftime("%Y-%m-%d")
-
-next_week = (datetime.date.today() +
-             datetime.timedelta(days=10)).strftime("%Y-%m-%d")
-
-output = subprocess.check_output("khal list now "+next_week, shell=True)
-output = output.decode("utf-8")
-
-lines = output.split("\n")
-new_lines = []
-for line in lines:
-    clean_line = escape(line).split(" ::")[0]
-    if len(clean_line) and not clean_line[0] in ['0', '1', '2']:
-        clean_line = "\n<b>"+clean_line+"</b>"
-    new_lines.append(clean_line)
-output = "\n".join(new_lines).strip()
-
-if today in output:
-    data['text'] = " " + output.split('\n')[1]
-else:
-    data['text'] = ""
-
-data['tooltip'] = output
-
-print(json.dumps(data))

waybar/launch.sh

@@ -25,7 +25,7 @@ sleep 0.2
 # ----------------------------------------------------- 
 # Default theme: /THEMEFOLDER;/VARIATION
 # ----------------------------------------------------- 
-themestyle="/meow-blur;/meow-blur/colored"
+themestyle="/ml4w;/ml4w/light"
 
 # ----------------------------------------------------- 
 # Get current theme information from .cache/.themestyle.sh
@@ -41,7 +41,7 @@ IFS=';' read -ra arrThemes <<< "$themestyle"
 echo "Theme: ${arrThemes[0]}"
 
 if [ ! -f ~/dotfiles/waybar/themes${arrThemes[1]}/style.css ]; then
-    themestyle="/meow-blur;/meow-blur/colored"
+    themestyle="/ml4w;/ml4w/light"
 fi
 
 # ----------------------------------------------------- 

waybar/themes/meow-blur-laptop/colored/config.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="MEOW Blur Colored Laptop"

waybar/themes/meow-blur-laptop/config

@@ -1,127 +0,0 @@
-// __        __          _                 
-// \ \      / /_ _ _   _| |__   __ _ _ __  
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
-[{
-    // General Settings
-    "layer": "top",
-    "output": ["eDP-1", "DP-1"],
-    "margin-top": 0,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenuicon",
-        "hyprland/workspaces",
-        //"custom/appmenu",
-        //"group/settings",
-        "wlr/taskbar",
-        //"group/quicklinks",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    "modules-center": [
-       "group/time"
-    ],
-
-    // Modules Right
-    "modules-right": [
-        "custom/updates",
-        "group/hardware",
-        "group/hardware2",
-        "battery",
-        "battery#charging",
-        "tray",
-        "group/power"
-    ]
-}, {
-    // General Settings
-    "layer": "top",
-    "output": ["HDMI-A-1"],
-    "margin-top": 0,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenuicon",
-        "hyprland/workspaces",
-        "wlr/taskbar",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    // "modules-center": [
-    //    "clock"
-    // ],
-
-    // Modules Right
-    "modules-right": [
-        "tray",
-        "custom/events"
-    ]
-},{
-    // General Settings
-    "layer": "top",
-    "output": ["DP-2"],
-    "margin-top": 0,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenuicon",
-        "hyprland/workspaces",
-        //"custom/appmenu",
-        //"group/settings",
-        "wlr/taskbar",
-        //"group/quicklinks",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    "modules-center": [
-       "custom/events"
-    ],
-
-    // Modules Right
-    "modules-right": [
-        "custom/updates",
-        "group/hardware",
-        "group/hardware2",
-        "battery",
-        "battery#charging",
-        "tray",
-        "group/power"
-    ]
-},]
-

waybar/themes/meow-blur-laptop/mixed/config.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="MEOW Blur Mixed Laptop"

waybar/themes/meow-blur/config

@@ -11,7 +11,7 @@
 [{
     // General Settings
     "layer": "top",
-    "output": ["eDP-1", "DP-1"],
+    "output": ["eDP-1", "DP-1", "DP-2"],
     "margin-top": 0,
     "margin-bottom": 0,
     "layer": "top",
@@ -80,48 +80,7 @@
     // Modules Right
     "modules-right": [
         "tray",
-        "custom/events"
+        "clock"
     ]
-},{
+}]
-    // General Settings
-    "layer": "top",
-    "output": ["DP-2"],
-    "margin-top": 0,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenuicon",
-        "hyprland/workspaces",
-        //"custom/appmenu",
-        //"group/settings",
-        "wlr/taskbar",
-        //"group/quicklinks",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    "modules-center": [
-       "custom/events"
-    ],
-
-    // Modules Right
-    "modules-right": [
-        "custom/updates",
-        "group/hardware",
-        "group/hardware2",
-        "battery",
-        "battery#charging",
-        "tray",
-        "group/power"
-    ]
-},]
 

waybar/themes/meow-blur/modules.json

@@ -10,15 +10,15 @@
 //
 {
     // Workspaces
-    "hyprland/workspaces": {
+    "hyprland/workspaces" : {
         "on-click": "activate",
         "active-only": false,
         "all-outputs": true,
         "format": "{}",
         "format-icons": {
-            "urgent": "",
+			"urgent": "",
-            "active": "",
+			"active": "",
-            "default": ""
+			"default": ""
         },
         "persistent-workspaces": {
             // START WORKSPACES
@@ -26,6 +26,7 @@
             // END WORKSPACES
         }
     },
+
     // Taskbar
     "wlr/taskbar": {
         "format": "{icon}",
@@ -47,6 +48,7 @@
             "Foot Server": "Terminal"
         }
     },
+
     // Hyprland Window
     "hyprland/window": {
         "rewrite": {
@@ -60,10 +62,12 @@
         },
         "separate-outputs": true
     },
+
     // Empty
     "custom/empty": {
         "format": ""
     },
+
     // Cliphist
     "custom/cliphist": {
         "format": "",
@@ -72,6 +76,7 @@
         "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w",
         "tooltip": false
     },
+
     // Updates Count
     "custom/updates": {
         "format": " {}",
@@ -79,10 +84,11 @@
         "escape": true,
         "return-type": "json",
         "exec": "~/dotfiles/scripts/updates.sh",
-        "restart-interval": 300,
+        "restart-interval": 60,
         "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
         "tooltip": false
     },
+
     // Wallpaper
     "custom/wallpaper": {
         "format": "",
@@ -90,54 +96,63 @@
         "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
         "tooltip": false
     },
+
     // Waybar Themes
     "custom/waybarthemes": {
         "format": "",
         "on-click": "~/dotfiles/waybar/themeswitcher.sh",
         "tooltip": false
     },
+
     // Keybindings
     "custom/keybindings": {
         "format": "",
         "on-click": "~/dotfiles/hypr/scripts/keybindings.sh",
         "tooltip": false
     },
+
     // Filemanager Launcher
     "custom/filemanager": {
         "format": "",
         "on-click": "~/dotfiles/.settings/filemanager.sh",
         "tooltip": false
     },
+
     // Outlook Launcher
     "custom/outlook": {
         "format": "",
         "on-click": "chromium --app=https://outlook.office.com/mail/",
         "tooltip": false
     },
+
     // Browser Launcher
     "custom/browser": {
         "format": "",
         "on-click": "~/dotfiles/.settings/browser.sh",
         "tooltip": false
     },
+
     // ChatGPT Launcher
     "custom/chatgpt": {
         "format": " ",
         "on-click": "chromium --app=https://chat.openai.com",
         "tooltip": false
     },
+
     // Calculator
     "custom/calculator": {
         "format": "",
         "on-click": "qalculate-gtk",
         "tooltip": false
     },
+
     // Windows VM
     "custom/windowsvm": {
         "format": "",
         "on-click": "~/dotfiles/scripts/launchvm.sh",
         "tooltip": false
     },
+
     // Rofi Application Launcher
     "custom/appmenu": {
         // START APPS LABEL
@@ -147,6 +162,7 @@
         "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
         "tooltip": false
     },
+
     // Rofi Application Launcher
     "custom/appmenuicon": {
         "format": "",
@@ -154,12 +170,14 @@
         "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
         "tooltip": false
     },
+
     // Power Menu
     "custom/exit": {
         "format": "",
         "on-click": "wlogout",
         "tooltip": false
     },
+
     // Keyboard State
     "keyboard-state": {
         "numlock": true,
@@ -170,6 +188,7 @@
             "unlocked": ""
         }
     },
+
     "group/tray": {
         "orientation": "inherit",
         "drawer": {
@@ -181,27 +200,29 @@
             "tray"
         ]
     },
+
     // System tray
     "tray": {
         "icon-size": 16,
         "spacing": 8,
         "verse-direction": true
     },
+
     // Clock
     "clock": {
         "calendar": {
-            "mode": "year",
+            "mode"          : "year",
-            "mode-mon-col": 3,
+            "mode-mon-col"  : 3,
-            "weeks-pos": "right",
+            "weeks-pos"     : "right",
-            "on-scroll": 1,
+            "on-scroll"     : 1,
             "format": {
-                "months": "<span color='#ffead3'><b>{}</b></span>",
+                      "months":     "<span color='#ffead3'><b>{}</b></span>",
-                "days": "<span color='#ecc6d9'><b>{}</b></span>",
+                      "days":       "<span color='#ecc6d9'><b>{}</b></span>",
-                "weeks": "<span color='#99ffdd'><b>W{}</b></span>",
+                      "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
-                "weekdays": "<span color='#ffcc66'><b>{}</b></span>",
+                      "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
-                "today": "<span color='#ff6699'><b><u>{}</u></b></span>"
+                      "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
-            }
+                      }
-        },
+            },
         // TIMEDATEFORMAT
         "format": "{:%B %d %H:%M %a}",
         // "timezone": "America/New_York",
@@ -210,16 +231,19 @@
         "format-alt": "{:%Y-%m-%d}"
         // END CLOCK FORMAT
     },
+
     // spacer
     "custom/spacer": {
         "format": " ",
         "tooltip": false
     },
+
     // div
     "custom/div": {
         "format": "",
         "tooltip": false
     },
+
     // CPU
     "cpu": {
         "format": "󰒇 {usage}%",
@@ -230,16 +254,17 @@
             "critical": 90
         }
     },
+
     // "cpu#bar": {
     //     "format": "{icon}",
     //     "format-icons":[
     //         "▏ ","▎ ","▍ ","▌ ","▋ ","▊ ","▉ ","█ ","█▏","█▎","█▍","█▌","█▋","█▊","█▉","██"
     //     ]
     // },
+
     // Memory
     "memory": {
         "format": " {used:0.1f}G",
-        "tooltip-format": "{total:0.1f}G total\n{swapTotal:0.1f}G swap\n{used:0.1f}G used\n{avail:0.1f}G free\n{percentage}% used",
         "on-click": "alacritty -e htop",
         "interval": 10,
         "states": {
@@ -247,6 +272,7 @@
             "critical": 80
         }
     },
+
     // Harddisc space used
     "disk": {
         "interval": 30,
@@ -254,9 +280,11 @@
         "path": "/",
         "on-click": "alacritty -e htop"
     },
+
     "hyprland/language": {
         "format": "/ K {short}"
     },
+
     // Group Hardware
     "group/hardware": {
         "orientation": "inherit",
@@ -268,6 +296,7 @@
             "memory"
         ]
     },
+
     "group/hardware2": {
         "orientation": "inherit",
         "modules": [
@@ -279,6 +308,7 @@
             // "battery#charging"
         ]
     },
+
     // Group system settings
     "group/systems": {
         "orientation": "inherit",
@@ -287,6 +317,7 @@
             "clock"
         ]
     },
+
     "group/power": {
         "orientation": "inherit",
         "drawer": {
@@ -299,6 +330,7 @@
             "idle_inhibitor"
         ]
     },
+
     // Group Settings
     "group/settings": {
         "orientation": "horizontal",
@@ -311,14 +343,16 @@
             "custom/wallpaper"
         ]
     },
+
     // Group Quicklinks
     "group/quicklinks": {
         "orientation": "horizontal",
         "modules": [
             "custom/browser",
             "custom/filemanager",
-        ]
+         ]
     },
+
     // Network
     "network": {
         "format": "{ifname}",
@@ -331,19 +365,13 @@
         "tooltip-format-disconnected": "Disconnected",
         "max-length": 50,
         "on-click": "~/dotfiles/.settings/networkmanager.sh",
-        "format-icons": [
+        "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-            "󰤯",
-            "󰤟",
-            "󰤢",
-            "󰤥",
-            "󰤨"
-        ]
     },
     "network#speed": {
         "format": " {bandwidthTotalBits}",
-        "tooltip-format": " {bandwidthUpBits}\n {bandwidthDownBits}",
         "interval": 5
     },
+
     // Battery
     "battery": {
         "states": {
@@ -361,19 +389,7 @@
         //    "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
         //    "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
         //}
-        "format-icons": [
+        "format-icons": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
-            "󱃍",
-            "󰁺",
-            "󰁻",
-            "󰁼",
-            "󰁽",
-            "󰁾",
-            "󰁿",
-            "󰂀",
-            "󰂁",
-            "󰂂",
-            "󰁹"
-        ]
     },
     "battery#charging": {
         "states": {
@@ -388,20 +404,9 @@
         //    "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
         //    "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
         //}
-        "format-icons": [
+        "format-icons": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"]
-            "󰢟",
-            "󰢜",
-            "󰂆",
-            "󰂇",
-            "󰂈",
-            "󰢝",
-            "󰂉",
-            "󰢞",
-            "󰂊",
-            "󰂋",
-            "󰂅"
-        ]
     },
+
     // Pulseaudio
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
@@ -418,14 +423,11 @@
             "phone": "",
             "portable": "",
             "car": "",
-            "default": [
+            "default": ["", "", ""]
-                "",
-                "",
-                ""
-            ]
         },
         "on-click": "pavucontrol"
     },
+
     // Bluetooth
     "bluetooth": {
         "format": " {status}",
@@ -435,43 +437,22 @@
         "on-click": "blueman-manager",
         "format-no-controller": ""
     },
+
     // Other
     "user": {
         "format": "{user}",
         "interval": 60,
         "icon": false,
     },
+
     // Idle Inhibator
     "idle_inhibitor": {
         "format": "{icon}",
         "tooltip": true,
-        "format-icons": {
+        "format-icons":{
             "activated": "",
             "deactivated": ""
         },
         "on-click-right": "hyprlock"
-    },
-    "custom/events": {
-        "format": "{}",
-        "tooltip": true,
-        "interval": 300,
-        "format-icons": {
-            "default": ""
-        },
-        "exec": "python3 ~/dotfiles/scripts/waybar-khal.py",
-        "return-type": "json",
-        "on-click-right": "vdirsyncer sync"
-    },
-    "group/time": {
-        "orientation": "inherit",
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },
-        "modules": [
-            "clock",
-            "custom/events"
-        ]
     }
 }

waybar/themes/meow-blur/style.css

@@ -364,17 +364,6 @@ window#waybar.empty #window {
     /* border:3px solid @bordercolor; */
 }
 
-#custom-events {
-    background-color: @backgroundlight;
-    font-size: 14px;
-    color: @textcolor1;
-    border-radius: 10px;
-    padding: 0px 8px 0px 8px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
-    /* border:3px solid @bordercolor; */
-}
-
 /* -----------------------------------------------------
  * Pulseaudio
  * ----------------------------------------------------- */

waybar/themes/ml4w-blur-bottom/black/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Bottom Black"

waybar/themes/ml4w-blur-bottom/black/style.css

@@ -0,0 +1,24 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #000000;
+@define-color backgrounddark #000000;
+@define-color workspacesbackground1 #000000;
+@define-color workspacesbackground2 #222222;
+@define-color bordercolor #000000;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #000000;
+@define-color iconcolor #000000;
+
+@import '../../ml4w-blur/style.css';
+
+window#waybar {
+    background-color: rgba(255,255,255,0.1);
+}
+
+#custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w-blur-bottom/colored/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Bottom Colored"

waybar/themes/ml4w-blur-bottom/colored/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * 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;
+
+@import '../../ml4w-blur/style.css';

waybar/themes/ml4w-blur-bottom/config

@@ -0,0 +1,56 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // General Settings
+    "position": "bottom",
+    "margin-top": 0,
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,    
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenu",
+        "group/links",
+        "group/settings",
+        //"wlr/taskbar",
+        "group/quicklinks",
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Center
+    "modules-center": [
+        "hyprland/workspaces"
+    ],
+
+    // Modules Right    
+    "modules-right": [
+        "custom/updates",
+        "pulseaudio",
+        "bluetooth",
+        "battery", 
+        "network",
+        "group/hardware",
+        "custom/cliphist",
+        "custom/hypridle",
+        "custom/hyprshade",
+        "tray",
+        "custom/exit",
+        "custom/ml4w-welcome",
+        "clock"
+    ]
+}

waybar/themes/ml4w-blur-bottom/dark/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Bottom Dark"

waybar/themes/ml4w-blur-bottom/dark/style.css

@@ -0,0 +1,20 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor @color8;
+
+@import '../../ml4w-blur/style.css';
+
+window#waybar {
+    background-color: rgba(255,255,255,0.1);
+}

waybar/themes/ml4w-blur-bottom/light/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Bottom Light"

waybar/themes/ml4w-blur-bottom/light/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark @color11;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 @color11;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 @color11;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../../ml4w-blur/style.css';

waybar/themes/ml4w-blur-bottom/mixed/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Bottom Mixed"

waybar/themes/ml4w-blur-bottom/mixed/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../../ml4w-blur/style.css';

waybar/themes/ml4w-blur-bottom/white/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Bottom White"

waybar/themes/ml4w-blur-bottom/white/style.css

@@ -0,0 +1,20 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 #CCCCCC;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #000000;
+@define-color textcolor2 #000000;
+@define-color textcolor3 #000000;
+@define-color iconcolor #FFFFFF;
+
+@import '../../ml4w-blur/style.css';
+
+window#waybar {
+    background-color: rgba(255,255,255,0.1);
+}

waybar/themes/ml4w-blur/black/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Black"

waybar/themes/ml4w-blur/black/style.css

@@ -0,0 +1,24 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #000000;
+@define-color backgrounddark #000000;
+@define-color workspacesbackground1 #000000;
+@define-color workspacesbackground2 #222222;
+@define-color bordercolor #000000;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #000000;
+@define-color iconcolor #000000;
+
+@import '../style.css';
+
+window#waybar {
+    background-color: rgba(255,255,255,0.1);
+}
+
+#custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w-blur/colored/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Colored"

waybar/themes/ml4w-blur/colored/style.css

@@ -8,9 +8,9 @@
 @define-color workspacesbackground1 @color5;
 @define-color workspacesbackground2 @color11;
 @define-color bordercolor @color11;
-@define-color textcolor1 @foreground;
+@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 @foreground;
+@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 @foreground;
+@define-color textcolor3 #FFFFFF;
-@define-color iconcolor @foreground;
+@define-color iconcolor #FFFFFF;
 
 @import '../style.css';

waybar/themes/ml4w-blur/config

@@ -0,0 +1,56 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // General Settings
+    "layer": "top",
+    "margin-top": 0,
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,    
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenu",
+        "group/links",
+        "group/settings",
+        //"wlr/taskbar",
+        "group/quicklinks",
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Center
+    "modules-center": [
+        "hyprland/workspaces"
+    ],
+
+    // Modules Right    
+    "modules-right": [
+        "custom/updates",
+        "pulseaudio",
+        "bluetooth",
+        "battery", 
+        "network",
+        "group/hardware",
+        "custom/cliphist",
+        "custom/hypridle",
+        "custom/hyprshade",
+        "tray",
+        "custom/exit",
+        "custom/ml4w-welcome",
+        "clock"
+    ]
+}

waybar/themes/ml4w-blur/dark/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Dark"

waybar/themes/ml4w-blur/dark/style.css

@@ -0,0 +1,20 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor @color8;
+
+@import '../style.css';
+
+window#waybar {
+    background-color: rgba(255,255,255,0.1);
+}

waybar/themes/ml4w-blur/light/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Light"

waybar/themes/ml4w-blur/light/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark @color11;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 @color11;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 @color11;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../style.css';

waybar/themes/ml4w-blur/mixed/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Mixed"

waybar/themes/ml4w-blur/style.css

@@ -1,33 +1,32 @@
 /*
- * __        __          _                  ____  _         _
+ * __        __          _                  ____  _         _       
- * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___
+ * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
- *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \
+ *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
- *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/
+ *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
- *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___|
+ *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
- *                 |___/                              |___/
+ *                 |___/                              |___/         
- *
+ *  
- * by Stephan Raabe (2023)
+ * by Stephan Raabe (2023) 
- * -----------------------------------------------------
+ * ----------------------------------------------------- 
 */
 
 /* -----------------------------------------------------
- * Import Pywal colors
+ * Import Pywal colors 
  * ----------------------------------------------------- */
 /* @import 'style-light.css'; */
 
 /* -----------------------------------------------------
- * General
+ * General 
  * ----------------------------------------------------- */
 
 * {
-    font-family: "Fira Code Nerd Font", "Noto Sans CJK SC";
+    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    font-weight: 700;
     border: none;
     border-radius: 0px;
 }
 
 window#waybar {
-    background-color: rgba(0,0,0,0.1);
+    background-color: rgba(0,0,0,0.2);
     border-bottom: 0px solid #ffffff;
     /* color: #FFFFFF; */
     transition-property: background-color;
@@ -35,58 +34,49 @@ window#waybar {
 }
 
 /* -----------------------------------------------------
- * Workspaces
+ * Workspaces 
  * ----------------------------------------------------- */
 
 #workspaces {
     background: @workspacesbackground1;
-    margin: 8px 10px 8px 0px;
+    margin: 5px 1px 6px 1px;
     padding: 0px 1px;
-    border-radius: 10px;
+    border-radius: 15px;
     border: 0px;
     font-weight: bold;
     font-style: normal;
     opacity: 0.8;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor1;
 }
 
 #workspaces button {
     padding: 0px 5px;
-    margin: 3px;
+    margin: 4px 3px;
     border-radius: 15px;
     border: 0px;
     color: @textcolor1;
-    background: @workspacesbackground2;
+    background-color: @workspacesbackground2;
     transition: all 0.3s ease-in-out;
     opacity: 0.4;
 }
 
-#workspaces button.empty {
-    border-radius: 15px;
-    border: 0px;
-    color: @textcolor1;
-    background: transparent;
-    transition: all 0.3s ease-in-out;
-    opacity: 0.5;
-}
-
-#workspaces button:hover {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 10px;
-    opacity:0.7;
-}
-
 #workspaces button.active {
     color: @textcolor1;
     background: @workspacesbackground2;
     border-radius: 15px;
-    min-width: 30px;
+    min-width: 40px;
     transition: all 0.3s ease-in-out;
     opacity:1.0;
 }
 
+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    opacity:0.7;
+}
+
 /* -----------------------------------------------------
  * Tooltips
  * ----------------------------------------------------- */
@@ -108,13 +98,12 @@ tooltip label {
  * ----------------------------------------------------- */
 
 #window {
-    font-family: "Fira Code Semibold";
     background: @backgroundlight;
-    margin: 8px 10px 8px 0px;
+    margin: 8px 15px 8px 0px;
-    padding: 0px 8px 0px 8px;
+    padding: 2px 10px 0px 10px;
-    border-radius: 10px;
+    border-radius: 12px;
     color:@textcolor2;
-    font-size: 14px;
+    font-size:16px;
     font-weight:normal;
     opacity:0.8;
 }
@@ -129,9 +118,9 @@ window#waybar.empty #window {
 
 #taskbar {
     background: @backgroundlight;
-    margin: 8px 10px 8px 0px;
+    margin: 6px 15px 6px 0px;
     padding:0px;
-    border-radius: 10px;
+    border-radius: 15px;
     font-weight: normal;
     font-style: normal;
     opacity:0.8;
@@ -140,36 +129,42 @@ window#waybar.empty #window {
 
 #taskbar button {
     margin:0;
-    border-radius: 10px;
+    border-radius: 15px;
     padding: 0px 5px 0px 5px;
-    opacity: 0.7;
 }
 
-#taskbar button.active {
+/* -----------------------------------------------------
-    background: @workspacesbackground2;
+ * Modules
-    border-radius: 10px;
+ * ----------------------------------------------------- */
-    opacity:1.0;
+
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
 }
 
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
 
 /* -----------------------------------------------------
  * Custom Quicklinks
  * ----------------------------------------------------- */
 
-#custom-brave,
+#custom-brave, 
-#custom-browser,
+#custom-browser, 
-#custom-keybindings,
+#custom-keybindings, 
-#custom-outlook,
+#custom-outlook, 
-#custom-filemanager,
+#custom-filemanager, 
-#custom-teams,
+#custom-teams, 
-#custom-chatgpt,
+#custom-chatgpt, 
-#custom-calculator,
+#custom-calculator, 
-#custom-windowsvm,
+#custom-windowsvm, 
-#custom-cliphist,
+#custom-cliphist, 
-#custom-wallpaper,
+#custom-wallpaper, 
-#custom-settings,
+#custom-settings, 
-#custom-wallpaper,
+#custom-wallpaper, 
 #custom-system,
+#custom-hyprshade,
+#custom-hypridle,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -178,6 +173,22 @@ window#waybar.empty #window {
     color: @iconcolor;
 }
 
+#custom-hyprshade {
+    margin-right:12px;
+}
+
+#custom-hypridle {
+    margin-right:18px;
+}
+
+#custom-hypridle.active {
+    color: @iconcolor;
+}
+
+#custom-hypridle.notactive {
+    color: #dc2f2f;
+}
+
 #custom-system {
     margin-right:15px;
 }
@@ -191,15 +202,23 @@ window#waybar.empty #window {
 }
 
 #custom-ml4w-welcome {
-    margin-right: 15px;
+    margin-right: 12px;
     background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
 }
 
+#custom-ml4w-hyprland-settings {
+    margin-right: 12px;
+    background-image: url("../assets/hyprland-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 16px;
+}
+
 #custom-chatgpt {
-    margin-right: 15px;
+    margin-right: 12px;
     background-image: url("../assets/ai-icon-20.png");
     background-repeat: no-repeat;
     background-position: center;
@@ -211,15 +230,15 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #idle_inhibitor {
-    margin-right: 15px;
+    margin-right: 17px;
-    font-size: 16px;
+    font-size: 20px;
     font-weight: bold;
     opacity: 0.8;
     color: @iconcolor;
 }
 
 #idle_inhibitor.activated {
-    margin-right: 10px;
+    margin-right: 15px;
     font-size: 20px;
     font-weight: bold;
     opacity: 0.8;
@@ -230,20 +249,15 @@ window#waybar.empty #window {
  * Custom Modules
  * ----------------------------------------------------- */
 
-#custom-appmenu, #custom-appmenuicon {
+#custom-appmenu {
     background-color: @backgrounddark;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor1;
-    border-radius: 10px;
+    border-radius: 15px;
     padding: 0px 10px 0px 10px;
-    margin: 8px 10px 8px 10px;
+    margin: 8px 14px 8px 14px;
     opacity:0.8;
-    /* border:3px solid @bordercolor; */
+    border:3px solid @bordercolor;
-}
-
-#custom-appmenuicon {
-    padding-right: 12px;
-    padding-left: 8px;
 }
 
 /* -----------------------------------------------------
@@ -251,13 +265,10 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #custom-exit {
-    margin: 8px 10px 8px 0px;
+    margin: 0px 20px 0px 0px;
-    padding:0px 14px 0px 10px;
+    padding:0px;
-    font-size: 14px;
+    font-size:20px;
     color: @iconcolor;
-    background: @backgrounddark;
-    border-radius: 10px;
-    opacity: 0.8;
 }
 
 /* -----------------------------------------------------
@@ -266,11 +277,11 @@ window#waybar.empty #window {
 
 #custom-updates {
     background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
     padding: 2px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
+    margin: 8px 15px 8px 0px;
     opacity:0.8;
 }
 
@@ -294,9 +305,9 @@ window#waybar.empty #window {
 
 #custom-youtube {
     background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
     padding: 2px 10px 0px 10px;
     margin: 8px 15px 8px 0px;
     opacity:0.8;
@@ -306,43 +317,11 @@ window#waybar.empty #window {
  * Hardware Group
  * ----------------------------------------------------- */
 
- /* #disk,#memory,#cpu,#language {
+ #disk,#memory,#cpu,#language {
-    background-color: @backgroundlight;
+    margin:0px;
-    font-size: 14px;
+    padding:0px;
-    color: @textcolor2;
+    font-size:16px;
-    border-radius: 10px;
+    color:@iconcolor;
-    padding: 2px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
-} */
-
-/* #cpu {
-    color: @color2;
-} */
-
-#cpu.warning,#memory.warning{
-    color: #ff9800;
-}
-
-#cpu.critical,#memory.warning{
-    color: #f44336;
-}
-
-#hardware,#hardware2 {
-    background-color: @backgroundlight;
-    font-size: 14px;
-    color: @textcolor2;
-    border-radius: 10px;
-    padding: 0px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
-}
-
-#custom-div {
-    font-weight: 900;
-    padding: 0px 2px;
-    color: @color2;
-    font-size: 18px;
 }
 
 #language {
@@ -354,25 +333,14 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #clock {
-    background-color: @backgroundlight;
+    background-color: @backgrounddark;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor1;
-    border-radius: 10px;
+    border-radius: 15px;
-    padding: 0px 8px 0px 8px;
+    padding: 1px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
+    margin: 8px 15px 8px 0px;
     opacity:0.8;
-    /* border:3px solid @bordercolor; */
+    border:3px solid @bordercolor;   
-}
-
-#custom-events {
-    background-color: @backgroundlight;
-    font-size: 14px;
-    color: @textcolor1;
-    border-radius: 10px;
-    padding: 0px 8px 0px 8px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
-    /* border:3px solid @bordercolor; */
 }
 
 /* -----------------------------------------------------
@@ -380,51 +348,41 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #pulseaudio {
-    /* background-color: @backgroundlight; */
+    background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor2;
-    /* border-radius: 10px; */
+    border-radius: 15px;
-    /* padding: 0px 10px 0px 10px; */
+    padding: 2px 10px 0px 10px;
-    /* margin: 8px 10px 8px 0px; */
+    margin: 8px 15px 8px 0px;
-    /* opacity:0.8; */
+    opacity:0.8;
 }
 
 #pulseaudio.muted {
-    /* background-color: @backgrounddark; */
+    background-color: @backgrounddark;
     color: @textcolor1;
 }
 
-#systems {
-    background-color: @backgroundlight;
-    font-size: 14px;
-    color: @textcolor2;
-    border-radius: 10px;
-    padding: 0px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
-}
-
 /* -----------------------------------------------------
  * Network
  * ----------------------------------------------------- */
 
 #network {
-    /* background-color: @backgroundlight; */
+    background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor2;
-    /* border-radius: 10px; */
+    border-radius: 15px;
-    /* padding: 2px 2px 0px 10px; */
+    padding: 2px 10px 0px 10px;
-    /* margin: 8px 10px 8px 0px; */
+    margin: 8px 15px 8px 0px;
-    /* opacity:0.8; */
+    opacity:0.8;
 }
 
 #network.ethernet {
-    /* background-color: @backgroundlight; */
+    background-color: @backgroundlight;
     color: @textcolor2;
 }
 
 #network.wifi {
-    /* background-color: @backgroundlight; */
+    background-color: @backgroundlight;
     color: @textcolor2;
 }
 
@@ -434,12 +392,12 @@ window#waybar.empty #window {
 
  #bluetooth, #bluetooth.on, #bluetooth.connected {
     background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
     padding: 2px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
+    margin: 8px 15px 8px 0px;
-    /* opacity:0.8; */
+    opacity:0.8;
 }
 
 #bluetooth.off {
@@ -454,11 +412,11 @@ window#waybar.empty #window {
 
 #battery {
     background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
     color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
-    padding: 0px 10px 0px 10px;
+    padding: 2px 15px 0px 10px;
-    margin: 8px 10px 8px 0px;
+    margin: 8px 15px 8px 0px;
     opacity:0.8;
 }
 
@@ -489,13 +447,8 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #tray {
-    padding: 0px 10px 0px 10px;
+    padding: 0px 15px 0px 0px;
     color: @textcolor3;
-    background-color: @backgroundlight;
-    font-size: 14px;
-    border-radius: 10px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
 }
 
 #tray > .passive {

waybar/themes/ml4w-blur/white/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur White"

waybar/themes/ml4w-blur/white/style.css

@@ -0,0 +1,20 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 #CCCCCC;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #000000;
+@define-color textcolor2 #000000;
+@define-color textcolor3 #000000;
+@define-color iconcolor #FFFFFF;
+
+@import '../style.css';
+
+window#waybar {
+    background-color: rgba(255,255,255,0.1);
+}

waybar/themes/ml4w-bottom/black/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Black Bottom"

waybar/themes/ml4w-bottom/black/style.css

@@ -0,0 +1,20 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #000000;
+@define-color backgrounddark #000000;
+@define-color workspacesbackground1 #000000;
+@define-color workspacesbackground2 #222222;
+@define-color bordercolor #000000;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #000000;
+@define-color iconcolor #000000;
+
+@import '../../ml4w/style.css';
+
+#custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w-bottom/colored/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Colored Bottom"

waybar/themes/ml4w-bottom/colored/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * 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;
+
+@import '../../ml4w/style.css';

waybar/themes/ml4w-bottom/config

@@ -0,0 +1,56 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // General Settings
+    "position": "bottom",
+    "margin-top": 0,
+    "margin-bottom": 14,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,    
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenu",
+        "group/links",
+        "group/settings",
+        //"wlr/taskbar",
+        "group/quicklinks",
+        "hyprland/window"
+    ],
+
+    // Modules Center
+    "modules-center": [
+        "hyprland/workspaces",
+        "custom/empty"
+    ],
+
+    // Modules Right    
+    "modules-right": [
+        "custom/updates",
+        "pulseaudio",
+        "bluetooth",
+        "battery", 
+        "network",
+        "group/hardware",
+        "custom/cliphist",
+        "custom/hypridle",
+        "custom/hyprshade",
+        "tray",
+        "custom/exit",
+        "custom/ml4w-welcome",
+        "clock"
+    ]
+}

waybar/themes/ml4w-bottom/dark/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Dark Bottom"

waybar/themes/ml4w-bottom/dark/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor @color8;
+
+@import '../../ml4w/style.css';

waybar/themes/ml4w-bottom/light/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Light Bottom"

waybar/themes/ml4w-bottom/light/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark @color11;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 @color11;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 @color11;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../../ml4w/style.css';

waybar/themes/ml4w-bottom/mixed/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Mixed Bottom"

waybar/themes/ml4w-bottom/mixed/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../../ml4w/style.css';

waybar/themes/ml4w-bottom/white/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W White Bottom"

waybar/themes/ml4w-bottom/white/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 #CCCCCC;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #000000;
+@define-color textcolor2 #000000;
+@define-color textcolor3 #000000;
+@define-color iconcolor #FFFFFF;
+
+@import '../../ml4w/style.css';

waybar/themes/ml4w-minimal/README.md

@@ -0,0 +1,12 @@
+# Waybar Theme Starter
+
+Create your own Waybar Theme based on this starter theme.
+
+- Copy the folder "~/dotfiles/waybar/themes/starter" and define a custom folder name
+- Open config.sh and enter the name of your new theme
+- Select the theme with the Waybar Themeswitcher with <kbd>SUPER</kbd>+<kbd>CTRL</kbd>+<kbd>T</kbd>
+- Start your customization
+
+You can enable, disable and reorder waybar modules in the config file. 
+
+Your custom theme will not be overwritten with an update of the dotfiles.

waybar/themes/ml4w-minimal/config

@@ -0,0 +1,54 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // General Settings
+    "layer": "top",
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,    
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenuicon",
+        "hyprland/workspaces",
+        "group/links",
+        "group/settings",
+        "group/quicklinks"
+    ],
+
+    // Modules Center
+    "modules-center": [
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Right    
+    "modules-right": [
+        "custom/updates",
+        "pulseaudio",
+        "bluetooth",
+        "battery", 
+        "network",
+        "group/hardware",
+        "custom/cliphist",
+        "custom/hypridle",
+        "custom/hyprshade",
+        "custom/exit",
+        "clock",
+        "tray",
+        "custom/ml4w-welcome"
+    ]
+}

waybar/themes/ml4w-minimal/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Minimal"

waybar/themes/ml4w-minimal/style.css

@@ -0,0 +1,411 @@
+/*
+ * __        __          _                  ____  _         _       
+ * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
+ *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
+ *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
+ *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
+ *                 |___/                              |___/         
+ *  
+ * by Stephan Raabe (2023) 
+ * ----------------------------------------------------- 
+*/
+
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+/* @import 'style-light.css'; */
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 #CCCCCC;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #000000;
+@define-color textcolor2 #000000;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+/* -----------------------------------------------------
+ * General 
+ * ----------------------------------------------------- */
+
+* {
+    font-family: "Fira Sans semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    border: none;
+    border-radius: 0px;
+}
+
+window#waybar {
+    background-color: rgba(0,0,0,0.4);
+    border-bottom: 0px solid #ffffff;
+    /* color: #FFFFFF; */
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+/* -----------------------------------------------------
+ * Workspaces 
+ * ----------------------------------------------------- */
+
+ #workspaces {
+    margin: 3px 7px 3px 3px;
+    border: 0px;
+    font-size: 14px;
+    color: @textcolor1;
+}
+
+#workspaces button {
+    border: 0px;
+    margin:4px 5px 4px 0px;
+    padding:0px 4px 0px 4px;
+    color: @textcolor3;
+    transition: all 0.5s ease-in-out;
+}
+
+#workspaces button.active {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+}
+
+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+}
+
+/* -----------------------------------------------------
+ * Tooltips
+ * ----------------------------------------------------- */
+
+tooltip {
+    border-radius: 10px;
+    background-color: @backgroundlight;
+    opacity:0.8;
+    padding:20px;
+    margin:0px;
+}
+
+tooltip label {
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Window
+ * ----------------------------------------------------- */
+
+#window {
+    margin: 0px 15px 0px 0px;
+    border-radius: 12px;
+    color:@textcolor;
+    font-size:14px;
+    font-weight:normal;
+}
+
+window#waybar.empty #window {
+    background-color:transparent;
+}
+
+/* -----------------------------------------------------
+ * Modules
+ * ----------------------------------------------------- */
+
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+/* -----------------------------------------------------
+ * Custom Quicklinks
+ * ----------------------------------------------------- */
+
+#custom-brave, 
+#custom-browser, 
+#custom-keybindings, 
+#custom-outlook, 
+#custom-filemanager, 
+#custom-teams, 
+#custom-chatgpt, 
+#custom-calculator, 
+#custom-windowsvm, 
+#custom-cliphist, 
+#custom-wallpaper, 
+#custom-settings, 
+#custom-wallpaper, 
+#custom-system,
+#custom-hyprshade,
+#custom-hypridle,
+#custom-waybarthemes {
+    margin-right: 23px;
+    font-size: 14px;
+    font-weight: bold;
+    color: @iconcolor;
+}
+
+#custom-hyprshade {
+    margin-right:12px;
+}
+
+#custom-hypridle {
+    margin-right:16px;
+}
+
+#custom-hypridle.active {
+    color: @iconcolor;
+}
+
+#custom-hypridle.notactive {
+    color: #dc2f2f;
+}
+
+#custom-settings {
+    margin-right: 15px;
+}
+
+#custom-browser {
+    margin-right: 16px;
+}
+
+#custom-wallpaper {
+    margin-right: 14px;
+}
+
+#custom-chatgpt {
+    margin-right: 10px;
+    background-image: url("../assets/ai-icon-20.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 23px;
+}
+
+#custom-waybarthemes,#custom-system {
+    margin-right:15px;
+}
+
+
+#custom-ml4w-welcome {
+    margin-right: 15px;
+    background-image: url("../assets/ml4w-icon-20.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+#custom-ml4w-hyprland-settings {
+    margin-right: 12px;
+    background-image: url("../assets/hyprland-icon-20.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 16px;
+}
+
+
+/* -----------------------------------------------------
+ * Idle Inhibator
+ * ----------------------------------------------------- */
+
+ #idle_inhibitor {
+    margin-right: 15px;
+    font-size: 16px;
+    font-weight: bold;
+    color: @iconcolor;
+}
+
+#idle_inhibitor.activated {
+    margin-right: 15px;
+    font-size: 14px;
+    font-weight: bold;
+    color: #dc2f2f;
+}
+
+/* -----------------------------------------------------
+ * Custom Modules
+ * ----------------------------------------------------- */
+
+#custom-appmenuicon {
+    font-size: 20px;
+    color: @textcolor;
+    margin: 0px 15px 0px 10px;
+}
+
+/* -----------------------------------------------------
+ * Custom Exit
+ * ----------------------------------------------------- */
+
+#custom-exit {
+    margin: 0px 20px 0px 0px;
+    padding:0px;
+    font-size:16px;
+    color: @iconcolor;
+}
+
+/* -----------------------------------------------------
+ * Custom Updates
+ * ----------------------------------------------------- */
+
+#custom-updates {
+    font-size: 14px;
+    color: @textcolor;
+    border-radius: 15px;
+    margin: 0px 15px 0px 0px;
+}
+
+#custom-updates.green {
+}
+
+#custom-updates.yellow {
+    color: #ff9a3c;
+}
+
+#custom-updates.red {
+    color: #dc2f2f;
+}
+
+/* -----------------------------------------------------
+ * Custom Youtube
+ * ----------------------------------------------------- */
+
+#custom-youtube {
+    background-color: @backgroundlight;
+    font-size: 14px;
+    color: @textcolor2;
+    border-radius: 15px;
+    margin: 0px 15px 0px 0px;
+}
+
+/* -----------------------------------------------------
+ * Hardware Group
+ * ----------------------------------------------------- */
+
+ #disk,#memory,#cpu,#language {
+    margin:0px;
+    padding:0px;
+    font-size:14px;
+    color:@iconcolor;
+}
+
+#language {
+    margin-right:10px;
+}
+
+/* -----------------------------------------------------
+ * Clock
+ * ----------------------------------------------------- */
+
+#clock {
+    font-size: 15px;
+    color: @textcolor;
+    margin: 0px 15px 0px 0px;
+}
+
+/* -----------------------------------------------------
+ * Pulseaudio
+ * ----------------------------------------------------- */
+
+#pulseaudio {
+    font-size: 14px;
+    color: @textcolor;
+    border-radius: 15px;
+    margin: 0px 15px 0px 0px;
+}
+
+#pulseaudio.muted {
+    color: @textcolor;
+}
+
+/* -----------------------------------------------------
+ * Network
+ * ----------------------------------------------------- */
+
+#network {
+    font-size: 14px;
+    color: @textcolor;
+    border-radius: 15px;
+    margin: 0px 15px 0px 0px;
+}
+
+#network.ethernet {
+    color: @textcolor;
+}
+
+#network.wifi {
+    color: @textcolor;
+}
+
+/* -----------------------------------------------------
+ * Bluetooth
+ * ----------------------------------------------------- */
+
+ #bluetooth, #bluetooth.on, #bluetooth.connected {
+    font-size: 14px;
+    color: @textcolor;
+    border-radius: 15px;
+    margin: 10px 15px 10px 0px;
+}
+
+#bluetooth.off {
+    background-color: transparent;
+    padding: 0px;
+    margin: 0px;
+}
+
+/* -----------------------------------------------------
+ * Battery
+ * ----------------------------------------------------- */
+
+#battery {
+    font-size: 14px;
+    color: @textcolor;
+    border-radius: 15px;
+    margin: 10px 15px 10px 0px;
+}
+
+#battery.charging, #battery.plugged {
+    color: @textcolor;
+}
+
+@keyframes blink {
+    to {
+        background-color: @backgroundlight;
+        color: @textcolor2;
+    }
+}
+
+#battery.critical:not(.charging) {
+    color: #f53c3c;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+/* -----------------------------------------------------
+ * Tray
+ * ----------------------------------------------------- */
+
+#tray {
+    margin:0px 10px 0px 0px;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+/* -----------------------------------------------------
+ * Other
+ * ----------------------------------------------------- */
+
+label:focus {
+    background-color: #000000;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}

waybar/themes/ml4w/black/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Black"

waybar/themes/ml4w/black/style.css

@@ -0,0 +1,20 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+ @import '../../../../../.cache/wal/colors-waybar.css';
+
+ @define-color backgroundlight #000000;
+ @define-color backgrounddark #000000;
+ @define-color workspacesbackground1 #000000;
+ @define-color workspacesbackground2 #222222;
+ @define-color bordercolor #000000;
+ @define-color textcolor1 #FFFFFF;
+ @define-color textcolor2 #FFFFFF;
+ @define-color textcolor3 #000000;
+ @define-color iconcolor #000000;
+ 
+ @import '../style.css';
+ 
+ #custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w/colored/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Colored"

waybar/themes/ml4w/colored/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * 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;
+
+@import '../style.css';

waybar/themes/ml4w/config

@@ -0,0 +1,56 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // General Settings
+    "layer": "top",
+    "margin-top": 14,
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,    
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenu",
+        "group/links",
+        "group/settings",
+        //"wlr/taskbar",
+        "group/quicklinks",
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Center
+    "modules-center": [
+        "hyprland/workspaces"
+    ],
+
+    // Modules Right    
+    "modules-right": [
+        "custom/updates",
+        "pulseaudio",
+        "bluetooth",
+        "battery", 
+        "network",
+        "group/hardware",
+        "custom/cliphist",
+        "custom/hypridle",
+        "custom/hyprshade",
+        "tray",
+        "custom/exit",
+        "custom/ml4w-welcome",
+        "clock"
+    ]
+}

waybar/themes/ml4w/dark/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Dark"

waybar/themes/ml4w/dark/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor @color8;
+
+@import '../style.css';

waybar/themes/ml4w/light/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Light"

waybar/themes/ml4w/light/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight #FFFFFF;
+@define-color backgrounddark @color11;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 @color11;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 @color11;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../style.css';

waybar/themes/ml4w/mixed/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Mixed"

waybar/themes/ml4w/mixed/style.css

@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../style.css';

waybar/themes/ml4w/style.css

@@ -0,0 +1,462 @@
+/*
+ * __        __          _                  ____  _         _       
+ * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
+ *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
+ *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
+ *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
+ *                 |___/                              |___/         
+ *  
+ * by Stephan Raabe (2023) 
+ * ----------------------------------------------------- 
+*/
+
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+/* @import 'style-light.css'; */
+
+/* -----------------------------------------------------
+ * General 
+ * ----------------------------------------------------- */
+
+* {
+    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    border: none;
+    border-radius: 0px;
+}
+
+window#waybar {
+    background-color: rgba(0,0,0,0.8);
+    border-bottom: 0px solid #ffffff;
+    /* color: #FFFFFF; */
+    background: transparent;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+/* -----------------------------------------------------
+ * Workspaces 
+ * ----------------------------------------------------- */
+
+#workspaces {
+    background: @workspacesbackground1;
+    margin: 2px 1px 3px 1px;
+    padding: 0px 1px;
+    border-radius: 15px;
+    border: 0px;
+    font-weight: bold;
+    font-style: normal;
+    opacity: 0.8;
+    font-size: 16px;
+    color: @textcolor1;
+}
+
+#workspaces button {
+    padding: 0px 5px;
+    margin: 4px 3px;
+    border-radius: 15px;
+    border: 0px;
+    color: @textcolor1;
+    background-color: @workspacesbackground2;
+    transition: all 0.3s ease-in-out;
+    opacity: 0.4;
+}
+
+#workspaces button.active {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    min-width: 40px;
+    transition: all 0.3s ease-in-out;
+    opacity:1.0;
+}
+
+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    opacity:0.7;
+}
+
+/* -----------------------------------------------------
+ * Tooltips
+ * ----------------------------------------------------- */
+
+tooltip {
+    border-radius: 10px;
+    background-color: @backgroundlight;
+    opacity:0.8;
+    padding:20px;
+    margin:0px;
+}
+
+tooltip label {
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Window
+ * ----------------------------------------------------- */
+
+#window {
+    background: @backgroundlight;
+    margin: 5px 15px 5px 0px;
+    padding: 2px 10px 0px 10px;
+    border-radius: 12px;
+    color:@textcolor2;
+    font-size:16px;
+    font-weight:normal;
+    opacity:0.8;
+}
+
+window#waybar.empty #window {
+    background-color:transparent;
+}
+
+/* -----------------------------------------------------
+ * Taskbar
+ * ----------------------------------------------------- */
+
+#taskbar {
+    background: @backgroundlight;
+    margin: 3px 15px 3px 0px;
+    padding:0px;
+    border-radius: 15px;
+    font-weight: normal;
+    font-style: normal;
+    opacity:0.8;
+    border: 3px solid @backgroundlight;
+}
+
+#taskbar button {
+    margin:0;
+    border-radius: 15px;
+    padding: 0px 5px 0px 5px;
+}
+
+/* -----------------------------------------------------
+ * Modules
+ * ----------------------------------------------------- */
+
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+/* -----------------------------------------------------
+ * Custom Quicklinks
+ * ----------------------------------------------------- */
+
+#custom-brave, 
+#custom-browser, 
+#custom-keybindings, 
+#custom-outlook, 
+#custom-filemanager, 
+#custom-teams, 
+#custom-chatgpt, 
+#custom-calculator, 
+#custom-windowsvm, 
+#custom-cliphist, 
+#custom-wallpaper, 
+#custom-settings, 
+#custom-wallpaper, 
+#custom-system,
+#custom-hyprshade,
+#custom-hypridle,
+#custom-waybarthemes {
+    margin-right: 23px;
+    font-size: 20px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
+}
+
+#custom-hyprshade {
+    margin-right:12px;
+}
+
+#custom-hypridle {
+    margin-right:18px;
+}
+
+#custom-hypridle.active {
+    color: @iconcolor;
+}
+
+#custom-hypridle.notactive {
+    color: #dc2f2f;
+}
+
+#custom-system {
+    margin-right:15px;
+}
+
+#custom-wallpaper {
+    margin-right:25px;
+}
+
+#custom-waybarthemes, #custom-settings {
+    margin-right:20px;
+}
+
+#custom-chatgpt {
+    margin-right: 12px;
+    background-image: url("../assets/ai-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+#custom-ml4w-welcome {
+    margin-right: 12px;
+    background-image: url("../assets/ml4w-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+#custom-ml4w-hyprland-settings {
+    margin-right: 12px;
+    background-image: url("../assets/hyprland-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 16px;
+}
+
+/* -----------------------------------------------------
+ * Idle Inhibator
+ * ----------------------------------------------------- */
+
+#idle_inhibitor {
+    margin-right: 15px;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
+}
+
+#idle_inhibitor.activated {
+    margin-right: 15px;
+    font-size: 20px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: #dc2f2f;
+}
+
+/* -----------------------------------------------------
+ * Custom Modules
+ * ----------------------------------------------------- */
+
+#custom-appmenu, #custom-appmenuwlr {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 0px 10px 0px 10px;
+    margin: 3px 15px 3px 14px;
+    opacity:0.8;
+    border:3px solid @bordercolor;
+}
+
+/* -----------------------------------------------------
+ * Custom Exit
+ * ----------------------------------------------------- */
+
+#custom-exit {
+    margin: 0px 20px 0px 0px;
+    padding:0px;
+    font-size:20px;
+    color: @iconcolor;
+}
+
+/* -----------------------------------------------------
+ * Custom Updates
+ * ----------------------------------------------------- */
+
+#custom-updates {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 5px 15px 5px 0px;
+    opacity:0.8;
+}
+
+#custom-updates.green {
+    background-color: @backgroundlight;
+}
+
+#custom-updates.yellow {
+    background-color: #ff9a3c;
+    color: #FFFFFF;
+}
+
+#custom-updates.red {
+    background-color: #dc2f2f;
+    color: #FFFFFF;
+}
+
+/* -----------------------------------------------------
+ * Custom Youtube
+ * ----------------------------------------------------- */
+
+#custom-youtube {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 5px 15px 5px 0px;
+    opacity:0.8;
+}
+
+/* -----------------------------------------------------
+ * Hardware Group
+ * ----------------------------------------------------- */
+
+#disk,#memory,#cpu,#language {
+    margin:0px;
+    padding:0px;
+    font-size:16px;
+    color:@iconcolor;
+}
+
+#language {
+    margin-right:10px;
+}
+
+/* -----------------------------------------------------
+ * Clock
+ * ----------------------------------------------------- */
+
+#clock {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 1px 10px 0px 10px;
+    margin: 3px 15px 3px 0px;
+    opacity:0.8;
+    border:3px solid @bordercolor;   
+}
+
+/* -----------------------------------------------------
+ * Pulseaudio
+ * ----------------------------------------------------- */
+
+#pulseaudio {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 5px 15px 5px 0px;
+    opacity:0.8;
+}
+
+#pulseaudio.muted {
+    background-color: @backgrounddark;
+    color: @textcolor1;
+}
+
+/* -----------------------------------------------------
+ * Network
+ * ----------------------------------------------------- */
+
+#network {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 5px 15px 5px 0px;
+    opacity:0.8;
+}
+
+#network.ethernet {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+#network.wifi {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Bluetooth
+ * ----------------------------------------------------- */
+
+#bluetooth, #bluetooth.on, #bluetooth.connected {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 5px 15px 5px 0px;
+    opacity:0.8;
+}
+
+#bluetooth.off {
+    background-color: transparent;
+    padding: 0px;
+    margin: 0px;
+}
+
+/* -----------------------------------------------------
+ * Battery
+ * ----------------------------------------------------- */
+
+#battery {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 15px 0px 10px;
+    margin: 5px 15px 5px 0px;
+    opacity:0.8;
+}
+
+#battery.charging, #battery.plugged {
+    color: @textcolor2;
+    background-color: @backgroundlight;
+}
+
+@keyframes blink {
+    to {
+        background-color: @backgroundlight;
+        color: @textcolor2;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: @textcolor3;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+/* -----------------------------------------------------
+ * Tray
+ * ----------------------------------------------------- */
+
+#tray {
+    padding: 0px 15px 0px 0px;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+}
+
+

waybar/themes/ml4w/white/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W White"

waybar/themes/ml4w/white/style.css

@@ -0,0 +1,17 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+ @import '../../../../../.cache/wal/colors-waybar.css';
+
+ @define-color backgroundlight #FFFFFF;
+ @define-color backgrounddark #FFFFFF;
+ @define-color workspacesbackground1 #FFFFFF;
+ @define-color workspacesbackground2 #CCCCCC;
+ @define-color bordercolor #FFFFFF;
+ @define-color textcolor1 #000000;
+ @define-color textcolor2 #000000;
+ @define-color textcolor3 #000000;
+ @define-color iconcolor #FFFFFF;
+ 
+ @import '../style.css';
+ 

yazi/flavors/catppuccin-mocha.yazi/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 yazi-rs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

yazi/flavors/catppuccin-mocha.yazi/LICENSE-tmtheme

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Himanshu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

yazi/flavors/catppuccin-mocha.yazi/README.md

@@ -1,33 +0,0 @@
-<div align="center">
-  <img src="https://github.com/sxyazi/yazi/blob/main/assets/logo.png?raw=true" alt="Yazi logo" width="20%">
-</div>
-
-<h3 align="center">
-	Catppuccin Mocha Flavor for <a href="https://github.com/sxyazi/yazi">Yazi</a>
-</h3>
-
-## 👀 Preview
-
-<img src="preview.png" width="600" />
-
-## 🎨 Installation
-
-Download and copy this folder as:
-
-- `~/.config/yazi/flavors/catppuccin-mocha.yazi` on Linux/macOS
-- `%AppData%\yazi\config\flavors\catppuccin-mocha.yazi` on Windows
-
-## ⚙️ Usage
-
-Add these lines to your `theme.toml` configuration file to use it:
-
-```toml
-[flavor]
-use = "catppuccin-mocha"
-```
-
-## 📜 License
-
-The flavor is MIT-licensed, and the included tmTheme is also MIT-licensed.
-
-Check the [LICENSE](LICENSE) and [LICENSE-tmtheme](LICENSE-tmtheme) file for more details.

yazi/flavors/catppuccin-mocha.yazi/flavor.toml

@@ -1,162 +0,0 @@
-# vim:fileencoding=utf-8:foldmethod=marker
-
-# : Manager {{{
-
-[manager]
-cwd = { fg = "#94e2d5" }
-
-# Hovered
-hovered         = { reversed = true }
-preview_hovered = { underline = true }
-
-# Find
-find_keyword  = { fg = "#f9e2af", bold = true, italic = true, underline = true }
-find_position = { fg = "#f5c2e7", bg = "reset", bold = true, italic = true }
-
-# Marker
-marker_copied   = { fg = "#a6e3a1", bg = "#a6e3a1" }
-marker_cut      = { fg = "#f38ba8", bg = "#f38ba8" }
-marker_marked   = { fg = "#94e2d5", bg = "#94e2d5" }
-marker_selected = { fg = "#f9e2af", bg = "#f9e2af" }
-
-# Tab
-tab_active   = { reversed = true }
-tab_inactive = {}
-tab_width    = 1
-
-# Count
-count_copied   = { fg = "#1e1e2e", bg = "#a6e3a1" }
-count_cut      = { fg = "#1e1e2e", bg = "#f38ba8" }
-count_selected = { fg = "#1e1e2e", bg = "#f9e2af" }
-
-# Border
-border_symbol = "│"
-border_style  = { fg = "#7f849c" }
-
-# : }}}
-
-
-# : Status {{{
-
-[status]
-separator_open  = ""
-separator_close = ""
-separator_style = { fg = "#45475a", bg = "#45475a" }
-
-# Mode
-mode_normal = { fg = "#1e1e2e", bg = "#89b4fa", bold = true }
-mode_select = { fg = "#1e1e2e", bg = "#a6e3a1", bold = true }
-mode_unset  = { fg = "#1e1e2e", bg = "#f2cdcd", bold = true }
-
-# Progress
-progress_label  = { fg = "#ffffff", bold = true }
-progress_normal = { fg = "#89b4fa", bg = "#45475a" }
-progress_error  = { fg = "#f38ba8", bg = "#45475a" }
-
-# Permissions
-permissions_t = { fg = "#89b4fa" }
-permissions_r = { fg = "#f9e2af" }
-permissions_w = { fg = "#f38ba8" }
-permissions_x = { fg = "#a6e3a1" }
-permissions_s = { fg = "#7f849c" }
-
-# : }}}
-
-
-# : Select {{{
-
-[select]
-border   = { fg = "#89b4fa" }
-active   = { fg = "#f5c2e7", bold = true }
-inactive = {}
-
-# : }}}
-
-
-# : Input {{{
-
-[input]
-border   = { fg = "#89b4fa" }
-title    = {}
-value    = {}
-selected = { reversed = true }
-
-# : }}}
-
-
-# : Completion {{{
-
-[completion]
-border = { fg = "#89b4fa" }
-
-# : }}}
-
-
-# : Tasks {{{
-
-[tasks]
-border  = { fg = "#89b4fa" }
-title   = {}
-hovered = { fg = "#f5c2e7", underline = true }
-
-# : }}}
-
-
-# : Which {{{
-
-[which]
-mask            = { bg = "#313244" }
-cand            = { fg = "#94e2d5" }
-rest            = { fg = "#9399b2" }
-desc            = { fg = "#f5c2e7" }
-separator       = "  "
-separator_style = { fg = "#585b70" }
-
-# : }}}
-
-
-# : Help {{{
-
-[help]
-on      = { fg = "#94e2d5" }
-run     = { fg = "#f5c2e7" }
-hovered = { reversed = true, bold = true }
-footer  = { fg = "#45475a", bg = "#cdd6f4" }
-
-# : }}}
-
-
-# : Notify {{{
-
-[notify]
-title_info  = { fg = "#a6e3a1" }
-title_warn  = { fg = "#f9e2af" }
-title_error = { fg = "#f38ba8" }
-
-# : }}}
-
-
-# : File-specific styles {{{
-
-[filetype]
-
-rules = [
-	# Images
-	{ mime = "image/*", fg = "#94e2d5" },
-
-	# Media
-	{ mime = "{audio,video}/*", fg = "#f9e2af" },
-
-	# Archives
-	{ mime = "application/*zip", fg = "#f5c2e7" },
-	{ mime = "application/x-{tar,bzip*,7z-compressed,xz,rar}", fg = "#f5c2e7" },
-
-	# Documents
-	{ mime = "application/{pdf,doc,rtf,vnd.*}", fg = "#a6e3a1" },
-
-	# Fallback
-	{ name = "*", fg = "#cdd6f4" },
-	{ name = "*/", fg = "#89b4fa" }
-]
-
-# : }}}

yazi/theme.toml

@@ -1,11 +0,0 @@
-[flavor]
-#use = "tokyo-night"
-use = "catppuccin-mocha"
-
-[manager]
-# Hovered
-preview_hovered = { underline = false }
-
-# Border
-border_symbol = "┆"
-border_style  = { fg = "#7f849c" , dim = true }