Merge branch 'upstream-main' into zshfish

.install/before_restore.sh

@@ -1,7 +0,0 @@
-# ------------------------------------------------------
-# Modify existing files before restore starts
-# ------------------------------------------------------
-
-if [ -d ~/dotfiles ] ;then
-    echo ":: Modify existing files"
-fi

.install/diagnosis.sh

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

.install/displaymanager.sh

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

.install/hyprland-dotfiles.sh

@@ -37,14 +37,11 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/eww ]; then
+if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
 fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
     _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/waypaper ]; then
-    _installSymLink waypaper ~/.config/waypaper ~/dotfiles/waypaper/ ~/.config
-fi
 echo ":: Symbolic links created."
 echo

.install/packages/hyprland-packages.sh

@@ -16,5 +16,4 @@ packagesYay=(
     "nwg-look"
     "eww"
     "hyprshade"
-    "waypaper"
 );

.install/required.sh

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

.install/templates/keyboard-default.conf

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

.install/templates/keyboard-laptop.conf

@@ -22,14 +22,9 @@ input {
         # natural_scroll = false
 
         # for laptop
-        natural_scroll = true
+        natural_scroll = yes
         middle_button_emulation = true
-        clickfinger_behavior = false
+        clickfinger_behavior = 1  
-        disable_while_typing = true
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}

.settings/waybar-quicklinks.json

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

.version/name

@@ -1 +1 @@
-2.9.2
+2.9.1.1

.version/version

@@ -1 +1 @@
-2920
+2911

.zshrc

@@ -0,0 +1,128 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# If you come from bash you might have to change your $PATH.
+export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+# ZSH_THEME="robbyrussell"
+ZSH_THEME="powerlevel10k/powerlevel10k"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
+alias wakemac="wakeonlan  18:C0:4D:8D:56:0E"
+alias ls="eza --icons=auto"
+alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
+alias bat="bat --paging=never"
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+eval $(thefuck --alias)
+eval "$(fzf --zsh)"
+
+# -----------------------------------------------------
+# PYWAL
+# -----------------------------------------------------
+cat ~/.cache/wal/sequences
+
+export EDITOR=nvim

CHANGELOG.md

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

README.md

@@ -1,8 +1,8 @@
-# ML4W Dotfiles 2.9.2
+# ML4W Dotfiles 2.9.1.1
 
 An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
 
-[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5715487b0af68f36295f4e37b634f17a/screenshot-20240627-113621.png "Screenshot")](![screenshots/screenshot2.png](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5715487b0af68f36295f4e37b634f17a/screenshot-20240627-113621.png))
+[![Screenshot](screenshots/screenshot2.png "Screenshot")](screenshots/screenshot2.png)
 
 The ML4W Dotfiles are available as 
 
@@ -37,7 +37,11 @@ You can also visit the [ML4W Discord Server](https://discord.gg/c4fJK7Za3g) to s
 
 ## Screenshots
 
-[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/b8dc6a841b6b04fe0b2d380377117a50/screenshot-20240627-113733.png "Screenshot")](![screenshots/screenshot1.png](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/b8dc6a841b6b04fe0b2d380377117a50/screenshot-20240627-113733.png))
+[![Screenshot](screenshots/screenshot1.png "Screenshot")](screenshots/screenshot1.png)
+
+[![Screenshot](screenshots/screenshot3.png "Screenshot")](screenshots/screenshot3.png)
+
+[![Screenshot](screenshots/screenshot4.png "Screenshot")](screenshots/screenshot5.png)
 
 ## Wallpaper repository
 
@@ -51,8 +55,6 @@ THANK YOU very much for all your support, contributions and ideas:
 - Don Williams: https://github.com/dwilliam62
 - Teodor Orzechowski: https://gitlab.com/sq6gtt
 - Jamie Deppeler: https://gitlab.com/bknight2k
-- Yingjie Wang: https://gitlab.com/GaugeAndGravity
-- Daniel Gerber: https://gitlab.com/dan.john.gerber
 - https://gitlab.com/muee
 
 and many more...

alacritty/alacritty.toml

@@ -11,6 +11,3 @@ opacity = 0.7
 [window.padding]
 x = 15
 y = 15
-
-[selection]
-save_to_clipboard = true

hypr/conf/autostart.conf

@@ -20,18 +20,15 @@ exec-once = hypridle
 # Load cliphist history
 exec-once = wl-paste --watch cliphist store
 
+# Initialize Wallpaper Engine
+exec-once = ~/dotfiles/hypr/scripts/init-wallpaper-engine.sh
+
 # Autostart ML4W App
 exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
 
 # Start ewww daemon
 exec-once = ~/dotfiles/hypr/scripts/eww.sh
 
-# Initialize waypaper
-exec-once = waypaper --restore
-
-# Launch Waybar
-exec-once = ~/dotfiles/waybar/launch.sh
-
 # Start autostart cleanup
 exec-once = ~/dotfiles/hypr/scripts/cleanup.sh
 

hypr/conf/environments/default.conf

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

hypr/conf/environments/kvm.conf

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

hypr/conf/keybindings/default.conf

@@ -7,88 +7,90 @@
 $mainMod = SUPER
 
 # Applications
-bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh # Open the terminal
+bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
-bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh # Open the browser
+bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh # Open the filemanager
 
 # Windows
