Merge branch 'end-4:main' into parallax

This commit is contained in:
Ivan Rosinskii
2026-03-04 09:44:16 +01:00
committed by GitHub
8 changed files with 27 additions and 21 deletions
+3 -3
View File
@@ -109,8 +109,8 @@ bind = Super+Shift+Alt, Q, exec, hyprctl kill # Forcefully zap a window
# Window split ratio # Window split ratio
#/# binde = Super, ;/',, # Adjust split ratio #/# binde = Super, ;/',, # Adjust split ratio
binde = Super, Semicolon, splitratio, -0.1 # [hidden] binde = Super, Semicolon, layoutmsg, splitratio -0.1 # [hidden]
binde = Super, Apostrophe, splitratio, +0.1 # [hidden] binde = Super, Apostrophe, layoutmsg, splitratio +0.1 # [hidden]
# Positioning mode # Positioning mode
bind = Super+Alt, Space, togglefloating, # Float/Tile bind = Super+Alt, Space, togglefloating, # Float/Tile
bind = Super, D, fullscreen, 1 # Maximize bind = Super, D, fullscreen, 1 # Maximize
@@ -255,7 +255,7 @@ bind = Super, T, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh
bind = Ctrl+Alt, T, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "${TERMINAL}" "kitty -1" "foot" "alacritty" "wezterm" "konsole" "kgx" "uxterm" "xterm" # [hidden] (terminal) (for Ubuntu people) bind = Ctrl+Alt, T, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "${TERMINAL}" "kitty -1" "foot" "alacritty" "wezterm" "konsole" "kgx" "uxterm" "xterm" # [hidden] (terminal) (for Ubuntu people)
bind = Super, E, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "dolphin" "nautilus" "nemo" "thunar" "${TERMINAL}" "kitty -1 fish -c yazi" # File manager bind = Super, E, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "dolphin" "nautilus" "nemo" "thunar" "${TERMINAL}" "kitty -1 fish -c yazi" # File manager
bind = Super, W, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "google-chrome-stable" "zen-browser" "firefox" "brave" "chromium" "microsoft-edge-stable" "opera" "librewolf" # Browser bind = Super, W, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "google-chrome-stable" "zen-browser" "firefox" "brave" "chromium" "microsoft-edge-stable" "opera" "librewolf" # Browser
bind = Super, C, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "code" "codium" "cursor" "zed" "zedit" "zeditor" "kate" "gnome-text-editor" "emacs" "command -v nvim && kitty -1 nvim" "command -v micro && kitty -1 micro" # Code editor bind = Super, C, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "antigravity" "code" "codium" "cursor" "zed" "zedit" "zeditor" "kate" "gnome-text-editor" "emacs" "command -v nvim && kitty -1 nvim" "command -v micro && kitty -1 micro" # Code editor
bind = Ctrl+Super+Shift+Alt, W, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "wps" "onlyoffice-desktopeditors" "libreoffice" # Office software bind = Ctrl+Super+Shift+Alt, W, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "wps" "onlyoffice-desktopeditors" "libreoffice" # Office software
bind = Super, X, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "kate" "gnome-text-editor" "emacs" # Text editor bind = Super, X, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "kate" "gnome-text-editor" "emacs" # Text editor
bind = Ctrl+Super, V, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "pavucontrol-qt" "pavucontrol" # Volume mixer bind = Ctrl+Super, V, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "pavucontrol-qt" "pavucontrol" # Volume mixer
@@ -67,6 +67,7 @@ Scope { // Scope
onDetachChanged: { onDetachChanged: {
if (root.detach) { if (root.detach) {
GlobalFocusGrab.removeDismissable(sidebarLoader.item) // Remove sidebar from the focus grab system
sidebarContent.parent = null; // Detach content from sidebar sidebarContent.parent = null; // Detach content from sidebar
sidebarLoader.active = false; // Unload sidebar sidebarLoader.active = false; // Unload sidebar
detachedSidebarLoader.active = true; // Load detached window detachedSidebarLoader.active = true; // Load detached window
@@ -8,6 +8,8 @@ settings_paths=(
"${XDG_CONFIG_HOME:-$HOME/.config}/Code - OSS/User/settings.json" "${XDG_CONFIG_HOME:-$HOME/.config}/Code - OSS/User/settings.json"
"${XDG_CONFIG_HOME:-$HOME/.config}/Code - Insiders/User/settings.json" "${XDG_CONFIG_HOME:-$HOME/.config}/Code - Insiders/User/settings.json"
"${XDG_CONFIG_HOME:-$HOME/.config}/Cursor/User/settings.json" "${XDG_CONFIG_HOME:-$HOME/.config}/Cursor/User/settings.json"
"${XDG_CONFIG_HOME:-$HOME/.config}/Antigravity/User/settings.json"
# Add more paths as needed for other forks # Add more paths as needed for other forks
) )
@@ -53,7 +53,7 @@ while true; do
fi fi
ffmpeg -f s16le -ar 44100 -ac 2 -i "$TMP_RAW" -acodec libmp3lame -y -hide_banner -loglevel error "$TMP_MP3" 2>/dev/null ffmpeg -f s16le -ar 44100 -ac 2 -i "$TMP_RAW" -acodec libmp3lame -y -hide_banner -loglevel error "$TMP_MP3" 2>/dev/null
RESULT=$(songrec audio-file-to-recognized-song "$TMP_MP3" 2>/dev/null || true) RESULT=$(songrec recognize --json "$TMP_MP3" 2>/dev/null || true)
if echo "$RESULT" | grep -q '"matches": \[' && [ ${#RESULT} -gt $MIN_VALID_RESULT_LENGTH ]; then if echo "$RESULT" | grep -q '"matches": \[' && [ ${#RESULT} -gt $MIN_VALID_RESULT_LENGTH ]; then
echo "$RESULT" echo "$RESULT"
@@ -36,13 +36,13 @@ Singleton {
property int networkStrength property int networkStrength
property string materialSymbol: root.ethernet property string materialSymbol: root.ethernet
? "lan" ? "lan"
: root.wifiEnabled : (root.wifiEnabled && root.wifiStatus === "connected")
? ( ? (
Network.networkStrength > 83 ? "signal_wifi_4_bar" : (root.active?.strength ?? 0) > 83 ? "signal_wifi_4_bar" :
Network.networkStrength > 67 ? "network_wifi" : (root.active?.strength ?? 0) > 67 ? "network_wifi" :
Network.networkStrength > 50 ? "network_wifi_3_bar" : (root.active?.strength ?? 0) > 50 ? "network_wifi_3_bar" :
Network.networkStrength > 33 ? "network_wifi_2_bar" : (root.active?.strength ?? 0) > 33 ? "network_wifi_2_bar" :
Network.networkStrength > 17 ? "network_wifi_1_bar" : (root.active?.strength ?? 0) > 17 ? "network_wifi_1_bar" :
"signal_wifi_0_bar" "signal_wifi_0_bar"
) )
: (root.wifiStatus === "connecting") : (root.wifiStatus === "connecting")
@@ -1,4 +1,4 @@
_commit='db1777c20b936a86528c1095cbcb1ebd92801402' _commit='6e17efab83d3a5ad5d6e59bc08d26095c6660502'
# Useful links: # Useful links:
# https://git.outfoxxed.me/quickshell/quickshell/commits/branch/master # https://git.outfoxxed.me/quickshell/quickshell/commits/branch/master
# https://aur.archlinux.org/packages/quickshell-git # https://aur.archlinux.org/packages/quickshell-git
@@ -52,6 +52,7 @@ makedepends=(
'ninja' 'ninja'
'cmake' 'cmake'
'git' 'git'
'vulkan-headers'
) )
provides=("$_pkgname") provides=("$_pkgname")
conflicts=("$_pkgname") conflicts=("$_pkgname")
@@ -9,7 +9,7 @@ DESCRIPTION="Toolkit for building desktop widgets using QtQuick"
HOMEPAGE="https://quickshell.org/" HOMEPAGE="https://quickshell.org/"
EGIT_REPO_URI="https://github.com/quickshell-mirror/quickshell.git" EGIT_REPO_URI="https://github.com/quickshell-mirror/quickshell.git"
EGIT_COMMIT="db1777c20b936a86528c1095cbcb1ebd92801402" EGIT_COMMIT="6e17efab83d3a5ad5d6e59bc08d26095c6660502"
KEYWORDS="~amd64 ~arm64 ~x86" KEYWORDS="~amd64 ~arm64 ~x86"
LICENSE="LGPL-3" LICENSE="LGPL-3"
@@ -67,7 +67,7 @@ BDEPEND="
dev-vcs/git dev-vcs/git
virtual/pkgconfig virtual/pkgconfig
breakpad? ( dev-util/breakpad ) breakpad? ( dev-util/breakpad )
dev-util/vulkan-headers
" "
src_configure(){ src_configure(){
+10 -8
View File
@@ -19,10 +19,12 @@ app-misc/brightnessctl
app-misc/cliphist app-misc/cliphist
gui-apps/hypridle gui-apps/hypridle
gui-apps/hyprlock gui-apps/hyprlock
dev-libs/hyprlang
gui-apps/hyprpicker gui-apps/hyprpicker
gui-apps/hyprsunset gui-apps/hyprsunset
gui-libs/xdg-desktop-portal-hyprland gui-libs/xdg-desktop-portal-hyprland
gui-apps/hyprshot gui-apps/hyprshot
gui-libs/hyprcursor
gui-apps/wf-recorder gui-apps/wf-recorder
gui-apps/wtype gui-apps/wtype
gui-apps/fuzzel gui-apps/fuzzel
@@ -30,15 +32,15 @@ gui-apps/quickshell **
gui-apps/wlogout gui-apps/wlogout
dev-cpp/sdbus-c++ dev-cpp/sdbus-c++
dev-libs/hyprland-protocols dev-libs/hyprland-protocols
gui-libs/hyprutils::hyproverlay gui-libs/hyprutils
gui-libs/hyprwire::hyproverlay gui-libs/hyprwire
dev-util/hyprwayland-scanner dev-util/hyprwayland-scanner
gui-libs/hyprland-qt-support gui-libs/hyprland-qt-support
gui-libs/hyprland-guiutils::hyproverlay gui-libs/hyprland-guiutils
gui-libs/hyprtoolkit::hyproverlay gui-libs/hyprtoolkit
gui-wm/hyprland::hyproverlay gui-wm/hyprland
dev-libs/hyprgraphics::hyproverlay dev-libs/hyprgraphics
gui-libs/aquamarine::hyproverlay gui-libs/aquamarine
x11-libs/libxkbcommon x11-libs/libxkbcommon
dev-util/breakpad dev-util/breakpad
dev-libs/linux-syscall-support dev-libs/linux-syscall-support
@@ -51,4 +53,4 @@ media-fonts/material-symbols-variable **
media-fonts/readex-pro media-fonts/readex-pro
media-fonts/rubik-vf media-fonts/rubik-vf
app-misc/songrec app-misc/songrec
dev-cpp/glaze::hyproverlay dev-cpp/glaze