fix: fix

.install/fish.sh

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

.install/hidpi.sh

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

.install/hyprland-dotfiles.sh

@@ -37,7 +37,7 @@ 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

.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,"

.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,7 +28,3 @@ 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,14 +22,9 @@ input {
         # natural_scroll = false
 
         # for laptop
-        natural_scroll = true
+        natural_scroll = yes
         middle_button_emulation = true
-        clickfinger_behavior = true
+        clickfinger_behavior = 1  
-        disable_while_typing = true
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}

.install/zsh.sh

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

.install/zshfish.sh

@@ -0,0 +1,26 @@
+# ------------------------------------------------------
+# 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 "bash\n$zshfish" | gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) ")
+	sudo chsh -s $(which $shell) $(whoami)
+    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

.version/name

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

.version/version

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

.zshrc_ohmyzsh

@@ -0,0 +1,80 @@
+# 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='vim'
+
+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"
+# fix ssh if in kitty
+[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+
+# -----------------------------------------------------
+# evals
+# -----------------------------------------------------
+eval $(thefuck --alias)
+eval "$(fzf --zsh)"
+
+# -----------------------------------------------------
+# PYWAL
+# -----------------------------------------------------
+cat ~/.cache/wal/sequences
+
+# -----------------------------------------------------
+# Custom
+# -----------------------------------------------------
+[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh
+
+# -----------------------------------------------------
+# miscs
+# -----------------------------------------------------
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

.zshrc_zinit

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

CHANGELOG.md

@@ -1,11 +1,3 @@
-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.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.
 
@@ -55,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

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

hypr/conf/cursor.conf

@@ -1 +1 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 32
+exec-once = hyprctl setcursor Bibata-Modern-Ice 24

hypr/conf/environments/default.conf

@@ -9,3 +9,4 @@ 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/hidpi.conf

@@ -1,6 +0,0 @@
-xwayland {
-  force_zero_scaling = true
-}
-
-env = GDK_SCALE,2
-env = QT_AUTO_SCREEN_SCALE_FACTOR,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, ~/dotfiles/hypr/scripts/wallpaper.sh # Change the wallpaper
+bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
-bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select # 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/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.hyprland.settings)
+windowrulev2 = float,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
+windowrulev2 = size 700 600,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = center,class:(com.ml4w.hyprland.settings)
+windowrulev2 = center,class:(com.ml4w.hyprlandsettings)
 
 windowrulev2 = float,class:(ml4w-hyprland-settings.py)
 windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
@@ -37,3 +37,4 @@ windowrulev2 = center,class:(dotfiles-floating)
 env = APPIMAGELAUNCHER_DISABLE,1
 env = XCURSOR_SIZE,24
 env = XDG_CURRENT_DESKTOP,Hyprland
+

hypr/conf/monitors/4k.conf

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

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;\
+    touch ~/.cache/gamemode
-        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

install.sh

@@ -61,7 +61,6 @@ 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
@@ -77,6 +76,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

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

@@ -151,11 +151,10 @@ listview {
     spacing:                      10px;
     padding:                      10px;
     margin:                       0px;
-    fixed-height:                 true;
+    fixed-height:                true;
-    fixed-columns:                true;    
+    fixed-columns:               true;    
     background-color:             @background;
     border:                       0px;
-    flow:                         horizontal;      
 }
 
 /* ---- Element ---- */

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,
@@ -140,14 +138,14 @@
     "custom/filemanager": {
         "format": "",
         "on-click": "~/dotfiles/.settings/filemanager.sh",
-        "tooltip-format": "Open filemanager"
+        "tooltip-format": "Open the filemanager"
     },
 
     // Browser Launcher
     "custom/browser": {
         "format": "",
         "on-click": "~/dotfiles/.settings/browser.sh",
-        "tooltip-format": "Open browser"
+        "tooltip-format": "Open the browser"
     },    
 
     // ChatGPT Launcher
@@ -161,7 +159,7 @@
     "custom/calculator": {
         "format": "",
         "on-click": "qalculate-gtk",
-        "tooltip-format": "Open calculator"
+        "tooltip": false
     },
 
     // Windows VM