-bind = $mainMod, Q, killactive # Kill active window
+bind = $mainMod, Q, killactive
-bind = $mainMod, F, fullscreen # Set active window to fullscreen
+bind = $mainMod, F, fullscreen
-bind = $mainMod, T, togglefloating # Toggle active windows into floating mode
+bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh # Toggle all windows into floating mode
+bind = $mainMod, T, togglefloating
-bind = $mainMod, J, togglesplit # Toggle split
+bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
-bind = $mainMod, left, movefocus, l # Move focus left
+bind = $mainMod, J, togglesplit
-bind = $mainMod, right, movefocus, r # Move focus right
+bind = $mainMod, left, movefocus, l
-bind = $mainMod, up, movefocus, u # Move focus up
+bind = $mainMod, right, movefocus, r
-bind = $mainMod, down, movefocus, d # Move focus down
+bind = $mainMod, up, movefocus, u
-bindm = $mainMod, mouse:272, movewindow # Move window with the mouse
+bind = $mainMod, down, movefocus, d
-bindm = $mainMod, mouse:273, resizewindow # Resize window with the mouse
+bindm = $mainMod, mouse:272, movewindow
-bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
+bindm = $mainMod, mouse:273, resizewindow
-bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
+bind = $mainMod SHIFT, right, resizeactive, 100 0
-bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
+bind = $mainMod SHIFT, left, resizeactive, -100 0
-bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
+bind = $mainMod SHIFT, up, resizeactive, 0 -100
-bind = $mainMod, G, togglegroup # Toggle window group
+bind = $mainMod SHIFT, down, resizeactive, 0 100
+bind = $mainMod, G, togglegroup
 
 # Actions
-bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh # Toggle animations
+bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh
-bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh # Take a screenshot
+bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
-bind = $mainMod CTRL, Q, exec, wlogout # Start wlogout
+bind = $mainMod CTRL, Q, exec, wlogout
-bind = $mainMod SHIFT, W, exec, waypaper --random # Change the wallpaper
+bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
-bind = $mainMod CTRL, W, exec, waypaper # Open wallpaper selector
+bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i # Open application launcher
+bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
-bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh # Show keybindings
+bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
-bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh # Reload waybar
+bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
-bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh # Toggle waybar
+bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
-bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh # Reload hyprland config
+bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
-bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh # Open clipboard manager
+bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
-bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh # Open waybar theme switcher
+bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
-bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
-bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh # Toggle screenshader
+bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
-bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh # Toggle game mode
+bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+bind = $mainMod CTRL, P, exec, hyprpicker -a
+bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
+bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh
 
 # Workspaces
-bind = $mainMod, 1, workspace, 1 # Open workspace 1
+bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2 # Open workspace 2
+bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3 # Open workspace 3
+bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4 # Open workspace 4
+bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5 # Open workspace 5
+bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6 # Open workspace 6
+bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7 # Open workspace 7
+bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8 # Open workspace 8
+bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9 # Open workspace 9
+bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10 # Open workspace 10
+bind = $mainMod, 0, workspace, 10
-bind = $mainMod SHIFT, 1, movetoworkspace, 1 # Move active window to workspace 1
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2 # Move active window to workspace 2
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3 # Move active window to workspace 3
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4 # Move active window to workspace 4
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5 # Move active window to workspace 5
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6 # Move active window to workspace 6
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7 # Move active window to workspace 7
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8 # Move active window to workspace 8
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9 # Move active window to workspace 9
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Move active window to workspace 10
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
-bind = $mainMod, mouse_down, workspace, e+1 # Open next workspace
+bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1 # Open previous workspace
+bind = $mainMod, mouse_up, workspace, e-1
-bind = $mainMod CTRL, down, workspace, empty # Open the next empty workspace
+bind = $mainMod CTRL, down, workspace, empty
-
-# Passthrough SUPER KEY to Virtual Machine
-bind = $mainMod, P, submap, passthru # Passthrough SUPER key to virtual machine
-submap = passthru
-bind = SUPER, Escape, submap, reset # Get SUPER key back from virtual machine
-submap = reset
 
 # Fn keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% # Increase brightness by 10%
+bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- # Reduce brightness by 10%
+bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
-bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% # Increase volume by 5%
+bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
-bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% # Reduce volume by 5%
+bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # Toggle mute
+bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bind = , XF86AudioPlay, exec, playerctl play-pause # Audio play pause
+bind = , XF86AudioPlay, exec, playerctl play-pause
-bind = , XF86AudioPause, exec, playerctl pause # Audio pause
+bind = , XF86AudioPause, exec, playerctl pause
-bind = , XF86AudioNext, exec, playerctl next # Audio next
+bind = , XF86AudioNext, exec, playerctl next
-bind = , XF86AudioPrev, exec, playerctl previous # Audio previous
+bind = , XF86AudioPrev, exec, playerctl previous
-bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle # Toggle microphone
+bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bind = , XF86Calculator, exec, qalculate-gtk # Open calculator
+bind = , XF86Calculator, exec, qalculate-gtk
-bind = , XF86Lock, exec, hyprlock # Open screenlock
+bind = , XF86Lock, exec, hyprlock
-bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh
 
+# Passthrough SUPER KEY to Virtual Machine
+bind = $mainMod, P, submap, passthru
+submap = passthru
+bind = SUPER, Escape, submap, reset
+submap = reset

hypr/conf/layouts/default.conf

