new: add mpv conf

merge hidpi support

.gitmodules

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

.install/cleanup.sh

@@ -13,24 +13,6 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
     fi
 fi
 
-# Check for running NetworkManager.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
-    echo ":: NetworkManager.service already running."
-else
-    sudo systemctl enable NetworkManager.service
-    sudo systemctl start NetworkManager.service
-    echo ":: NetworkManager.service activated successfully."    
-fi
-
-# Check for running bluetooth.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then
-    echo ":: bluetooth.service already running."
-else
-    sudo systemctl enable bluetooth.service
-    sudo systemctl start bluetooth.service
-    echo ":: bluetooth.service activated successfully."    
-fi
-
 if [ -d ~/dotfiles/hypr/settings/ ] ;then
     rm -rf ~/dotfiles/hypr/settings
     echo ":: ~/dotfiles/hypr/settings removed."

.install/fcitx5.sh

@@ -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/hyprland-dotfiles.sh

@@ -40,7 +40,7 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/swappy ]; then
+if [ -d ~/dotfiles-versions/$version/eww ]; then
     _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
 fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
@@ -49,5 +49,12 @@ fi
 if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
     _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
 fi
+if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then
+    if [ ! -d ~/.local/share/icons ]; then mkdir -pv ~/.local/share/icons; fi
+    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors ~/.local/share/icons/
+fi
+if [ -d ~/dotfiles-versions/$version/ranger ]; then
+    _installSymLink ranger ~/.config/ranger ~/dotfiles/ranger/ ~/.config
+fi
 echo ":: Symbolic links created."
 echo

.install/packages/general-packages.sh

@@ -7,66 +7,53 @@ packagesPacman=(
     "fastfetch"
     "ranger"
     "btop"
-    "bluez"
-    "bluez-utils"
     "neovim"
     "wget"
     "unzip"
-    "alacritty" 
+    "alacritty"
-    "chromium" 
+    "dunst"
-    "dunst" 
     "starship"
-    "mpv" 
+    "mpv"
     "thunar"
-    "nautilus" 
+    "nautilus"
-    "mousepad"
+    "noto-fonts"
-    "noto-fonts" 
+    "otf-font-awesome"
-    "otf-font-awesome" 
+    "ttf-fira-sans"
-    "ttf-fira-sans" 
     "ttf-fira-code"
     "ttf-firacode-nerd"
-    "ttf-firacode-nerd" 
+    "ttf-firacode-nerd"
-    "figlet" 
+    "figlet"
-    "vlc" 
+    "vlc"
-    "eza" 
+    "eza"
-    "python-pip" 
+    "python-pip"
-    "python-psutil" 
+    "python-psutil"
-    "python-rich" 
+    "python-rich"
-    "python-click" 
     "python-pywal"
-    "python-gobject"
+    "pavucontrol"
-    "pavucontrol" 
+    "tumbler"
-    "tumbler" 
     "papirus-icon-theme"
-    "breeze-icons"
-    "polkit-gnome"
-    "brightnessctl"
     "gum"
     "man-pages"
-    "nm-connection-editor"
     "gvfs"
     "xdg-user-dirs"
-    "xdg-desktop-portal-gtk"
+#    "xdg-desktop-portal-gtk"
-    "networkmanager"
-    "network-manager-applet"
     "xarchiver"
     "thunar-archive-plugin"
     "zip"
     "fuse2"
-    "gtk4"
-    "libadwaita"
     "xdg-desktop-portal"
     "qalculate-gtk"
     "imagemagick"
-    "guvcview"
     "jq"
     "rofi-wayland"
     "fastfetch"
-    "blueman"
+    "pipewire-pulse"
+    "wireplumber"
 );
 
 packagesYay=(
-    "bibata-cursor-theme" 
+    "vimix-cursors"
+    "orchis-theme"
     "trizen"
-    "pacseek"
+    "google-chrome"
 );

.install/packages/hyprland-packages.sh

