Compare commits
143 Commits
upstream-c
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| ddd6287a42 | |||
| 18615d2f7d | |||
| e57fcf271b | |||
| 5b060cfe7f | |||
| 2b53e15823 | |||
| cd5cb4dd8e | |||
| 844d08e054 | |||
| 628fe88f2a | |||
| 4b9e7c6175 | |||
| eb2d78da76 | |||
| 38266dbf8e | |||
| eff1f37c03 | |||
| c69e13853c | |||
| abef5c5f00 | |||
| f176886688 | |||
| 0c738fdb67 | |||
| 526979a9f9 | |||
| c3152df74a | |||
| 186fee59c8 | |||
| af346ac91d | |||
| b192333e01 | |||
| adab24d93f | |||
| 998a22b553 | |||
| f631af1696 | |||
| 7692ad3c41 | |||
| 67e2505545 | |||
| 5ce679affd | |||
| 93eea9a463 | |||
| 26c68b27ac | |||
| 198a1cd956 | |||
| d5051c5c96 | |||
| d3277bd7fc | |||
| 13750bb854 | |||
| c37f2e2040 | |||
| fa96759ddf | |||
| 0746e2ab13 | |||
| ea854b83e6 | |||
| 08ee7cf4dc | |||
| 60e96faf42 | |||
| 27b802d4a0 | |||
| 6c3bef60c6 | |||
| ea979c58a4 | |||
| ce02d5357b | |||
| 6b4977e52a | |||
| 113c023b3c | |||
| f88efba29e | |||
| f85d049cbd | |||
| 12a4ccbc13 | |||
| 49fd73e67b | |||
| 16a504966c | |||
| 6e5fed1913 | |||
| 5ad9e37759 | |||
| 35c4cf74d2 | |||
| 04496cb334 | |||
| 7e5feec5e0 | |||
| 72a185c97e | |||
| 36764c77b3 | |||
| a23f49bcaf | |||
| c2d2d45546 | |||
| 1331fab4fb | |||
| 0a4d1b5a6a | |||
| 60fc0572f0 | |||
| 2b45dd70d5 | |||
| b7e4196d08 | |||
| b6507b5b36 | |||
| 51d8386c6b | |||
| dc31d31fb0 | |||
| 9971614a64 | |||
| 308cf54c19 | |||
| a6ee6ced28 | |||
| 1f63a28eeb | |||
| 967c5bbc57 | |||
| ca4b934dcf | |||
| 507143360d | |||
| 23467523ed | |||
| 8828e93f78 | |||
| 50e0fca95c | |||
| 6a943e7e61 | |||
| 2a649838a4 | |||
| 9f9ea20ee3 | |||
| bc37c0e612 | |||
| d9bdf7e748 | |||
| 4bff4896ac | |||
| 567a892f8b | |||
| c99a2809ce | |||
| 23f8294d48 | |||
| 63a3e3e222 | |||
| 08096e83ff | |||
| 89623ce4f3 | |||
| a0f43ada10 | |||
| 8503665117 | |||
| 3dac8139fe | |||
| 1e6940e88d | |||
| 90c646a8fe | |||
| b4a5e4d99c | |||
| 5c3bb19b01 | |||
| 8f7e902f81 | |||
| 3c8149ed0b | |||
| c7fbe7c7f5 | |||
| cc4a4fb1c0 | |||
| 056ffe440f | |||
| b9025fbfb1 | |||
| d7a50ce2fe | |||
| 7a4d9f7b21 | |||
| 2c3ff9e10d | |||
| 249e71d187 | |||
| 48eab0a6ab | |||
| 380b43ea30 | |||
| 607178e5a2 | |||
| 71a63edafa | |||
| 8c701dfd6a | |||
| 091bbbfb1a | |||
| f058ea58f7 | |||
| 6a9270c276 | |||
| 58966c14c8 | |||
| 674a16acbd | |||
| d2b6c0adcc | |||
| 75759b18c3 | |||
| a1f6438b3c | |||
| 87b7bed3fe | |||
| 45214117ef | |||
| 07c38a02b5 | |||
| fdbd7de334 | |||
| 0d4b85956e | |||
| 5fe3fed2ea | |||
| 059396985d | |||
| 8565146242 | |||
| d2a368d166 | |||
| c6678dcc96 | |||
| b6156e3233 | |||
| 0da2e83f29 | |||
| 9f8b285ba3 | |||
| 671a47f09e | |||
| 51a350c544 | |||
| d28d59b6b8 | |||
| 2b1986edad | |||
| e6a80c8ad2 | |||
| e2d65b4c3c | |||
| 0f69f88603 | |||
| c63aa2430c | |||
| 259073e10f | |||
| 943cb53c93 | |||
| c3bfe46e79 |
24
.install/fcitx5.sh
Normal file
24
.install/fcitx5.sh
Normal file
@@ -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
|
||||
6
.install/fish.sh
Normal file
6
.install/fish.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
# ------------------------------------------------------
|
||||
# install fish
|
||||
# ------------------------------------------------------
|
||||
packagesPacman=("fish");
|
||||
packagesYay=();
|
||||
source .install/install-packages.sh
|
||||
21
.install/hidpi.sh
Executable file
21
.install/hidpi.sh
Executable 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
|
||||
@@ -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/
|
||||
|
||||
22
.install/zsh.sh
Normal file
22
.install/zsh.sh
Normal file
@@ -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 ~/
|
||||
25
.install/zshfish.sh
Normal file
25
.install/zshfish.sh
Normal file
@@ -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
|
||||
88
.zshrc_ohmyzsh
Normal file
88
.zshrc_ohmyzsh
Normal file
@@ -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
|
||||
64
.zshrc_zinit
Normal file
64
.zshrc_zinit
Normal file
@@ -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
|
||||
@@ -1,5 +1,5 @@
|
||||
[font]
|
||||
size = 12.0
|
||||
size = 16.0
|
||||
|
||||
[font.normal]
|
||||
family = "FiraCode Nerd Font"
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
exec-once = hyprctl setcursor Vimix-hyprcursors 24
|
||||
exec-once = hyprctl setcursor Vimix-hyprcursors 32
|
||||
env = HYPRCURSOR_THEME,Vimix-hyprcursors
|
||||
|
||||
31
hypr/conf/decorations/low.conf
Normal file
31
hypr/conf/decorations/low.conf
Normal file
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
|
||||
7
hypr/conf/fcitx5.conf
Normal file
7
hypr/conf/fcitx5.conf
Normal file
@@ -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
|
||||
6
hypr/conf/hidpi.conf
Normal file
6
hypr/conf/hidpi.conf
Normal file
@@ -0,0 +1,6 @@
|
||||
xwayland {
|
||||
force_zero_scaling = true
|
||||
}
|
||||
|
||||
env = GDK_SCALE,2
|
||||
env = QT_AUTO_SCREEN_SCALE_FACTOR,1
|
||||
6
hypr/conf/monitors/4k.conf
Normal file
6
hypr/conf/monitors/4k.conf
Normal file
@@ -0,0 +1,6 @@
|
||||
# -----------------------------------------------------
|
||||
# Monitor Setup
|
||||
# name: "Default"
|
||||
# -----------------------------------------------------
|
||||
|
||||
monitor=,preferred,auto,2
|
||||
@@ -14,9 +14,9 @@ windowrule = pin,^(showmethekey-gtk)$
|
||||
layerrule = blur, gtk-layer-shell
|
||||
layerrule = blur, logout_dialog
|
||||
|
||||
windowrule = float,title:^(Mathematica)$
|
||||
windowrule = opacity 0.75, ^(Code)$
|
||||
windowrule = opacity 0.75, ^(code-oss)$
|
||||
windowrule = float,title:^(Mathematica)$ # Mathematica<=14.1
|
||||
windowrule = float,title:^(WolframNB)$ # Mathematica>=14.2
|
||||
windowrule = opacity 0.75, ^(code)$
|
||||
windowrule = opacity 0.75, ^(code-url-handler)$
|
||||
windowrule = float,^(QQ)$
|
||||
windowrule = float,^(wechat)$
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user