@@ -8,8 +8,7 @@ dwindle {
 }
 
 master {
-    # new_is_master = true
+    new_is_master = true
-    # new_status = master
 }
 
 gestures {

hypr/conf/layouts/laptop.conf

@@ -8,8 +8,7 @@ dwindle {
 }
 
 master {
-    # new_is_master = true
+    new_is_master = true
-    # new_status = master
 }
 
 gestures {

hypr/conf/ml4w.conf

@@ -2,22 +2,10 @@
 # ML4W configurations
 # ----------------------------------------------------- 
 
-# Pavucontrol floating
+windowrulev2 = float,class:(.*chat.openai.com.*)
-windowrulev2 = float,class:(.*org.pulseaudio.pavucontrol.*)
+windowrulev2 = size 500 50%,class:(.*chat.openai.com.*)
-windowrulev2 = size 700 600,class:(.*org.pulseaudio.pavucontrol.*)
+windowrulev2 = move 20 70,class:(.*chat.openai.com.*)
-windowrulev2 = center,class:(.*org.pulseaudio.pavucontrol.*)
 
-# OpenAI ChatGPT floating
-windowrulev2 = float,title:(.*chat.openai.com.*)
-windowrulev2 = size 500 50%,title:(.*chat.openai.com.*)
-windowrulev2 = move 20 70,title:(.*chat.openai.com.*)
-
-# ML4W Welcome App floating
-windowrulev2 = float,class:(.*waypaper.*)
-windowrulev2 = size 800 700,class:(.*waypaper.*)
-windowrulev2 = center,class:(.*waypaper.*)
-
-# ML4W Welcome App floating
 windowrulev2 = float,class:(com.ml4w.welcome)
 windowrulev2 = size 700 600,class:(com.ml4w.welcome)
 windowrulev2 = center,class:(com.ml4w.welcome)
@@ -26,7 +14,6 @@ windowrulev2 = float,class:(ml4w-welcome.py)
 windowrulev2 = size 400 500,class:(ml4w-welcome.py)
 windowrulev2 = center,class:(ml4w-welcome.py)
 
-# ML4W Settings App floating
 windowrulev2 = float,class:(com.ml4w.dotfilessettings)
 windowrulev2 = size 700 600,class:(com.ml4w.dotfilessettings)
 windowrulev2 = move 10% 20%,class:(com.ml4w.dotfilessettings)
@@ -35,40 +22,19 @@ windowrulev2 = float,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py)
 
-# ML4W Hyprland App floating
+windowrulev2 = float,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = float,class:(com.ml4w.hyprland.settings)
+windowrulev2 = size 700 600,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
+windowrulev2 = center,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = center,class:(com.ml4w.hyprland.settings)
 
 windowrulev2 = float,class:(ml4w-hyprland-settings.py)
 windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
 windowrulev2 = center,class:(ml4w-hyprland-settings.py)
 
-# General floating
 windowrulev2 = float,class:(dotfiles-floating)
 windowrulev2 = size 1000 800,class:(dotfiles-floating)
 windowrulev2 = center,class:(dotfiles-floating)
 
-# XDG Desktop Portal
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-# QT
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-
-# GTK
-env = GDK_SCALE,1
-
-# Mozilla
-env = MOZ_ENABLE_WAYLAND,1
-
-# Set the cursor size for xcursor
-env = XCURSOR_SIZE,24
-
-# Disable appimage launcher by default
 env = APPIMAGELAUNCHER_DISABLE,1
+env = XCURSOR_SIZE,24
+env = XDG_CURRENT_DESKTOP,Hyprland
 

hypr/conf/windows/border-1-reverse.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = rgba(ffffffff)
     col.inactive_border = $color11
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/border-1.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/border-2-reverse.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = rgba(ffffffff)
     col.inactive_border = $color11
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/border-2.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/border-3-reverse.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = rgba(ffffffff)
     col.inactive_border = $color11
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/border-3.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/border-4-reverse.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = rgba(ffffffff)
     col.inactive_border = $color11
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/border-4.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/default.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/no-border-more-gaps.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
-    resize_on_border = true
 }

hypr/conf/windows/no-border.conf

@@ -10,5 +10,4 @@ general {
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
-    resize_on_border = true
 }

hypr/hyprlock.conf