@@ -3,14 +3,15 @@ packagesPacman=(
     "hyprpaper"
     "hyprlock"
     "hypridle"
-    "xdg-desktop-portal-hyprland" 
+    #    "xdg-desktop-portal-hyprland"
-    "waybar" 
+    "hyprpolkitagent"
-    "grim" 
+    "waybar"
+    "grim"
     "slurp"
     "swappy"
     "cliphist"
     "kitty"
-);
+)
 
 packagesYay=(
     "pyprland"
@@ -18,4 +19,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/templates/keyboard-default.conf

@@ -8,7 +8,7 @@ input {
     kb_model =
     kb_options =
     numlock_by_default = true
-    mouse_refocus=false
+    mouse_refocus = false
     
     # For United States
     # kb_layout = us
@@ -28,3 +28,7 @@ input {
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
+
+gestures {
+    workspace_swipe = true
+}

.install/templates/keyboard-laptop.conf

@@ -8,7 +8,7 @@ input {
     kb_model =
     kb_options =
     numlock_by_default = true
-    mouse_refocus=false
+    mouse_refocus = false
     
     # For United States
     # kb_layout = us
@@ -22,9 +22,14 @@ input {
         # natural_scroll = false
 
         # for laptop
-        natural_scroll = yes
+        natural_scroll = true
         middle_button_emulation = true
-        clickfinger_behavior = 1  
+        clickfinger_behavior = true
+        disable_while_typing = true
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
+
+gestures {
+    workspace_swipe = true
+}

.install/zsh.sh

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

.install/zshfish.sh

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

.settings/browser.sh

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

.settings/editor.sh

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

.settings/networkmanager.sh

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

.settings/software.sh

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

.settings/terminal.sh

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

.version/name

@@ -1 +1 @@
-2.9.1.1
+2.9.1.2

.version/version

@@ -1 +1 @@
-2911
+2912

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

CHANGELOG.md

@@ -1,3 +1,11 @@
+Version 2.9.1.2
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
+--------------------------------------------------------
+- 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,4 +1,4 @@
-# ML4W Dotfiles 2.9.1.1
+# ML4W Dotfiles 2.9.1.2
 
 An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
 
@@ -55,6 +55,8 @@ 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...

Vimix-hyprcursors/manifest.hl

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

alacritty/alacritty.toml

@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0
 
 [font.normal]
 family = "FiraCode Nerd Font"
@@ -9,8 +9,8 @@ style = "Regular"
 opacity = 0.7
 
 [window.padding]
-x = 15
+x = 0
-y = 15
+y = 0
 
 [selection]
 save_to_clipboard = true

fastfetch/config.jsonc

@@ -1,5 +1,4 @@
 // Note that you must replace the image path to an existing image to display it.
-
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     // "logo": {
@@ -9,7 +8,7 @@
     //     "height": 12
     // },
     "display": {
-    //    "separator": "  "
+        //    "separator": "  "
         "separator": " "
     },
     "modules": [
@@ -74,7 +73,6 @@
             "keyColor": "green"
         },
         "break",
-
         {
             "type": "shell",
             "key": "╭─",
@@ -85,6 +83,11 @@
             "key": "├─",
             "keyColor": "yellow"
         },
+        {
+            "type": "editor",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
         {
             "type": "terminalfont",
             "key": "├─",
@@ -115,7 +118,6 @@
             "key": "╰─󰀻",
             "keyColor": "yellow"
         },
-
         "break",
         {
             "type": "title",
@@ -149,6 +151,21 @@
             "key": "├─󰝚",
             "keyColor": "blue"
         },
+        {
+            "type": "cpuusage",
+            "key": "├─",
+            "keyColor": "blue"
+        },
+        {
+            "type": "loadavg",
+            "key": "├─",
+            "keyColor": "blue"
+        },
+        {
+            "type": "processes",
+            "key": "├─",
+            "keyColor": "blue"
+        },
         {
             "type": "localip",
             "key": "╰─󰩟",
@@ -158,8 +175,7 @@
         "break",
         {
             "type": "custom",
-            "format": " \u001b[90m󱓻  \u001b[31m󱓻  \u001b[32m󱓻  \u001b[33m󱓻  \u001b[34m󱓻  \u001b[35m󱓻  \u001b[36m󱓻  \u001b[37m󱓻  \u001b[38m󱓻  \u001b[39m󱓻"
+            "format": " \u001b[90m󱓻  \u001b[31m󱓻  \u001b[32m󱓻  \u001b[33m󱓻  \u001b[34m󱓻  \u001b[35m󱓻  \u001b[36m󱓻  \u001b[37m󱓻  \u001b[38m󱓻  \u001b[39m󱓻 "
         }
     ]
 }
-

hypr/conf/autostart.conf

@@ -6,7 +6,7 @@
 exec-once = ~/dotfiles/hypr/scripts/xdg.sh
 
 # Start Polkit
-exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+exec-once = systemctl --user start hyprpolkitagent
 
 # Load Dunst Notification Manager
 exec-once = dunst
@@ -34,6 +34,3 @@ exec-once = pypr
 
 # Start autostart cleanup
 exec-once = ~/dotfiles/hypr/scripts/cleanup.sh
-
-# Load configuration from ML4W Hyprland Settings App
-exec = ~/.config/ml4w-hyprland-settings/hyprctl.sh

hypr/conf/cursor.conf

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

hypr/conf/decorations/custom.conf

@@ -12,14 +12,19 @@ decoration {
         new_optimizations = on
         ignore_opacity = true
         xray = false
-        blurls = waybar
     }
     active_opacity = 1.0
     inactive_opacity = 0.8
     fullscreen_opacity = 1.0
 
-    drop_shadow = true
+    shadow {
-    shadow_range = 30
+        enabled = true
-    shadow_render_power = 3
+        range = 30
-    col.shadow = 0x66000000
+        render_power = 3
+        color = 0x66000000
+    }
+    #drop_shadow = true
+    #shadow_range = 30
+    #shadow_render_power = 3
+    #col.shadow = 0x66000000
 }

hypr/conf/environments/default.conf

@@ -6,7 +6,7 @@
 env = XDG_SESSION_TYPE,wayland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = QT_QPA_PLATFORM,wayland
+env = QT_QPA_PLATFORMTHEME,qt6ct
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = MOZ_ENABLE_WAYLAND,1
-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

@@ -1,7 +1,7 @@
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Key bindings
 # name: "Default"
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 
 # SUPER KEY
 $mainMod = SUPER
@@ -9,11 +9,14 @@ $mainMod = SUPER
 # Applications
 bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
 bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
-bind = $mainMod, period, exec, emote
+bind = $mainMod SHIFT, E, exec, emote
 
 # Windows
 bind = $mainMod, Q, killactive
 bind = $mainMod, F, fullscreen
+bind = $mainMod SHIFT, F, fullscreen, 1
+bind = $mainMod CTRL SHIFT, F, fullscreen, 2
+bind = $mainMod ALT, F, fakefullscreen
 bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
 bind = $mainMod, T, togglefloating
 bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
@@ -29,21 +32,25 @@ 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
 bind = $mainMod CTRL, Q, exec, wlogout
 bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
 bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
+bind = $mainMod, SPACE, exec, rofi -show drun -replace -i
 bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
 bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
+bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
 bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
-bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
 bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
 bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
 bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
 bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+bind = $mainMod CTRL, P, exec, hyprpicker -a
+bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
+bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh
 
 # Workspaces
 bind = $mainMod, 1, workspace, 1

hypr/conf/keybindings/default.conf

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

hypr/conf/layouts/default.conf

@@ -8,9 +8,8 @@ dwindle {
 }
 
 master {
-    new_is_master = true
 }
 
 gestures {
     workspace_swipe = false
-}
+}

hypr/conf/layouts/laptop.conf

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

hypr/conf/misc.conf

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

hypr/conf/ml4w.conf

@@ -22,9 +22,9 @@ 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)
 
-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)
@@ -37,4 +37,3 @@ windowrulev2 = center,class:(dotfiles-floating)
 env = APPIMAGELAUNCHER_DISABLE,1
 env = XCURSOR_SIZE,24
 env = XDG_CURRENT_DESKTOP,Hyprland
-

hypr/conf/monitors/4k.conf

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

hypr/conf/windowrules/custom.conf

@@ -1,6 +1,6 @@
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Window rules
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 
 windowrule = tile,^(Microsoft-edge)$
 windowrule = tile,^(Brave-browser)$
@@ -13,7 +13,13 @@ windowrule = float,^(showmethekey-gtk)$
 windowrule = pin,^(showmethekey-gtk)$
 layerrule = blur, gtk-layer-shell
 layerrule = blur, logout_dialog
+layerrule = blur, waybar
 
-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)$
+windowrule = float,^(fdm)$
+windowrule = float,^(xdg-desktop-portal-gtk)$

