diff --git a/config/hypr/.config/hypr/hypridle.conf b/config/hypr/.config/hypr/hypridle.conf index fd721e9..ebb4108 100755 --- a/config/hypr/.config/hypr/hypridle.conf +++ b/config/hypr/.config/hypr/hypridle.conf @@ -1,5 +1,5 @@ $lock_cmd = pidof hyprlock || hyprlock -$suspend_cmd = pidof steam || systemctl suspend || loginctl suspend # fuck nvidia +$suspend_cmd = systemctl suspend || loginctl suspend general { lock_cmd = $lock_cmd @@ -14,7 +14,7 @@ listener { listener { timeout = 300 # 5mins on-timeout = hyprctl dispatch dpms off || niri msg action power-off-monitors - on-resume = hyprctl dispatch dpms on || true + on-resume = hyprctl dispatch dpms on || niri msg action power-on-monitors } #listener { diff --git a/config/niri/.config/niri/config/misc.kdl b/config/niri/.config/niri/config/misc.kdl index 395b060..7a332b3 100644 --- a/config/niri/.config/niri/config/misc.kdl +++ b/config/niri/.config/niri/config/misc.kdl @@ -1,7 +1,7 @@ screenshot-path "~/Pictures/Screenshots/niri_screenshot_%Y-%m-%d_%H-%M-%S.png" debug { - render-drm-device "/dev/dri/renderD128" + render-drm-device "/dev/dri/renderD129" honor-xdg-activation-with-invalid-serial } diff --git a/config/quickshell/.config/quickshell/Modules/Bar/Bar.qml b/config/quickshell/.config/quickshell/Modules/Bar/Bar.qml index 02925a5..dc6808b 100644 --- a/config/quickshell/.config/quickshell/Modules/Bar/Bar.qml +++ b/config/quickshell/.config/quickshell/Modules/Bar/Bar.qml @@ -11,8 +11,11 @@ import qs.Modules.Bar.Modules import qs.Services Variants { + id: root model: Quickshell.screens + property var pinnedTrayIds + Item { property var modelData @@ -133,7 +136,7 @@ Variants { id: rightLayout height: parent.height - Style.marginXS * 2 - spacing: Style.marginM + spacing: Style.marginS anchors { right: parent.right @@ -186,8 +189,8 @@ Variants { RecordIndicator { } - Ip { - } + // Ip { + // } CpuTemp { } @@ -265,6 +268,21 @@ Variants { Separator { } + Loader { + Layout.fillHeight: true + active: NukeKded6.done + + sourceComponent: SystemTray { + screen: modelData + pinnedIds: root.pinnedTrayIds + height: parent.height + } + + } + + Separator { + } + RowLayout { Layout.fillHeight: true spacing: Style.marginS @@ -275,6 +293,7 @@ Variants { sourceComponent: TrayExpander { screen: modelData baseSize: rightLayout.height - Style.marginXS * 2 + excludeIds: root.pinnedTrayIds } } diff --git a/config/quickshell/.config/quickshell/Modules/Bar/Components/SystemTray.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/SystemTray.qml index f27628b..0a8955c 100644 --- a/config/quickshell/.config/quickshell/Modules/Bar/Components/SystemTray.qml +++ b/config/quickshell/.config/quickshell/Modules/Bar/Components/SystemTray.qml @@ -15,8 +15,10 @@ Rectangle { property ShellScreen screen property var activeTrayItem: null + property var pinnedIds: [] + property var excludeIds: [] - implicitWidth: trayFlow.implicitWidth + 20 + implicitWidth: trayFlow.implicitWidth > 0 ? trayFlow.implicitWidth + 20 : 0 implicitHeight: parent.height radius: 0 color: Colors.transparent @@ -36,7 +38,12 @@ Rectangle { delegate: Item { width: 18 height: 18 - visible: modelData + visible: { + if (!modelData) return false + if (pinnedIds.length > 0) return pinnedIds.includes(modelData.id) + if (excludeIds.length > 0) return !excludeIds.includes(modelData.id) + return true + } IconImage { id: trayIcon diff --git a/config/quickshell/.config/quickshell/Modules/Bar/Modules/TrayExpander.qml b/config/quickshell/.config/quickshell/Modules/Bar/Modules/TrayExpander.qml index 9d03ee2..0306a53 100644 --- a/config/quickshell/.config/quickshell/Modules/Bar/Modules/TrayExpander.qml +++ b/config/quickshell/.config/quickshell/Modules/Bar/Modules/TrayExpander.qml @@ -11,6 +11,7 @@ Item { property ShellScreen screen property int baseSize: Style.baseWidgetSize + property var excludeIds: [] implicitWidth: baseSize + trayContainer.implicitWidth implicitHeight: layout.implicitHeight @@ -40,6 +41,7 @@ Item { id: expandedTray screen: root.screen + excludeIds: root.excludeIds } Behavior on implicitWidth { diff --git a/config/quickshell/.config/quickshell/Services/RecordService.qml b/config/quickshell/.config/quickshell/Services/RecordService.qml index 9502bfa..5468d26 100644 --- a/config/quickshell/.config/quickshell/Services/RecordService.qml +++ b/config/quickshell/.config/quickshell/Services/RecordService.qml @@ -16,13 +16,13 @@ Singleton { property bool isReplayStarted: false property bool isStopping: false property bool isReplayStopping: false - readonly property string codec: "libx264" - readonly property string container: "mkv" - readonly property string pixelFormat: "yuv420p" + readonly property string codec: "av1_nvenc" + readonly property string container: "mp4" + readonly property string pixelFormat: "p010le" property string recordingDisplay: "" readonly property int replayDuration: 15 readonly property int framerate: 60 - readonly property var codecParams: Object.freeze(["preset=ultrafast", "crf=15", "tune=zerolatency", "color_range=tv"]) + readonly property var codecParams: Object.freeze(["preset=p4", "rc=constqp", "qp=18", "color_range=tv"]) readonly property var filterArgs: "" function getFilename(prefix = "recording") { diff --git a/config/quickshell/.config/quickshell/shell.qml b/config/quickshell/.config/quickshell/shell.qml index 06b4f43..699d52c 100644 --- a/config/quickshell/.config/quickshell/shell.qml +++ b/config/quickshell/.config/quickshell/shell.qml @@ -29,6 +29,8 @@ ShellRoot { Bar { id: bar + + pinnedTrayIds: ["Fcitx", "nm-applet", "blueman"] } Corners { diff --git a/config/scripts/.local/snippets/set_display b/config/scripts/.local/snippets/set_display index 9a2ea66..a0f46de 100644 --- a/config/scripts/.local/snippets/set_display +++ b/config/scripts/.local/snippets/set_display @@ -9,7 +9,7 @@ # Constants niri_config_file="$HOME/.config/niri/config/misc.kdl" -prefer_order=(intel nvidia) +prefer_order=(nvidia intel) # Get vendor and path of each GPU default_card_path="$(find /dev/dri/card* 2>/dev/null | head -n 1)" diff --git a/config/shell/.config/zsh/conf.d/10-done.zsh b/config/shell/.config/zsh/conf.d/10-done.zsh index 3fb12c0..8bf8933 100644 --- a/config/shell/.config/zsh/conf.d/10-done.zsh +++ b/config/shell/.config/zsh/conf.d/10-done.zsh @@ -59,7 +59,7 @@ uy_done_precmd() { --urgency="$urgency" \ --icon=utilities-terminal \ --app-name=zsh \ - "$title" "$wd/ $uy_done_cmd" + "$title" "$wd/ $uy_done_cmd" & } autoload -Uz add-zsh-hook diff --git a/config/shell/.config/zsh/conf.d/60-alias.zsh b/config/shell/.config/zsh/conf.d/60-alias.zsh index 405a06d..d536334 100644 --- a/config/shell/.config/zsh/conf.d/60-alias.zsh +++ b/config/shell/.config/zsh/conf.d/60-alias.zsh @@ -156,7 +156,7 @@ if (( $+commands[git] )); then gcp() { git add -A || return 1 if [[ $# -eq 0 ]]; then - git commit -m "👐 foo: too lazy to come up with a helpful commit message :)" || return 1 + git commit -m "👐 foo:)" || return 1 else git commit -m "$*" || return 1 fi @@ -201,8 +201,14 @@ if (( $+commands[git] )); then local app="$1" if [[ -n "$app" ]] && (( $+commands[$app] )); then echo "Opening project with $app" - nohup "$app" . >/dev/null 2>&1 & - disown + # nohup "$app" . >/dev/null 2>&1 & + # disown + if [[ ${XDG_CURRENT_DESKTOP:-} = "niri" ]]; then + niri msg action spawn -- "$app" "$HOME/Repositories/Uni/$course/$dir_name" + else + nohup "$app" . >/dev/null 2>&1 & + disown + fi fi } fi diff --git a/config/yazi/.config/yazi/package.toml b/config/yazi/.config/yazi/package.toml index 9e4facf..4f15db3 100644 --- a/config/yazi/.config/yazi/package.toml +++ b/config/yazi/.config/yazi/package.toml @@ -1,11 +1,11 @@ [[plugin.deps]] use = "yazi-rs/plugins:git" -rev = "1db18bb" -hash = "c8d30a70659f1b880407e61c564ab4e8" +rev = "5d5c480" +hash = "88e56a64b7ce7c4314427452343fef17" [[plugin.deps]] use = "yazi-rs/plugins:smart-enter" -rev = "1db18bb" +rev = "5d5c480" hash = "187cc58ba7ac3befd49c342129e6f1b6" [[plugin.deps]] @@ -15,8 +15,8 @@ hash = "699fe07e0d2d1b4af8dafb84168eeb04" [[plugin.deps]] use = "KKV9/compress" -rev = "46a6b9f" -hash = "771af2becc575a3f43d0542de823969d" +rev = "e60e122" +hash = "fbaf0adc8efc59555b748d36aab62d40" [[plugin.deps]] use = "llanosrocas/yaziline" diff --git a/config/yazi/.config/yazi/plugins/compress.yazi/main.lua b/config/yazi/.config/yazi/plugins/compress.yazi/main.lua index 440f6e2..05a8cff 100644 --- a/config/yazi/.config/yazi/plugins/compress.yazi/main.lua +++ b/config/yazi/.config/yazi/plugins/compress.yazi/main.lua @@ -1,4 +1,4 @@ ---- @since 25.12.29 +--- @since 26.5.6 -- Check for windows local is_windows = ya.target_family() == "windows" @@ -460,7 +460,7 @@ return { -- Create a temporary directory for intermediate files local temp_dir_name = ".tmp_compress" local temp_dir = combine_url(output_dir, temp_dir_name) - temp_dir = tostring(fs.unique_name(Url(temp_dir))) + temp_dir = tostring(fs.unique("dir", Url(temp_dir))) -- Attempt to create the temporary directory local temp_dir_status, temp_dir_err = fs.create("dir_all", Url(temp_dir)) @@ -532,7 +532,7 @@ return { -- Move the final file from the temporary directory to the output directory local final_output_url = combine_url(output_dir, original_name) local temp_url_processed = combine_url(temp_dir, original_name) - final_output_url = tostring(fs.unique_name(Url(final_output_url))) + final_output_url = tostring(fs.unique("file", Url(final_output_url))) local from, to = Url(temp_url_processed), Url(final_output_url) local move_status, move_err = fs.rename(from, to) if not move_status then diff --git a/config/yazi/.config/yazi/plugins/git.yazi/README.md b/config/yazi/.config/yazi/plugins/git.yazi/README.md index 042bac6..bb923b0 100644 --- a/config/yazi/.config/yazi/plugins/git.yazi/README.md +++ b/config/yazi/.config/yazi/plugins/git.yazi/README.md @@ -39,10 +39,7 @@ group = "git" ## Advanced -> [!NOTE] -> The following configuration must be put before `require("git"):setup()` - -You can customize the [Style](https://yazi-rs.github.io/docs/plugins/layout#style) of the status sign with: +You can customize the [Style](https://yazi-rs.github.io/docs/configuration/theme#types.style) of the status sign with: - `[git].unknown` - status cannot/not yet determined - `[git].modified` - modified file diff --git a/memo/packages.md b/memo/packages.md index a57b9eb..2c6cbc2 100644 --- a/memo/packages.md +++ b/memo/packages.md @@ -233,7 +233,6 @@ gucharmap gvfs-smb gwenview handbrake -hashclash-cuda-git helix hmcl htop @@ -454,7 +453,7 @@ sunshine sushi svt-av1-hdr-git sysbench -systemc +systemc2.3.4 tailscale tcpdump telegram-desktop @@ -532,7 +531,7 @@ waydroid-helper waypaper wev wezterm -wf-recorder +wf-recorder-git wget whisper.cpp-model-large-v3-turbo wine @@ -542,6 +541,7 @@ wl-clipboard wl-mirror wlogout wlsunset +words wqy-bitmapfont wqy-microhei wqy-zenhei