fix: rm cursor size in hidpi.sh

fix: set cursor size to 32, so x and way looks same
fix: use QT_AUTO_SCREEN_SCALE_FACTOR
2024-08-27 16:49:29 -04:00 · 2024-08-27 16:48:04 -04:00 · 2024-08-14 19:43:48 -04:00 · 2024-06-29 18:20:38 -04:00 · 2024-06-13 21:27:55 -04:00 · 2024-06-12 23:26:06 -04:00
31 changed files with 246 additions and 2074 deletions
@@ -1,6 +0,0 @@
-# ------------------------------------------------------
-# install fish
-# ------------------------------------------------------
-packagesPacman=("fish");
-packagesYay=();
-source .install/install-packages.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
@@ -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/swappy ]; then
+if [ -d ~/dotfiles-versions/$version/eww ]; then
    _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
 fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
@@ -14,14 +14,6 @@ _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,"
@@ -32,7 +24,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 "
@@ -83,13 +75,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."
@@ -102,7 +94,7 @@ _showRestoreOptions() {
            echo ":: Installation canceled."
            exit
        fi
-        if [ "$confirmrestore" == "Change restore" ]; then
+        if [ "$confirmrestore" == "Change restore" ]; then 
            echo ""
            _showRestoreOptions
        else
@@ -143,11 +135,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
@@ -161,19 +153,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/
@@ -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
+}
@@ -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
+}
@@ -1,19 +0,0 @@
-# ------------------------------------------------------
-# 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
@@ -1,26 +0,0 @@
-# ------------------------------------------------------
-# 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
@@ -1 +1 @@
-2.9.1.1
+2.9.1.2
@@ -1 +1 @@
-2911
+2912
@@ -1,80 +0,0 @@
-# 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
@@ -1,62 +0,0 @@
-# ---------------------------------------------------
-# 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
@@ -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
 --------------------------------------------------------
@@ -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...
@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0

 [font.normal]
 family = "FiraCode Nerd Font"
@@ -1 +1 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Bibata-Modern-Ice 32
@@ -9,4 +9,3 @@ 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
@@ -0,0 +1,6 @@
+xwayland {
+  force_zero_scaling = true
+}
+
+env = GDK_SCALE,2
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
@@ -7,90 +7,88 @@
 $mainMod = SUPER

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

 # Windows
-bind = $mainMod, Q, killactive
-bind = $mainMod, F, fullscreen
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
-bind = $mainMod, T, togglefloating
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
-bind = $mainMod, J, togglesplit
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-bind = $mainMod SHIFT, right, resizeactive, 100 0
-bind = $mainMod SHIFT, left, resizeactive, -100 0
-bind = $mainMod SHIFT, up, resizeactive, 0 -100
-bind = $mainMod SHIFT, down, resizeactive, 0 100
-bind = $mainMod, G, togglegroup
+bind = $mainMod, Q, killactive # Kill active window
+bind = $mainMod, F, fullscreen # Set active window to fullscreen
+bind = $mainMod, T, togglefloating # Toggle active windows into floating mode
+bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh # Toggle all windows into floating mode
+bind = $mainMod, J, togglesplit # Toggle split
+bind = $mainMod, left, movefocus, l # Move focus left
+bind = $mainMod, right, movefocus, r # Move focus right
+bind = $mainMod, up, movefocus, u # Move focus up
+bind = $mainMod, down, movefocus, d # Move focus down
+bindm = $mainMod, mouse:272, movewindow # Move window with the mouse
+bindm = $mainMod, mouse:273, resizewindow # Resize window with the mouse
+bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
+bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
+bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
+bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
+bind = $mainMod, G, togglegroup # Toggle window group

 # Actions
-bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh
-bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
-bind = $mainMod CTRL, Q, exec, wlogout
-bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
-bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
-bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
-bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
-bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
-bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
-bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
-bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
-bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
-bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
-bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
-bind = $mainMod CTRL, P, exec, hyprpicker -a
-bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
-bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh
+bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh # Toggle animations
+bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh # Take a screenshot
+bind = $mainMod CTRL, Q, exec, wlogout # Start wlogout
+bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh # Change the wallpaper
+bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select # Open wallpaper selector
+bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i # Open application launcher
+bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh # Show keybindings
+bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh # Reload waybar
+bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh # Toggle waybar
+bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh # Reload hyprland config
+bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh # Open clipboard manager
+bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh # Open waybar theme switcher
+bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh # Toggle screenshader
+bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh # Toggle game mode

 # Workspaces
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-bind = $mainMod CTRL, down, workspace, empty
-
-# 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
+bind = $mainMod, 1, workspace, 1 # Open workspace 1
+bind = $mainMod, 2, workspace, 2 # Open workspace 2
+bind = $mainMod, 3, workspace, 3 # Open workspace 3
+bind = $mainMod, 4, workspace, 4 # Open workspace 4
+bind = $mainMod, 5, workspace, 5 # Open workspace 5
+bind = $mainMod, 6, workspace, 6 # Open workspace 6
+bind = $mainMod, 7, workspace, 7 # Open workspace 7
+bind = $mainMod, 8, workspace, 8 # Open workspace 8
+bind = $mainMod, 9, workspace, 9 # Open workspace 9
+bind = $mainMod, 0, workspace, 10 # Open workspace 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1 # Move active window to workspace 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2 # Move active window to workspace 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3 # Move active window to workspace 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4 # Move active window to workspace 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5 # Move active window to workspace 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6 # Move active window to workspace 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7 # Move active window to workspace 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8 # Move active window to workspace 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9 # Move active window to workspace 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Move active window to workspace 10
+bind = $mainMod, mouse_down, workspace, e+1 # Open next workspace
+bind = $mainMod, mouse_up, workspace, e-1 # Open previous workspace
+bind = $mainMod CTRL, down, workspace, empty # Open the next empty workspace

 # Passthrough SUPER KEY to Virtual Machine
-bind = $mainMod, P, submap, passthru
+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
+
@@ -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 = size 700 600,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = center,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = float,class:(com.ml4w.hyprland.settings)
+windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
+windowrulev2 = center,class:(com.ml4w.hyprland.settings)

 windowrulev2 = float,class:(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
-
@@ -0,0 +1,6 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=,preferred,auto,2
@@ -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
@@ -7,13 +7,18 @@
 #

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

-# ----------------------------------------------------- 
-# Parse keybindings
-# ----------------------------------------------------- 
-keybinds=$(grep -oP '(?<=bind = ).*' $config_file)
-keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'| sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g')
-# ----------------------------------------------------- 
-# Show keybindings in rofi
-# ----------------------------------------------------- 
+keybinds=""
+
+# Detect Start String
+while read -r line
+do
+    if [[ "$line" == "bind"* ]]; then
+
+        line="$(echo "$line" | sed 's/$mainMod/SUPER/g')"
+        line="$(echo "$line" | sed 's/bind = //g')"
+        line="$(echo "$line" | sed 's/bindm = //g')"
+
+        IFS='#' 
+        read -a strarr <<<"$line" 
+        kb_str=${strarr[0]}
+        cm_str=${strarr[1]}
+
+        IFS=',' 
+        read -a kbarr <<<"$kb_str" 
+
+        item="${kbarr[0]}  + ${kbarr[1]}"$'\r'"${cm_str:1}"
+        keybinds=$keybinds$item$'\n'
+    fi 
+done < "$config_file"
+
 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"
@@ -14,10 +14,11 @@ 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"
+options="$option2\n$option3\n$option4"

-choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 2 -width 30 -p "Take Screenshot")
+choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 3 -width 30 -p "Take Screenshot")

 case $choice in
    $option2)
@@ -33,4 +34,12 @@ case $choice in
        notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
        swappy -f "$DIR$NAME"
    ;;
-esac
+    $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
@@ -61,6 +61,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,7 +77,6 @@ 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
@@ -31,3 +31,13 @@ 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
@@ -151,10 +151,11 @@ listview {
    spacing:                      10px;
    padding:                      10px;
    margin:                       0px;
-    fixed-height:                true;
-    fixed-columns:               true;    
+    fixed-height:                 true;
+    fixed-columns:                true;    
    background-color:             @background;
    border:                       0px;
+    flow:                         horizontal;      
 }

 /* ---- Element ---- */