@@ -43,7 +43,6 @@ input-field {
 
 label {
     monitor =
-    #clock
     text = cmd[update:1000] echo "$TIME"
     color = rgba(200, 200, 200, 1.0)
     font_size = 55

hypr/hyprpaper.conf

@@ -1,3 +1,3 @@
-preload = $HOME/wallpaper/default.jpg
+preload = $HOME/wallpaper/hyprland.jpg
-wallpaper = ,$HOME/wallpaper/default.jpg
+wallpaper = ,$HOME/wallpaper/hyprland.jpg
 splash = false

hypr/scripts/diagnosis.sh

@@ -46,7 +46,6 @@ _commandExists "swww" "swww"
 _commandExists "eww" "eww"
 _commandExists "magick" "imagemagick"
 _commandExists "figlet" "figlet"
-_commandExists "waypaper" "waypaper"
 
 echo
 echo "Press return to exit"

hypr/scripts/gamemode.sh

@@ -7,18 +7,13 @@
 #
 
 if [ -f ~/.cache/gamemode ] ;then
-    hyprctl reload
+    hyprctl keyword animations:enabled true
+    hyprctl keyword decoration:blur:enabled true
     rm ~/.cache/gamemode
     notify-send "Gamemode deactivated" "Animations and blur enabled"
 else
-    hyprctl --batch "\
+    hyprctl keyword animations:enabled false
-        keyword animations:enabled 0;\
+    hyprctl keyword decoration:blur:enabled false
-        keyword decoration:drop_shadow 0;\
-        keyword decoration:blur:enabled 0;\
-        keyword general:gaps_in 0;\
-        keyword general:gaps_out 0;\
-        keyword general:border_size 1;\
-        keyword decoration:rounding 0"
     touch ~/.cache/gamemode
     notify-send "Gamemode activated" "Animations and blur disabled"
 fi

hypr/scripts/keybindings.sh

@@ -21,29 +21,13 @@ config_file=${config_file/source=~/}
 config_file="/home/$USER$config_file"
 echo "Reading from: $config_file"
 
-keybinds=""
+# ----------------------------------------------------- 
-
+# Parse keybindings
-# Detect Start String
+# ----------------------------------------------------- 
-while read -r line
+keybinds=$(grep -oP '(?<=bind = ).*' $config_file)
-do
+keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'| sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g')
-    if [[ "$line" == "bind"* ]]; then
+# ----------------------------------------------------- 
-
+# Show keybindings in rofi
-        line="$(echo "$line" | sed 's/$mainMod/SUPER/g')"
+# ----------------------------------------------------- 
-        line="$(echo "$line" | sed 's/bind = //g')"
-        line="$(echo "$line" | sed 's/bindm = //g')"
-
-        IFS='#' 
-        read -a strarr <<<"$line" 
-        kb_str=${strarr[0]}
-        cm_str=${strarr[1]}
-
-        IFS=',' 
-        read -a kbarr <<<"$kb_str" 
-
-        item="${kbarr[0]}  + ${kbarr[1]}"$'\r'"${cm_str:1}"
-        keybinds=$keybinds$item$'\n'
-    fi 
-done < "$config_file"
-
 sleep 0.2
-rofi -dmenu -i -markup -eh 2 -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
+rofi -dmenu -i -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"

hypr/scripts/screenshot.sh

@@ -14,11 +14,10 @@ NAME="screenshot_$(date +%d%m%Y_%H%M%S).png"
 
 option2="Selected area"
 option3="Fullscreen (delay 3 sec)"
-option4="Current display (delay 3 sec)"
 
-options="$option2\n$option3\n$option4"
+options="$option2\n$option3"
 
-choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 3 -width 30 -p "Take Screenshot")
+choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 2 -width 30 -p "Take Screenshot")
 
 case $choice in
     $option2)
@@ -34,12 +33,4 @@ case $choice in
         notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
         swappy -f "$DIR$NAME"
     ;;
-    $option4)
-        sleep 3
-        monitor="$(hyprctl monitors | awk '/Monitor/{monitor=$2} /focused: yes/{print monitor; exit}')"
-        grim -o "$monitor" "$DIR$NAME"
-        xclip -selection clipboard -t image/png -i "$DIR$NAME"
-        notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
-        swappy -f "$DIR$NAME"
-    ;;
 esac