hypr/conf/windows/default.conf

@@ -11,3 +11,12 @@ 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

hypr/pyprland.toml

@@ -7,6 +7,6 @@ plugins = [
 
 [scratchpads.term]
 animation = "fromTop"
-command = "kitty --class kitty-dropterm"
+command = "alacritty --class alacritty-dropterm"
-class = "kitty-dropterm"
+class = "alacritty-dropterm"
 size = "75% 60%"

hypr/scripts/gamemode.sh

@@ -7,13 +7,18 @@
 #
 
 if [ -f ~/.cache/gamemode ] ;then
-    hyprctl keyword animations:enabled true
+    hyprctl reload
-    hyprctl keyword decoration:blur:enabled true
     rm ~/.cache/gamemode
     notify-send "Gamemode deactivated" "Animations and blur enabled"
 else
-    hyprctl keyword animations:enabled false
+    hyprctl --batch "\
-    hyprctl keyword decoration:blur:enabled false
+        keyword animations:enabled 0;\
-    touch ~/.cache/gamemode
+        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/gtk.sh

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

hypr/scripts/keybindings.sh

@@ -21,13 +21,29 @@ config_file=${config_file/source=~/}
 config_file="/home/$USER$config_file"
 echo "Reading from: $config_file"
 
-# ----------------------------------------------------- 
+keybinds=""
-# Parse keybindings
+
-# ----------------------------------------------------- 
+# Detect Start String
-keybinds=$(grep -oP '(?<=bind = ).*' $config_file)
+while read -r line
-keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'| sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g')
+do
-# ----------------------------------------------------- 
+    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 -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
+rofi -dmenu -i -markup -eh 2 -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"

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,14 +1,34 @@
-font_family     Fira Code Nerd Font
+# Maple
-font_size 	    14.0
+#font_family      Maple Mono NF CN
-bold_font       auto
+# end Maple
+# Fica Code
+font_family FiraCode Nerd Font
+font_features FiraCodeNF-Reg +cv01 +cv02 +cv06 +cv31 +zero +cv30
+font_features FiraCodeNF-SemBd +cv01 +cv02 +cv06 +cv31 +zero
+# end Fira Code
+font_size        16.0
+bold_font        auto
 italic_font      auto
 bold_italic_font auto
 