@@ -11,6 +11,8 @@
 {
    // 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,
@@ -138,14 +140,14 @@
    "custom/filemanager": {
        "format": "",
        "on-click": "~/dotfiles/.settings/filemanager.sh",
-        "tooltip-format": "Open the filemanager"
+        "tooltip-format": "Open filemanager"
    },

    // Browser Launcher
    "custom/browser": {
        "format": "",
        "on-click": "~/dotfiles/.settings/browser.sh",
-        "tooltip-format": "Open the browser"
+        "tooltip-format": "Open browser"
    },    

    // ChatGPT Launcher
@@ -159,7 +161,7 @@
    "custom/calculator": {
        "format": "",
        "on-click": "qalculate-gtk",
-        "tooltip": false
+        "tooltip-format": "Open calculator"
    },

    // Windows VM
Author	SHA1	Message	Date
wyj	4b9e7c6175	fix: rm cursor size in hidpi.sh	2024-08-27 16:49:29 -04:00
wyj	eb2d78da76	fix: set cursor size to 32, so x and way looks same	2024-08-27 16:48:04 -04:00
wyj	186fee59c8	fix: use QT_AUTO_SCREEN_SCALE_FACTOR	2024-08-14 19:43:48 -04:00
wyj	f631af1696	update: rm GTK_SCALE_FACTOR in default	2024-06-29 18:20:38 -04:00
wyj	13750bb854	Merge branch 'upstream-main' into upstream-hidpi	2024-06-13 21:27:55 -04:00
wyj	fa96759ddf	update: change hyprcursor size to 32 if hidpi	2024-06-12 23:26:06 -04:00
wyj	ea854b83e6	update: hidpi move to hyprland.conf	2024-06-12 23:15:23 -04:00
Stephan Raabe	95ff240509	Updates	2024-06-12 13:02:08 +02:00
Stephan Raabe	d6fce7ecd3	Updates	2024-06-12 13:00:40 +02:00
Stephan Raabe	44b52eecb4	Updates	2024-06-12 12:32:03 +02:00
Stephan Raabe	fc346fe68d	Updates	2024-06-12 10:20:13 +02:00
Stephan Raabe	0a6879e9ab	Updates	2024-06-12 07:26:20 +02:00
Stephan Raabe	e5fbdb7de0	Updates	2024-06-09 15:33:11 +02:00
Stephan Raabe	26f42750d7	Updates	2024-06-07 22:07:10 +02:00
Stephan Raabe	e6c2420ef4	Updates	2024-06-07 21:25:01 +02:00
Stephan Raabe	338f34b28d	Updates	2024-06-07 20:53:47 +02:00
Stephan Raabe	972d49978c	Updates	2024-06-05 17:05:48 +02:00
wyj	36764c77b3	Merge branch 'upstream-main' into upstream-hidpi	2024-06-05 05:51:38 -04:00
Stephan Raabe	41b6b496c1	Updates	2024-06-05 10:40:53 +02:00
Stephan Raabe	7f945d3143	Updates	2024-06-05 08:55:24 +02:00
wyj	8828e93f78	update: add an empty line in custum.conf	2024-05-26 01:26:57 -04:00
wyj	c99a2809ce	fix: hidpi.sh	2024-05-18 16:28:58 -04:00
wyj	08096e83ff	update: font size=16 for alacritty	2024-05-17 02:09:53 -04:00
wyj	a0f43ada10	fix: patch in ~/dotfiles-versions rather than in repository	2024-05-17 01:46:29 -04:00
wyj	b4a5e4d99c	Merge branch 'upstream-main' into upstream-hidpi	2024-05-05 16:34:49 -04:00
wyj	45214117ef	Merge remote-tracking branch 'upstream/main' into upstream-hidpi	2024-04-03 14:22:34 -04:00
wyj	0d4b85956e	fix: sed need -E	2024-04-01 15:42:06 -04:00
wyj	8565146242	update: change the non-hidpi default font size in alacritty	2024-04-01 15:00:34 -04:00
wyj	d2a368d166	fix hidpi.sh: echo -e	2024-03-28 20:46:48 -04:00
wyj	c6678dcc96	update hidpi.sh: add finish output	2024-03-28 20:46:48 -04:00
wyj	b6156e3233	fix hidpi.sh	2024-03-28 20:46:48 -04:00
wyj	0da2e83f29	fix hidpi.sh: -i instead of -E	2024-03-28 20:46:48 -04:00
wyj	9f8b285ba3	update hidpi.sh: run always	2024-03-28 20:46:48 -04:00
wyj	671a47f09e	fix bug: missing fi	2024-03-28 20:46:48 -04:00
wyj	943cb53c93	add hidpi in install.sh	2024-03-28 01:45:39 -04:00
wyj	c3bfe46e79	add basic hidpi	2024-03-27 23:17:46 -04:00
@@ -1 +1 @@
 .9.1.1
 .9.1.2