hypr/scripts/wallpaper-cache.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-generated_versions="$HOME/.cache/ml4w-wallpaper-generated"
-rm $HOME/.cache/ml4w-wallpaper-generated/*
-echo ":: Wallpaper cache cleared"
-notify-send "Wallpaper cache cleared"

hypr/scripts/wallpaper.sh

@@ -9,79 +9,97 @@
 # by Stephan Raabe (2024) 
 # ----------------------------------------------------- 
 
-# ----------------------------------------------------- 
+# Cache file for holding the current wallpaper
-# Get selected wallpaper
+wallpaper_folder="$HOME/wallpaper"
-# ----------------------------------------------------- 
+if [ -f ~/dotfiles/.settings/wallpaper-folder.sh ] ;then
-echo ":: Using wallpaper $1"
+    source ~/dotfiles/.settings/wallpaper-folder.sh
-wallpaper=$1
-
-# ----------------------------------------------------- 
-# Check to use wallpaper cache
-# ----------------------------------------------------- 
-use_cache=0
-if [ -f $HOME/dotfiles/.settings/wallpaper_cache ] ;then
-    use_cache=1
 fi
-
+used_wallpaper="$HOME/.cache/used_wallpaper"
-if [ "$use_cache" == "1" ] ;then
-    echo ":: Using Wallpaper Cache"
-else
-    echo ":: Wallpaper Cache disabled"
-fi
-
-# ----------------------------------------------------- 
-# File and folder names
-# ----------------------------------------------------- 
-force_generate=0
-generated_versions="$HOME/.cache/ml4w-wallpaper-generated"
 cache_file="$HOME/.cache/current_wallpaper"
-blurred_wallpaper="$HOME/.cache/blurred_wallpaper.png"
+blurred="$HOME/.cache/blurred_wallpaper.png"
-square_wallpaper="$HOME/.cache/square_wallpaper.png"
+square="$HOME/.cache/square_wallpaper.png"
 rasi_file="$HOME/.cache/current_wallpaper.rasi"
 blur_file="$HOME/dotfiles/.settings/blur.sh"
 
 blur="50x30"
 blur=$(cat $blur_file)
 
+# Create cache file if not exists
+if [ ! -f $cache_file ] ;then
+    touch $cache_file
+    echo "$wallpaper_folder/default.jpg" > "$cache_file"
+fi
+
 # Create rasi file if not exists
 if [ ! -f $rasi_file ] ;then
     touch $rasi_file
     echo "* { current-image: url(\"$wallpaper_folder/default.jpg\", height); }" > "$rasi_file"
 fi
 
-# Create folder with generated versions of wallpaper if not exists
+current_wallpaper=$(cat "$cache_file")
-if [ ! -d $generated_versions ] ;then
+
-    mkdir $generated_versions
+case $1 in
+
+    # Load wallpaper from .cache of last session 
+    "init")
+        sleep 1
+        if [ -f $cache_file ]; then
+            wal -q -i $current_wallpaper
+        else
+            wal -q -i $wallpaper_folder/
         fi
+    ;;
+
+    # Select wallpaper with rofi
+    "select")
+        sleep 0.2
+        selected=$( find "$wallpaper_folder" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort -R | while read rfile
+        do
+            echo -en "$rfile\x00icon\x1f$wallpaper_folder/${rfile}\n"
+        done | rofi -dmenu -i -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
+        if [ ! "$selected" ]; then
+            echo "No wallpaper selected"
+            exit
+        fi
+        wal -q -i $wallpaper_folder/$selected
+    ;;
+
+    # Randomly select wallpaper 
+    *)
+        wal -q -i $wallpaper_folder/
+    ;;
+
+esac
 
 # ----------------------------------------------------- 
-# Current wallpaper
+# Load current pywal color scheme
 # ----------------------------------------------------- 
-current_wallpaper=$wallpaper
-current_wallpaper_filename=$(basename $current_wallpaper)
-echo ":: Current Wallpaper: $current_wallpaper"
-echo ":: Current Wallpaper Filename: $current_wallpaper_filename"
-newwall=$current_wallpaper_filename
-
-# ----------------------------------------------------- 
-# Execute pywal
-# ----------------------------------------------------- 
-echo ":: Execute wallpaper"
-wal -q -i $wallpaper
 source "$HOME/.cache/wal/colors.sh"
 
 # ----------------------------------------------------- 
-# Wallpaper Effects
+# get wallpaper image name
 # ----------------------------------------------------- 
+newwall=$(echo $wallpaper | sed "s|$wallpaper_folder/||g")
 
+# ----------------------------------------------------- 
+# Reload waybar with new colors
+# -----------------------------------------------------
+~/dotfiles/waybar/launch.sh
+
+# ----------------------------------------------------- 
+# Set the new wallpaper
+# -----------------------------------------------------
+transition_type="wipe"
+# transition_type="outer"
+# transition_type="random"
+
+cp $wallpaper $HOME/.cache/
+mv $HOME/.cache/$newwall $used_wallpaper
+
+# Load Wallpaper Effect
 if [ -f $HOME/dotfiles/.settings/wallpaper-effect.sh ] ;then
     effect=$(cat $HOME/dotfiles/.settings/wallpaper-effect.sh)
     if [ ! "$effect" == "off" ] ;then
-        used_wallpaper=$generated_versions/$effect-$newwall
-        if [ -f $generated_versions/$effect-$newwall ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-            echo ":: Use cached wallpaper $effect-$newwall"
-        else
-            echo ":: Generate new cached wallpaper $effect-$newwall with effect $effect"
         if [ "$1" == "init" ] ;then
             echo ":: Init"
         else
@@ -89,55 +107,83 @@ if [ -f $HOME/dotfiles/.settings/wallpaper-effect.sh ] ;then
         fi
         source $HOME/dotfiles/hypr/effects/wallpaper/$effect
     fi
-        echo ":: Loading wallpaper $generated_versions/$effect-$newwall with effect $effect"
+fi
-        killall -e hyprpaper & 
+
-        sleep 1; 
+wallpaper_engine=$(cat $HOME/dotfiles/.settings/wallpaper-engine.sh)
+if [ "$wallpaper_engine" == "swww" ] ;then
+    # swww
+    echo ":: Using swww"
+    swww img $used_wallpaper \
+        --transition-bezier .43,1.19,1,.4 \
+        --transition-fps=60 \
+        --transition-type=$transition_type \
+        --transition-duration=0.7 \
+        --transition-pos "$( hyprctl cursorpos )"
+elif [ "$wallpaper_engine" == "hyprpaper" ] ;then
+    # hyprpaper
+    echo ":: Using hyprpaper"
+    killall hyprpaper
     wal_tpl=$(cat $HOME/dotfiles/.settings/hyprpaper.tpl)
-        echo $wal_tpl
     output=${wal_tpl//WALLPAPER/$used_wallpaper}
     echo "$output" > $HOME/dotfiles/hypr/hyprpaper.conf
-        hyprpaper & > /dev/null 2>&1
+    hyprpaper &
 else
-        echo ":: Wallpaper effect is set to off"
+    echo ":: Wallpaper Engine disabled"
 fi
+
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
+else
+    sleep 1
+    dunstify "Changing wallpaper ..." "with image $newwall" -h int:value:25 -h string:x-dunst-stack-tag:wallpaper
+    
+    # ----------------------------------------------------- 
+    # Reload Hyprctl.sh
+    # -----------------------------------------------------
+    $HOME/.config/ml4w-hyprland-settings/hyprctl.sh &
 fi
 
 # ----------------------------------------------------- 
 # Created blurred wallpaper
 # -----------------------------------------------------
-if [ -f $generated_versions/blur-$blur-$newwall.png ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-    echo ":: Use cached wallpaper blur-$blur-$newwall.png"
-else
-    echo ":: Generate new cached wallpaper blur-$blur-$newwall with blur $blur"
 if [ "$1" == "init" ] ;then
     echo ":: Init"
 else
     dunstify "Creating blurred version ..." "with image $newwall" -h int:value:50 -h string:x-dunst-stack-tag:wallpaper
 fi
-    magick $wallpaper -resize 75% $blurred_wallpaper
+
+magick $used_wallpaper -resize 75% $blurred
 echo ":: Resized to 75%"
 if [ ! "$blur" == "0x0" ] ;then
-        magick $blurred_wallpaper -blur $blur $blurred_wallpaper
+    magick $blurred -blur $blur $blurred
-        cp $blurred_wallpaper $generated_versions/blur-$blur-$newwall.png
     echo ":: Blurred"
 fi
-    cp $generated_versions/blur-$blur-$newwall.png $blurred_wallpaper
-fi
-cp $generated_versions/blur-$blur-$newwall.png $blurred_wallpaper
 
 # ----------------------------------------------------- 
-# Created square wallpaper
+# Created quare wallpaper
 # -----------------------------------------------------
-if [ -f $generated_versions/square-$newwall.png ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-    echo ":: Use cached wallpaper square-$newwall.png"
-else
-    echo ":: Generate new cached wallpaper square-$newwall"
 if [ "$1" == "init" ] ;then
     echo ":: Init"
 else
     dunstify "Creating square version ..." "with image $newwall" -h int:value:75 -h string:x-dunst-stack-tag:wallpaper
 fi
-    magick $wallpaper -gravity Center -extent 1:1 $square_wallpaper
+magick $wallpaper -gravity Center -extent 1:1 $square
-    cp $square_wallpaper $generated_versions/square-$newwall.png
+echo ":: Square version created"
+
+# ----------------------------------------------------- 
+# Write selected wallpaper into .cache files
+# ----------------------------------------------------- 
+echo "$wallpaper" > "$cache_file"
+echo "* { current-image: url(\"$blurred\", height); }" > "$rasi_file"
+
+# ----------------------------------------------------- 
+# Send notification
+# ----------------------------------------------------- 
+
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
+else
+    dunstify "Wallpaper procedure complete!" "with image $newwall" -h int:value:100 -h string:x-dunst-stack-tag:wallpaper
 fi
-cp $generated_versions/square-$newwall.png $square_wallpaper
+
+echo "DONE!"

hypr/scripts/xdg.sh

@@ -15,7 +15,7 @@ killall -e xdg-desktop-portal-kde
 killall -e xdg-desktop-portal-lxqt
 killall -e xdg-desktop-portal-wlr
 killall -e xdg-desktop-portal-gtk
-killall -e xdg-desktop-portal
+killall xdg-desktop-portal
 sleep 1
 
 # start xdg-desktop-portal-hyprland

install.sh

@@ -34,7 +34,7 @@ else
 fi
 echo ""
 source .install/required.sh
-source .install/confirm_start.sh
+source .install/confirm-start.sh
 source .install/paralleldownloads.sh
 source .install/yay.sh
 source .install/updatesystem.sh
@@ -44,45 +44,37 @@ source .install/installer.sh
 source .install/remove.sh
 source .install/general.sh
 source .install/packages/general-packages.sh
-source .install/install_packages.sh
+source .install/install-packages.sh
 source .install/profile.sh
 if [[ $profile == *"Hyprland"* ]]; then
     echo -e "${GREEN}"
     figlet "Hyprland"
     echo -e "${NONE}"
     source .install/packages/hyprland-packages.sh
-    source .install/install_packages.sh
+    source .install/install-packages.sh
 fi
 if [[ $profile == *"Qtile"* ]]; then
     echo -e "${GREEN}"
     figlet "Qtile"
     echo -e "${NONE}"
     source .install/packages/qtile-packages.sh
-    source .install/install_packages.sh
+    source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
 source .install/displaymanager.sh
 source .install/issue.sh
-
-# Modify existing files before restore starts
-source .install/before_restore.sh
-
-# Restore configuration and settings
 source .install/restore.sh
-
-# Setup the input devices
 source .install/keyboard.sh
-
 source .install/neovim.sh
 source .install/hook.sh
 source .install/vm.sh
 source .install/copy.sh
 source .install/init-pywal.sh
 if [[ $profile == *"Hyprland"* ]]; then
-    source .install/hyprland_dotfiles.sh
+    source .install/hyprland-dotfiles.sh
 fi
 if [[ $profile == *"Qtile"* ]]; then
-    source .install/qtile_dotfiles.sh
+    source .install/qtile-dotfiles.sh
 fi
 source .install/settings.sh
 source .install/apps.sh

nvim/init.vim

@@ -31,13 +31,3 @@ set ttyfast                 " Speed up scrolling in Vim
 " set spell                 " enable spell check (may need to download language package)
 " set noswapfile            " disable creating swap file
 " set backupdir=~/.cache/vim " Directory to store backup files.
-
-hi NonText ctermbg=none guibg=NONE
-hi Normal guibg=NONE ctermbg=NONE
-hi NormalNC guibg=NONE ctermbg=NONE
-hi SignColumn ctermbg=NONE ctermfg=NONE guibg=NONE
-
-hi Pmenu ctermbg=NONE ctermfg=NONE guibg=NONE
-hi FloatBorder ctermbg=NONE ctermfg=NONE guibg=NONE
-hi NormalFloat ctermbg=NONE ctermfg=NONE guibg=NONE
-hi TabLine ctermbg=None ctermfg=None guibg=None

rofi/config-wallpaper.rasi

@@ -155,7 +155,6 @@ listview {
     fixed-columns:               true;    
     background-color:             @background;
     border:                       0px;
-    flow:                         horizontal;      
 }
 
 /* ---- Element ---- */