+cursor_trail     10
+
 background_opacity 0.7
 
 confirm_os_window_close 0
 
-enable_audio_bell no
-
 selection_foreground #000000
 selection_background #F5FBFF
+
+detect_urls    yes
+copy_on_select clipboard
+strip_trailing_spaces smart
+rectangle_select_modifiers ctrl+alt
+terminal_select_modifiers shift
+
+enable_audio_bell no
+
+remember_window_size no
+window_padding_width 5
+
+map ctrl+super+enter    launch --cwd=current

mpv/mpv.conf

@@ -0,0 +1,148 @@
+#
+# Example mpv configuration file
+#
+# Warning:
+#
+# The commented example options usually do _not_ set the default values. Call
+# mpv with --list-options to see the default values for most options. There is
+# no builtin or example mpv.conf with all the defaults.
+#
+#
+# Configuration files are read system-wide from /etc/mpv or /usr/local/etc/mpv,
+# and per-user from ~/.config/mpv, where per-user settings override
+# system-wide settings, all of which are overridden by the command line.
+#
+# Configuration file settings and the command line options use the same
+# underlying mechanisms. Most options can be put into the configuration file
+# by dropping the preceding '--'. See the man page for a complete list of
+# options.
+#
+# Lines starting with '#' are comments and are ignored.
+#
+# See the CONFIGURATION FILES section in the man page
+# for a detailed description of the syntax.
+#
+# Profiles should be placed at the bottom of the configuration file to ensure
+# that settings wanted as defaults are not restricted to specific profiles.
+
+##################
+# video settings #
+##################
+
+# Start in fullscreen mode by default.
+#fs=yes
+
+# force starting with centered window
+#geometry=50%:50%
+
+# don't allow a new window to have a size larger than 90% of the screen size
+#autofit-larger=90%x90%
+
+# Do not close the window on exit.
+#keep-open=yes
+
+# Do not wait with showing the video window until it has loaded. (This will
+# resize the window once video is loaded. Also always shows a window with
+# audio.)
+#force-window=immediate
+
+# Disable the On Screen Controller (OSC).
+#osc=no
+
+# Keep the player window on top of all other windows.
+#ontop=yes
+
+# Specify fast video rendering preset (for --vo=<gpu|gpu-next> only)
+# Recommended for mobile devices or older hardware with limited processing power
+#profile=fast
+
+# Specify high quality video rendering preset (for --vo=<gpu|gpu-next> only)
+# Offers superior image fidelity and visual quality for an enhanced viewing
+# experience on capable hardware
+#profile=high-quality
+
+# Force video to lock on the display's refresh rate, and change video and audio
+# speed to some degree to ensure synchronous playback - can cause problems
+# with some drivers and desktop environments.
+#video-sync=display-resample
+
+# Enable hardware decoding if available. Often, this does not work with all
+# video outputs, but should work well with default settings on most systems.
+# If performance or energy usage is an issue, forcing the vdpau or vaapi VOs
+# may or may not help.
+#hwdec=auto
+
+##################
+# audio settings #
+##################
+
+# Specify default audio device. You can list devices with: --audio-device=help
+# The option takes the device string (the stuff between the '...').
+#audio-device=alsa/default
+
+# Do not filter audio to keep pitch when changing playback speed.
+#audio-pitch-correction=no
+
+# Output 5.1 audio natively, and upmix/downmix audio with a different format.
+#audio-channels=5.1
+# Disable any automatic remix, _if_ the audio output accepts the audio format.
+# of the currently played file. See caveats mentioned in the manpage.
+# (The default is "auto-safe", see manpage.)
+#audio-channels=auto
+
+##################
+# other settings #
+##################
+
+autocreate-playlist=same
+pause
+directory-mode=ignore
+
+# Pretend to be a web browser. Might fix playback with some streaming sites,
+# but also will break with shoutcast streams.
+#user-agent="Mozilla/5.0"
+
+# cache settings
+#
+# Use a large seekable RAM cache even for local input.
+#cache=yes
+#
+# Use extra large RAM cache (needs cache=yes to make it useful).
+#demuxer-max-bytes=500M
+#demuxer-max-back-bytes=100M
+#
+# Disable the behavior that the player will pause if the cache goes below a
+# certain fill size.
+#cache-pause=no
+#
+# Store cache payload on the hard disk instead of in RAM. (This may negatively
+# impact performance unless used for slow input such as network.)
+#cache-dir=~/.cache/
+#cache-on-disk=yes
+
+# Display English subtitles if available.
+#slang=en
+slang=zh,en
+
+# Play Finnish audio if available, fall back to English otherwise.
+#alang=fi,en
+
+# Change subtitle encoding. For Arabic subtitles use 'cp1256'.
+# If the file seems to be valid UTF-8, prefer UTF-8.
+# (You can add '+' in front of the codepage to force it.)
+#sub-codepage=cp1256
+
+# You can also include other configuration files.
+#include=/path/to/the/file/you/want/to/include
+
+############
+# Profiles #
+############
+
+# The options declared as part of profiles override global default settings,
+# but only take effect when the profile is active.
+
+# The following profile can be enabled on the command line with: --profile=eye-cancer
+
+#[eye-cancer]
+#sharpen=5

