fix: rm cursor size in hidpi.sh

.install/fish.sh

@@ -1,6 +0,0 @@
-# ------------------------------------------------------
-# 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/restore.sh

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

.install/zsh.sh

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

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

@@ -1,88 +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='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

@@ -1,64 +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
-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 +1 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Bibata-Modern-Ice 32

hypr/conf/environments/default.conf

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

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

install.sh

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