Merge branches 'upstream-custom', 'upstream-hidpi', 'fcitx5' and 'zshfish' into dev

This commit is contained in:
2024-08-11 01:45:14 -04:00
168 changed files with 14138 additions and 60 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
env = XDG_SESSION_TYPE,wayland
env = XDG_SESSION_DESKTOP,Hyprland
env = QT_QPA_PLATFORM,wayland
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
+2
View File
@@ -3,3 +3,5 @@ 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
+3
View File
@@ -14,6 +14,9 @@ bind = $mainMod SHIFT, E, exec, emote
# Windows
bind = $mainMod, Q, killactive
bind = $mainMod, F, fullscreen
bind = $mainMod SHIFT, F, fullscreen, 1
bind = $mainMod CTRL SHIFT, F, fullscreen, 2
bind = $mainMod ALT, F, fakefullscreen
bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
bind = $mainMod, T, togglefloating
bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
+1 -1
View File
@@ -6,5 +6,5 @@ misc {
disable_hyprland_logo = true
disable_splash_rendering = true
enable_swallow = true
swallow_regex = ^(Alacritty)$
swallow_regex = ^(Alacritty|kitty|thunar)$
}
+1
View File
@@ -18,5 +18,6 @@ windowrule = float,title=^(Mathematica)$
windowrule = opacity 0.75, ^(Code)$
windowrule = opacity 0.75, ^(code-url-handler)$
windowrule = float,^(QQ)$
windowrule = float,^(wechat)$
windowrule = float,^(fdm)$
windowrule = float,^(xdg-desktop-portal-gtk)$
+2 -2
View File
@@ -7,6 +7,6 @@ plugins = [
[scratchpads.term]
animation = "fromTop"
command = "kitty --class kitty-dropterm"
class = "kitty-dropterm"
command = "alacritty --class alacritty-dropterm"
class = "alacritty-dropterm"
size = "75% 60%"