nvim/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,121 @@
+name: Bug Report
+description: File a bug report
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        _Before reporting:_ Search [existing issues](https://github.com/ayamir/nvimdots/issues) and check the [FAQ](https://github.com/ayamir/nvimdots/wiki/Issues). Thank you for helping us improve!
+        > [!IMPORTANT]
+        > The `0.11` branch is intended for nightly Neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
+  - type: checkboxes
+    id: is-latest-commit
+    attributes:
+      label: "Version confirmation"
+      description: "The local configuration is up-to-date in the current branch and this issue _persists_."
+      options:
+        - label: "Confirm"
+          required: true
+  - type: checkboxes
+    id: prerequisites-done
+    attributes:
+      label: "Following prerequisites"
+      description: "I've checked everything mentioned in [Wiki: Prerequisites](https://github.com/ayamir/nvimdots/wiki/Prerequisites)."
+      options:
+        - label: "Confirm"
+          required: true
+  - type: checkboxes
+    id: not-user-config-issue
+    attributes:
+      label: "Not a user config issue"
+      description: "This issue _persists_ after removing ALL user configs. If this is not the case, you should open a [Custom (User) Config Issue](https://github.com/ayamir/nvimdots/issues/new?assignees=&labels=usage&projects=&template=custom_config.yml) instead."
+      options:
+        - label: "Confirm"
+          required: true
+
+  - type: input
+    id: nvim-version
+    attributes:
+      label: "Neovim version"
+      description: "Paste the output of `nvim --version` here"
+      placeholder: "NVIM v0.11.0-dev-194+g6c7677e5d"
+    validations:
+      required: true
+  - type: input
+    id: system-version
+    attributes:
+      label: "Operating system/version"
+      placeholder: "macOS 12.6.1"
+    validations:
+      required: true
+  - type: input
+    id: terminal-version
+    attributes:
+      label: "Terminal name/version"
+      placeholder: "iTerm2 Build 3.4.17"
+    validations:
+      required: true
+  - type: input
+    id: term-env
+    attributes:
+      label: "$TERM environment variable"
+      placeholder: "xterm-256color"
+    validations:
+      required: false
+  - type: dropdown
+    id: branch
+    attributes:
+      label: "Branch info"
+      description: "Which branch are you currently on? If you are not sure, check the output of `git rev-parse --abbrev-ref HEAD`"
+      options:
+        - main (Default/Latest)
+        - 0.9 (Legacy)
+        - 0.8 (Deprecated)
+        - 0.11 (Nightly)
+    validations:
+      required: true
+  - type: dropdown
+    id: fetch-pref
+    attributes:
+      label: "Fetch Preferences"
+      description: "In what way do you fetch resources? If you are not sure, check the value of `use_ssh` in `lua/user/settings.lua`"
+      options:
+        - SSH (use_ssh = true)
+        - HTTPS (use_ssh = false)
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: "How to reproduce the issue"
+      description: "Note: Issues without any information will be closed directly"
+      placeholder: |
+        Steps to reproduce the behavior:
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: "Expected behavior"
+      description: "Describe the behavior you expect"
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: "Actual behavior"
+    validations:
+      required: false
+  - type: textarea
+    id: extras
+    attributes:
+      label: Additional information
+      description: If applicable, you may include logs, images, or videos to help explain your problem
+    validations:
+      required: false