waybar/launch.sh

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

waybar/modules.json

@@ -11,8 +11,6 @@
 {
     // Workspaces
     "hyprland/workspaces" : {
-        "on-scroll-up": "hyprctl dispatch workspace r-1",
-        "on-scroll-down": "hyprctl dispatch workspace r+1",        
         "on-click": "activate",
         "active-only": false,
         "all-outputs": true,
@@ -110,7 +108,7 @@
     // Wallpaper
     "custom/wallpaper": {
         "format": "",
-        "on-click": "waypaper",
+        "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
         "on-click-right": "~/dotfiles/hypr/scripts/wallpaper-effects.sh",
         "tooltip-format": "Left: Select a wallpaper\nRight: Select wallpaper effect"
     },
@@ -136,6 +134,20 @@
         "tooltip": false
     },
 
+    // Filemanager Launcher
+    "custom/filemanager": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/filemanager.sh",
+        "tooltip-format": "Open the filemanager"
+    },
+
+    // Browser Launcher
+    "custom/browser": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/browser.sh",
+        "tooltip-format": "Open the browser"
+    },    
+
     // ChatGPT Launcher
     "custom/chatgpt": {
         "format": " ",
@@ -147,7 +159,7 @@
     "custom/calculator": {
         "format": "",
         "on-click": "qalculate-gtk",
-        "tooltip-format": "Open calculator"
+        "tooltip": false
     },
 
     // Windows VM
@@ -301,6 +313,15 @@
         ]
     },
 
