135 Commits

Author SHA1 Message Date
5834ec1cdc new: add mpv conf 2025-04-13 17:39:16 -04:00
0bb1ffcaf5 update: kitty Fira Code features 2025-04-11 18:36:07 -04:00
a816200bef update: add kitty cursor trail 2025-03-25 15:06:35 -04:00
3a0197c7ba update: blur waybar 2025-03-20 20:01:56 -04:00
59524e3679 update: use hyprpolkitagent instead 2025-03-20 19:58:17 -04:00
2bedd28e12 Merge branch 'upstream-custom' into dev 2025-03-11 23:04:41 -04:00
11092da765 Merge branch 'upstream-custom' into dev 2024-12-15 02:16:05 -05:00
5b060cfe7f Merge branch 'upstream-custom' into dev 2024-11-13 14:18:07 -05:00
2b53e15823 Merge branch 'upstream-custom' into dev 2024-09-01 08:20:04 -04:00
cd5cb4dd8e Merge branch 'upstream-custom' into dev 2024-08-29 01:18:09 -04:00
844d08e054 Merge branch 'upstream-custom' into dev 2024-08-27 22:02:20 -04:00
628fe88f2a Merge branches 'upstream-custom' and 'upstream-hidpi' into dev 2024-08-27 16:51:15 -04:00
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
38266dbf8e update: events module 2024-08-27 13:42:14 -04:00
eff1f37c03 Merge branch 'upstream-custom' into dev 2024-08-27 10:56:13 -04:00
c69e13853c Merge branch 'upstream-custom' into dev 2024-08-26 11:45:21 -04:00
abef5c5f00 Merge branches 'upstream-custom' and 'zshfish' into dev 2024-08-25 10:39:37 -04:00
f176886688 fix: install ohmyzsh only if haven't 2024-08-25 10:39:27 -04:00
0c738fdb67 fix: add powerlevel10k install 2024-08-21 21:03:13 -04:00
526979a9f9 fix: alsp fix kitten ssh in zinit 2024-08-18 00:23:22 -04:00
c3152df74a Merge branch 'upstream-hidpi' into dev 2024-08-14 19:44:07 -04:00
186fee59c8 fix: use QT_AUTO_SCREEN_SCALE_FACTOR 2024-08-14 19:43:48 -04:00
af346ac91d Merge branch 'upstream-custom' into dev 2024-08-11 15:01:34 -04:00
b192333e01 Merge branches 'upstream-custom', 'upstream-hidpi', 'fcitx5' and 'zshfish' into dev 2024-08-11 01:45:14 -04:00
adab24d93f update: zshrc 2024-08-11 01:44:58 -04:00
998a22b553 update: update fastfetch config 2024-07-29 01:28:09 -04:00
f631af1696 update: rm GTK_SCALE_FACTOR in default 2024-06-29 18:20:38 -04:00
7692ad3c41 update: add QT_IM_MODULE=fcitx env 2024-06-16 01:57:22 -04:00
67e2505545 Merge branch 'upstream-custom' into dev 2024-06-15 23:08:53 -04:00
5ce679affd Merge branch 'zshfish' into dev 2024-06-13 21:30:12 -04:00
93eea9a463 Merge branch 'fcitx5' into dev 2024-06-13 21:29:56 -04:00
26c68b27ac Merge branch 'upstream-hidpi' into dev 2024-06-13 21:29:43 -04:00
198a1cd956 Merge branch 'upstream-custom' into dev 2024-06-13 21:29:27 -04:00
d5051c5c96 Merge branch 'upstream-main' into zshfish 2024-06-13 21:29:08 -04:00
d3277bd7fc Merge branch 'upstream-main' into fcitx5 2024-06-13 21:28:51 -04:00
13750bb854 Merge branch 'upstream-main' into upstream-hidpi 2024-06-13 21:27:55 -04:00
c37f2e2040 Merge branches 'upstream-custom' and 'upstream-hidpi' into dev 2024-06-12 23:26:20 -04:00
fa96759ddf update: change hyprcursor size to 32 if hidpi 2024-06-12 23:26:06 -04:00
0746e2ab13 Merge branch 'upstream-hidpi' into dev 2024-06-12 23:16:31 -04:00
ea854b83e6 update: hidpi move to hyprland.conf 2024-06-12 23:15:23 -04:00
08ee7cf4dc Merge branch 'upstream-custom' into dev 2024-06-10 18:14:58 -04:00
60e96faf42 Merge branch 'upstream-custom' into dev 2024-06-09 20:29:19 -04:00
27b802d4a0 Merge branch 'zshfish' into dev 2024-06-07 04:35:28 -04:00
6c3bef60c6 fix: fix 2024-06-07 04:35:16 -04:00
ea979c58a4 Merge branch 'zshfish' into dev 2024-06-07 04:14:16 -04:00
ce02d5357b fix: fix 2024-06-07 04:14:05 -04:00
6b4977e52a Merge branch 'zshfish' into dev 2024-06-07 04:08:56 -04:00
113c023b3c fix: fix 2024-06-07 04:08:43 -04:00
f88efba29e Merge branch 'zshfish' into dev 2024-06-07 04:05:52 -04:00
f85d049cbd fix: fix 2024-06-07 04:05:41 -04:00
12a4ccbc13 Merge branches 'upstream-custom' and 'zshfish' into dev 2024-06-07 03:09:40 -04:00
49fd73e67b update: add choice between oh my zsh and zinit 2024-06-07 03:09:21 -04:00
16a504966c feat: complete done zsh install and swith to zinit 2024-06-07 01:04:42 -04:00
6e5fed1913 Merge branch 'upstream-custom' into dev 2024-06-06 01:03:16 -04:00
5ad9e37759 Merge branch 'upstream-custom' into dev 2024-06-06 00:59:44 -04:00
35c4cf74d2 Merge branch 'zshfish' into dev 2024-06-05 05:57:46 -04:00
04496cb334 Merge branch 'fcitx5' into dev 2024-06-05 05:57:40 -04:00
7e5feec5e0 Merge branch 'upstream-hidpi' into dev 2024-06-05 05:57:32 -04:00
72a185c97e Merge branch 'upstream-custom' into dev 2024-06-05 05:57:18 -04:00
36764c77b3 Merge branch 'upstream-main' into upstream-hidpi 2024-06-05 05:51:38 -04:00
a23f49bcaf Merge branch 'upstream-main' into zshfish 2024-06-05 05:51:09 -04:00
c2d2d45546 Merge branch 'upstream-main' into fcitx5 2024-06-05 05:50:50 -04:00
1331fab4fb Merge branch 'upstream-custom' into dev 2024-06-04 16:52:47 -04:00
0a4d1b5a6a Merge branch 'upstream-custom' into dev 2024-05-28 16:20:13 -04:00
60fc0572f0 Merge branch 'upstream-custom' into dev 2024-05-28 15:13:02 -04:00
2b45dd70d5 Merge branch 'upstream-custom' into dev 2024-05-28 02:19:43 -04:00
b6507b5b36 Merge branch 'upstream-custom' into dev 2024-05-27 03:37:54 -04:00
dc31d31fb0 Merge branch 'upstream-custom' into dev 2024-05-27 00:28:16 -04:00
9971614a64 update: add laptop touchpad and gestures 2024-05-26 19:20:39 -04:00
308cf54c19 Merge branch 'upstream-custom' into dev 2024-05-26 19:08:43 -04:00
a6ee6ced28 Merge branch 'upstream-custom' into dev 2024-05-26 18:34:53 -04:00
1f63a28eeb Merge branch 'upstream-custom' into dev 2024-05-26 02:54:37 -04:00
967c5bbc57 update: remove pfetch 2024-05-26 02:06:39 -04:00
ca4b934dcf update: change cursor to vimix 2024-05-26 02:05:37 -04:00
507143360d Merge branch 'upstream-custom' into dev 2024-05-26 01:59:43 -04:00
23467523ed Merge branches 'upstream-hidpi' and 'upstream-custom' into dev 2024-05-26 01:48:19 -04:00
8828e93f78 update: add an empty line in custum.conf 2024-05-26 01:26:57 -04:00
50e0fca95c Merge branch 'upstream-custom' into dev 2024-05-26 01:18:34 -04:00
6a943e7e61 Merge branch 'upstream-custom' into dev 2024-05-26 00:53:54 -04:00
2a649838a4 Merge branch 'upstream-custom' into dev 2024-05-23 18:21:10 -04:00
9f9ea20ee3 Merge branches 'upstream-custom' and 'zshfish' into dev 2024-05-22 00:13:06 -04:00
bc37c0e612 Merge branch 'upstream-custom' into dev 2024-05-21 19:17:57 -04:00
d9bdf7e748 feat: add .zshrc 2024-05-20 23:01:49 -04:00
567a892f8b Merge branch 'upstream-hidpi' into dev 2024-05-18 16:29:10 -04:00
c99a2809ce fix: hidpi.sh 2024-05-18 16:28:58 -04:00
23f8294d48 Merge branch 'upstream-custom' into dev 2024-05-18 00:47:50 -04:00
63a3e3e222 Merge branch 'upstream-hidpi' into dev 2024-05-17 02:10:30 -04:00
08096e83ff update: font size=16 for alacritty 2024-05-17 02:09:53 -04:00
89623ce4f3 Merge branch 'upstream-hidpi' into dev 2024-05-17 01:59:09 -04:00
a0f43ada10 fix: patch in ~/dotfiles-versions rather than in repository 2024-05-17 01:46:29 -04:00
8503665117 Merge branch 'upstream-custom' into dev 2024-05-10 17:05:22 -04:00
3dac8139fe Merge branch 'upstream-custom' into dev 2024-05-10 17:03:13 -04:00
1e6940e88d Merge branch 'upstream-custom' into dev 2024-05-08 01:57:08 -04:00
90c646a8fe Merge branches 'upstream-hidpi' and 'upstream-custom' into dev 2024-05-05 16:41:45 -04:00
b4a5e4d99c Merge branch 'upstream-main' into upstream-hidpi 2024-05-05 16:34:49 -04:00
5c3bb19b01 Merge branch 'upstream-custom' into dev 2024-04-19 14:43:44 -04:00
8f7e902f81 Merge branch 'upstream-custom' into dev 2024-04-19 02:49:05 -04:00
3c8149ed0b Merge branch 'upstream-custom' into dev 2024-04-15 19:53:45 -04:00
c7fbe7c7f5 Merge branch 'upstream-custom' into dev 2024-04-15 13:18:02 -04:00
cc4a4fb1c0 Merge branch 'upstream-custom' into dev 2024-04-05 16:20:49 -04:00
056ffe440f Merge branch 'fcitx5' into dev 2024-04-05 16:13:32 -04:00
b9025fbfb1 fix: fcitx5 conf 2024-04-05 16:13:19 -04:00
d7a50ce2fe Merge branch 'fcitx5' into dev 2024-04-05 16:07:49 -04:00
7a4d9f7b21 fix: fcitx5 conf 2024-04-05 16:07:36 -04:00
2c3ff9e10d Merge branch 'fcitx5' into dev 2024-04-05 15:50:17 -04:00
249e71d187 fix: fcitx5 conf 2024-04-05 15:50:00 -04:00
48eab0a6ab Merge branch 'fcitx5' into dev 2024-04-05 15:31:39 -04:00
380b43ea30 new feat: fcitx5 install 2024-04-05 15:31:21 -04:00
607178e5a2 Merge branch 'upstream-custom' into dev 2024-04-05 02:59:58 -04:00
71a63edafa Merge branch 'upstream-custom' into dev 2024-04-05 01:34:01 -04:00
091bbbfb1a Merge branch 'upstream-custom' into dev 2024-04-04 22:12:38 -04:00
f058ea58f7 Merge branch 'upstream-custom' into dev 2024-04-04 04:45:50 -04:00
6a9270c276 Merge branch 'upstream-custom' into dev 2024-04-04 03:17:46 -04:00
58966c14c8 Merge branch 'upstream-custom' into dev 2024-04-03 23:52:20 -04:00
d2b6c0adcc Merge branch 'upstream-custom' into dev 2024-04-03 17:32:04 -04:00
75759b18c3 Merge branch 'upstream-custom' into dev 2024-04-03 14:34:51 -04:00
a1f6438b3c Merge branch 'upstream-custom' into dev 2024-04-03 14:29:21 -04:00
87b7bed3fe Merge branches 'upstream-hidpi' and 'upstream-custom' into dev 2024-04-03 14:23:18 -04:00
45214117ef Merge remote-tracking branch 'upstream/main' into upstream-hidpi 2024-04-03 14:22:34 -04:00
07c38a02b5 Merge branch 'upstream-custom' into dev 2024-04-03 14:19:44 -04:00
fdbd7de334 Merge branch 'upstream-hidpi' into dev 2024-04-01 15:42:28 -04:00
0d4b85956e fix: sed need -E 2024-04-01 15:42:06 -04:00
059396985d Merge branch 'upstream-hidpi' into dev 2024-04-01 15:01:02 -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
51a350c544 Merge branch 'upstream-custom' into dev 2024-03-28 19:30:46 -04:00
d28d59b6b8 Merge branch 'upstream-hidpi' into dev
merge hidpi support
2024-03-28 13:05:00 -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
23 changed files with 2201 additions and 46 deletions

