update: windowrules for code and wolfram

Reviewed-on: https://gitea.phywyj.dynv6.net/wyj/Hyprland-dotfiles/pulls/4

.gitmodules

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

.install/fcitx5.sh

@@ -0,0 +1,24 @@
+# ------------------------------------------------------
+# Select fcitx5 or not
+# ------------------------------------------------------
+echo -e "${GREEN}"
+figlet "fcitx5"
+echo -e "${NONE}"
+
+if gum confirm "Do you want to install fcitx5 and chinese input method?" ;then
+    packagesPacman=(
+        "fcitx5"
+        "fcitx5-chinese-addons"
+        "fcitx5-configtool"
+        "fcitx5-gtk"
+        "fcitx5-qt"
+    );
+    packagesYay=(
+        "fcitx5-skin-seasons"
+    );
+    source .install/install-packages.sh
+    echo -e "\n# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "# fcitx5 support" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "source = ~/dotfiles/hypr/conf/fcitx5.conf" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+fi

.install/fish.sh

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

.install/hidpi.sh

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

.install/packages/general-packages.sh

@@ -47,8 +47,6 @@ packagesPacman=(
     "jq"
     "rofi-wayland"
     "fastfetch"
-    "pipewire-pulse"
-    "wireplumber"
 );
 
 packagesYay=(

.install/restore.sh

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

.install/zsh.sh

@@ -0,0 +1,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

.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

alacritty/alacritty.toml

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

hypr/conf/cursor.conf

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

hypr/conf/decorations/low.conf

@@ -0,0 +1,31 @@
+# ----------------------------------------------------- 
+# General window decoration
+# name: "Low"
+# ----------------------------------------------------- 
+
+decoration {
+    rounding = 10
+    blur {
+        enabled = true
+        size = 10
+        passes = 1
+        new_optimizations = on
+        ignore_opacity = true
+        xray = true 
+        blurls = waybar
+    }
+    active_opacity = 1.0
+    inactive_opacity = 0.8
+    fullscreen_opacity = 1.0
+
+    shadow {
+        enabled = false
+        range = 20
+        render_power = 3
+        color = 0x66000000
+    }
+    #drop_shadow = true
+    #shadow_range = 30
+    #shadow_render_power = 3
+    #col.shadow = 0x66000000
+}

hypr/conf/environments/default.conf

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

hypr/conf/fcitx5.conf

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

hypr/conf/hidpi.conf

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

hypr/conf/monitors/4k.conf

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

hypr/conf/windowrules/custom.conf

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

hypr/hyprland.conf

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

install.sh

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

waybar/launch.sh

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

yazi/flavors/catppuccin-mocha.yazi/LICENSE

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

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

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

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

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

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

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

yazi/theme.toml

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

yazi/yazi.toml

@@ -1,25 +0,0 @@
-[manager]
-ratio          = [ 1, 3, 3 ]
-sort_by        = "natural"
-
-[preview]
-max_width       = 1900
-max_height      = 900
-
-[open]
-rules = [
-    { name = "*/", use = [ "edit", "open", "reveal" ] },
-
-    { mime = "text/*",          use = [ "edit", "reveal" ] },
-    { mime = "image/*",         use = [ "open", "reveal" ] },
-    { mime = "{audio,video}/*", use = [ "play", "reveal" ] },
-    { mime = "inode/x-empty",   use = [ "edit", "reveal" ] },
-
-    { mime = "application/{,g}zip", use = [ "extract", "reveal" ] },
-    { mime = "application/x-{tar,bzip*,7z-compressed,xz,rar}", use = [ "extract", "reveal" ] },
-
-    { mime = "application/{json,x-ndjson}", use = [ "edit", "reveal" ] },
-    { mime = "*/javascript", use = [ "edit", "reveal" ] },
-
-    { name = "*", use = [ "open", "reveal" ] },
-]