+    // Group Quicklinks
+    "group/quicklinks": {
+        "orientation": "horizontal",
+        "modules": [
+            "custom/browser",
+            "custom/filemanager",
+         ]
+    },
+
     // Network
     "network": {
         "format": "{ifname}",

waybar/themes/assets/ml4w-icon-black.svg

@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="white" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="black" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>

waybar/themes/assets/ml4w-icon-white.svg

@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="white" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="white" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>

waybar/themes/assets/ml4w-icon.svg

@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="#19cddb" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="#19cddb" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>

waybar/themes/assets/openai-black.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>

waybar/themes/assets/openai-white.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>

waybar/themes/assets/openai.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>

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

@@ -20,10 +20,5 @@ window#waybar {
 }
 
 #custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-black.svg");
+    background-image: url("../../assets/ml4w-icon-dark.png");
 }
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-black.svg");
-}
-

waybar/themes/ml4w-blur-bottom/config

@@ -19,10 +19,7 @@
     "spacing": 0,
 
     // Load Modules
-    "include": [
+    "include": ["~/dotfiles/waybar/modules.json"],
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/modules.json"
-    ],
 
     // Modules Left
     "modules-left": [

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

@@ -18,11 +18,3 @@
 window#waybar {
     background-color: rgba(255,255,255,0.1);
 }
-
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-white.svg");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-white.svg");
-}

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

@@ -20,9 +20,5 @@ window#waybar {
 }
 
 #custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-black.svg");
+    background-image: url("../../assets/ml4w-icon-dark.png");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-black.svg");
 }

waybar/themes/ml4w-blur/config

@@ -19,10 +19,7 @@
     "spacing": 0,
 
     // Load Modules
-    "include": [
+    "include": ["~/dotfiles/waybar/modules.json"],
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/modules.json"
-    ],
 
     // Modules Left
     "modules-left": [

waybar/themes/ml4w-blur/style.css

@@ -165,16 +165,6 @@ window#waybar.empty #window {
 #custom-system,
 #custom-hyprshade,
 #custom-hypridle,
-#custom-quicklink1,
-#custom-quicklink2,
-#custom-quicklink3,
-#custom-quicklink4,
-#custom-quicklink5,
-#custom-quicklink6,
-#custom-quicklink7,
-#custom-quicklink8,
-#custom-quicklink9,
-#custom-quicklink10,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -213,11 +203,10 @@ window#waybar.empty #window {
 
 #custom-ml4w-welcome {
     margin-right: 12px;
-    background-image: url("../assets/ml4w-icon.svg");
+    background-image: url("../assets/ml4w-icon.png");
-    background-position: center;
     background-repeat: no-repeat;
-    background-size: contain; 
+    background-position: center;
-    padding-right: 20px;
+    padding-right: 24px;
 }
 
 #custom-ml4w-hyprland-settings {
@@ -230,11 +219,10 @@ window#waybar.empty #window {
 
 #custom-chatgpt {
     margin-right: 12px;
-    background-image: url("../assets/openai.svg");
+    background-image: url("../assets/ai-icon-20.png");
     background-repeat: no-repeat;
     background-position: center;
