24 Commits

Author SHA1 Message Date
4b9e7c6175 fix: rm cursor size in hidpi.sh 2024-08-27 16:49:29 -04:00
eb2d78da76 fix: set cursor size to 32, so x and way looks same 2024-08-27 16:48:04 -04:00
186fee59c8 fix: use QT_AUTO_SCREEN_SCALE_FACTOR 2024-08-14 19:43:48 -04:00
f631af1696 update: rm GTK_SCALE_FACTOR in default 2024-06-29 18:20:38 -04:00
13750bb854 Merge branch 'upstream-main' into upstream-hidpi 2024-06-13 21:27:55 -04:00
fa96759ddf update: change hyprcursor size to 32 if hidpi 2024-06-12 23:26:06 -04:00
ea854b83e6 update: hidpi move to hyprland.conf 2024-06-12 23:15:23 -04:00
36764c77b3 Merge branch 'upstream-main' into upstream-hidpi 2024-06-05 05:51:38 -04:00
8828e93f78 update: add an empty line in custum.conf 2024-05-26 01:26:57 -04:00
c99a2809ce fix: hidpi.sh 2024-05-18 16:28:58 -04:00
08096e83ff update: font size=16 for alacritty 2024-05-17 02:09:53 -04:00
a0f43ada10 fix: patch in ~/dotfiles-versions rather than in repository 2024-05-17 01:46:29 -04:00
b4a5e4d99c Merge branch 'upstream-main' into upstream-hidpi 2024-05-05 16:34:49 -04:00
45214117ef Merge remote-tracking branch 'upstream/main' into upstream-hidpi 2024-04-03 14:22:34 -04:00
0d4b85956e fix: sed need -E 2024-04-01 15:42:06 -04:00
8565146242 update: change the non-hidpi default font size in alacritty 2024-04-01 15:00:34 -04:00
d2a368d166 fix hidpi.sh: echo -e 2024-03-28 20:46:48 -04:00
c6678dcc96 update hidpi.sh: add finish output 2024-03-28 20:46:48 -04:00
b6156e3233 fix hidpi.sh 2024-03-28 20:46:48 -04:00
0da2e83f29 fix hidpi.sh: -i instead of -E 2024-03-28 20:46:48 -04:00
9f8b285ba3 update hidpi.sh: run always 2024-03-28 20:46:48 -04:00
671a47f09e fix bug: missing fi 2024-03-28 20:46:48 -04:00
943cb53c93 add hidpi in install.sh 2024-03-28 01:45:39 -04:00
c3bfe46e79 add basic hidpi 2024-03-27 23:17:46 -04:00
15 changed files with 76 additions and 1975 deletions

View File

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

21
.install/hidpi.sh Executable file
View File

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

View File

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

View File

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

View File

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

1718
.p10k.zsh

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

6
hypr/conf/hidpi.conf Normal file
View File

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

View File

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

View File

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

View File

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