24
.install/fcitx5.sh Normal file
View 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
View File

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

@@ -4,6 +4,7 @@ packagesPacman=(
"hyprlock"
"hypridle"
# "xdg-desktop-portal-hyprland"
"hyprpolkitagent"
"waybar"
"grim"
"slurp"

View File

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

1718
.p10k.zsh Normal file

File diff suppressed because it is too large Load Diff

88
.zshrc_ohmyzsh Normal file
View 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
View 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

View File

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

View File

@@ -6,7 +6,7 @@
exec-once = ~/dotfiles/hypr/scripts/xdg.sh
# Start Polkit
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec-once = systemctl --user start hyprpolkitagent
# Load Dunst Notification Manager
exec-once = dunst

View File

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

View File

@@ -12,7 +12,6 @@ decoration {
new_optimizations = on
ignore_opacity = true
xray = false
blurls = waybar
}
active_opacity = 1.0
inactive_opacity = 0.8

View File

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

@@ -13,6 +13,7 @@ windowrule = float,^(showmethekey-gtk)$
windowrule = pin,^(showmethekey-gtk)$
layerrule = blur, gtk-layer-shell
layerrule = blur, logout_dialog
layerrule = blur, waybar
windowrule = float,title:^(Mathematica)$
windowrule = opacity 0.75, ^(Code)$

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

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

View File

@@ -1,9 +1,18 @@
font_family Fira Code Nerd Font
# Maple
#font_family Maple Mono NF CN
# end Maple
# Fica Code
font_family FiraCode Nerd Font
font_features FiraCodeNF-Reg +cv01 +cv02 +cv06 +cv31 +zero +cv30
font_features FiraCodeNF-SemBd +cv01 +cv02 +cv06 +cv31 +zero
# end Fira Code
font_size 16.0
bold_font auto
italic_font auto
bold_italic_font auto
cursor_trail 10
background_opacity 0.7
confirm_os_window_close 0

148
mpv/mpv.conf Normal file
View File

@@ -0,0 +1,148 @@
#
# Example mpv configuration file
#
# Warning:
#
# The commented example options usually do _not_ set the default values. Call
# mpv with --list-options to see the default values for most options. There is
# no builtin or example mpv.conf with all the defaults.
#
#
# Configuration files are read system-wide from /etc/mpv or /usr/local/etc/mpv,
# and per-user from ~/.config/mpv, where per-user settings override
# system-wide settings, all of which are overridden by the command line.
#
# Configuration file settings and the command line options use the same
# underlying mechanisms. Most options can be put into the configuration file
# by dropping the preceding '--'. See the man page for a complete list of
# options.
#
# Lines starting with '#' are comments and are ignored.
#
# See the CONFIGURATION FILES section in the man page
# for a detailed description of the syntax.
#
# Profiles should be placed at the bottom of the configuration file to ensure
# that settings wanted as defaults are not restricted to specific profiles.
##################
# video settings #
##################
# Start in fullscreen mode by default.
#fs=yes
# force starting with centered window
#geometry=50%:50%
# don't allow a new window to have a size larger than 90% of the screen size
#autofit-larger=90%x90%
# Do not close the window on exit.
#keep-open=yes
# Do not wait with showing the video window until it has loaded. (This will
# resize the window once video is loaded. Also always shows a window with
# audio.)
#force-window=immediate
# Disable the On Screen Controller (OSC).
#osc=no
# Keep the player window on top of all other windows.
#ontop=yes
# Specify fast video rendering preset (for --vo=<gpu|gpu-next> only)
# Recommended for mobile devices or older hardware with limited processing power
#profile=fast
# Specify high quality video rendering preset (for --vo=<gpu|gpu-next> only)
# Offers superior image fidelity and visual quality for an enhanced viewing
# experience on capable hardware
#profile=high-quality
# Force video to lock on the display's refresh rate, and change video and audio
# speed to some degree to ensure synchronous playback - can cause problems
# with some drivers and desktop environments.
#video-sync=display-resample
# Enable hardware decoding if available. Often, this does not work with all
# video outputs, but should work well with default settings on most systems.
# If performance or energy usage is an issue, forcing the vdpau or vaapi VOs
# may or may not help.
#hwdec=auto
##################
# audio settings #
##################
# Specify default audio device. You can list devices with: --audio-device=help
# The option takes the device string (the stuff between the '...').
#audio-device=alsa/default
# Do not filter audio to keep pitch when changing playback speed.
#audio-pitch-correction=no
# Output 5.1 audio natively, and upmix/downmix audio with a different format.
#audio-channels=5.1
# Disable any automatic remix, _if_ the audio output accepts the audio format.
# of the currently played file. See caveats mentioned in the manpage.
# (The default is "auto-safe", see manpage.)
#audio-channels=auto
##################
# other settings #
##################
autocreate-playlist=same
pause
directory-mode=ignore
# Pretend to be a web browser. Might fix playback with some streaming sites,
# but also will break with shoutcast streams.
#user-agent="Mozilla/5.0"
# cache settings
#
# Use a large seekable RAM cache even for local input.
#cache=yes
#
# Use extra large RAM cache (needs cache=yes to make it useful).
#demuxer-max-bytes=500M
#demuxer-max-back-bytes=100M
#
# Disable the behavior that the player will pause if the cache goes below a
# certain fill size.
#cache-pause=no
#
# Store cache payload on the hard disk instead of in RAM. (This may negatively
# impact performance unless used for slow input such as network.)
#cache-dir=~/.cache/
#cache-on-disk=yes
# Display English subtitles if available.
#slang=en
slang=zh,en
# Play Finnish audio if available, fall back to English otherwise.
#alang=fi,en
# Change subtitle encoding. For Arabic subtitles use 'cp1256'.
# If the file seems to be valid UTF-8, prefer UTF-8.
# (You can add '+' in front of the codepage to force it.)
#sub-codepage=cp1256
# You can also include other configuration files.
#include=/path/to/the/file/you/want/to/include
############
# Profiles #
############
# The options declared as part of profiles override global default settings,
# but only take effect when the profile is active.
# The following profile can be enabled on the command line with: --profile=eye-cancer
#[eye-cancer]
#sharpen=5