-    background-size: contain; 
+    padding-right: 24px;
-    padding-right: 16px;
 }
 
 /* -----------------------------------------------------

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

@@ -18,11 +18,3 @@
 window#waybar {
     background-color: rgba(255,255,255,0.1);
 }
-
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-white.svg");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-white.svg");
-}

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

@@ -16,9 +16,5 @@
 @import '../../ml4w/style.css';
 
 #custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-black.svg");
+    background-image: url("../../assets/ml4w-icon-dark.png");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-black.svg");
 }

waybar/themes/ml4w-bottom/config

@@ -19,10 +19,7 @@
     "spacing": 0,
 
     // Load Modules
-    "include": [
+    "include": ["~/dotfiles/waybar/modules.json"],
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/modules.json"
-    ],
 
     // Modules Left
     "modules-left": [

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

@@ -14,11 +14,3 @@
 @define-color iconcolor #FFFFFF;
 
 @import '../../ml4w/style.css';
-
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-white.svg");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-white.svg");
-}

waybar/themes/ml4w-minimal/config

@@ -18,10 +18,7 @@
     "spacing": 0,
 
     // Load Modules
-    "include": [
+    "include": ["~/dotfiles/waybar/modules.json"],
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/modules.json"
-    ],
 
     // Modules Left
     "modules-left": [

waybar/themes/ml4w-minimal/style.css

@@ -136,16 +136,6 @@ window#waybar.empty #window {
 #custom-system,
 #custom-hyprshade,
 #custom-hypridle,
-#custom-quicklink1,
-#custom-quicklink2,
-#custom-quicklink3,
-#custom-quicklink4,
-#custom-quicklink5,
-#custom-quicklink6,
-#custom-quicklink7,
-#custom-quicklink8,
-#custom-quicklink9,
-#custom-quicklink10,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 14px;
@@ -195,12 +185,11 @@ window#waybar.empty #window {
 
 
 #custom-ml4w-welcome {
-    margin-right: 12px;
+    margin-right: 15px;
-    background-image: url("../assets/ml4w-icon.svg");
+    background-image: url("../assets/ml4w-icon-20.png");
-    background-position: center;
     background-repeat: no-repeat;
-    background-size: contain; 
+    background-position: center;
-    padding-right: 20px;
+    padding-right: 24px;
 }
 
 #custom-ml4w-hyprland-settings {

waybar/themes/ml4w/black/style.css

@@ -16,9 +16,5 @@
  @import '../style.css';
  
  #custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-black.svg");
+    background-image: url("../../assets/ml4w-icon-dark.png");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-black.svg");
 }

waybar/themes/ml4w/config

@@ -19,10 +19,7 @@
     "spacing": 0,
 
     // Load Modules
-    "include": [
+    "include": ["~/dotfiles/waybar/modules.json"],
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/modules.json"
-    ],
 
     // Modules Left
     "modules-left": [

waybar/themes/ml4w/style.css

@@ -166,16 +166,6 @@ window#waybar.empty #window {
 #custom-system,
 #custom-hyprshade,
 #custom-hypridle,
-#custom-quicklink1,
-#custom-quicklink2,
-#custom-quicklink3,
-#custom-quicklink4,
-#custom-quicklink5,
-#custom-quicklink6,
-#custom-quicklink7,
-#custom-quicklink8,
-#custom-quicklink9,
-#custom-quicklink10,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -214,20 +204,18 @@ window#waybar.empty #window {
 
 #custom-chatgpt {
     margin-right: 12px;
-    background-image: url("../assets/openai.svg");
+    background-image: url("../assets/ai-icon.png");
     background-repeat: no-repeat;
     background-position: center;
-    background-size: contain; 
+    padding-right: 24px;
-    padding-right: 16px;
 }
 
 #custom-ml4w-welcome {
     margin-right: 12px;
-    background-image: url("../assets/ml4w-icon.svg");
+    background-image: url("../assets/ml4w-icon.png");
-    background-position: center;
     background-repeat: no-repeat;
-    background-size: contain; 
+    background-position: center;
-    padding-right: 20px;
+    padding-right: 24px;
 }
 
 #custom-ml4w-hyprland-settings {

waybar/themes/ml4w/white/style.css

@@ -15,10 +15,3 @@
  
  @import '../style.css';
  
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-white.svg");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-white.svg");
-}

waybar/themes/starter/config

@@ -26,10 +26,7 @@
     "spacing": 0,
 
     // Load Modules
-    "include": [
+    "include": ["~/dotfiles/waybar/themes/starter/modules.json"],
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/themes/starter/modules.json"
-    ],
 
     // Modules Left
     "modules-left": [

waybar/themes/starter/style.css

@@ -166,16 +166,6 @@ window#waybar.empty #window {
 #custom-system,
 #custom-hyprshade,
 #custom-hypridle,
-#custom-quicklink1,
-#custom-quicklink2,
-#custom-quicklink3,
-#custom-quicklink4,
-#custom-quicklink5,
-#custom-quicklink6,
-#custom-quicklink7,
-#custom-quicklink8,
-#custom-quicklink9,
-#custom-quicklink10,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -204,11 +194,10 @@ window#waybar.empty #window {
 }
 
 #custom-ml4w-welcome {
-    margin-right: 12px;
+    margin-right: 15px;
-    background-image: url("../assets/ml4w-icon.svg");
+    background-image: url("../assets/ml4w-icon.png");
-    background-position: center;
     background-repeat: no-repeat;
-    background-size: contain; 
+    background-position: center;
     padding-right: 24px;
 }
 

waypaper/config.ini

@@ -1,19 +0,0 @@
-[Settings]
-language = en
-folder = ~/wallpaper
-wallpaper = ~/wallpaper/default.jpg
-backend = hyprpaper
-monitors = All
-fill = fill
-sort = name
-color = #ffffff
-subfolders = False
-show_hidden = False
-show_gifs_only = False
-post_command = ~/dotfiles/hypr/scripts/wallpaper.sh $wallpaper
-number_of_columns = 3
-swww_transition_type = any
-swww_transition_step = 90
-swww_transition_angle = 0
-swww_transition_duration = 2
-