update: fixed issues and update flake inputs

This commit is contained in:
danny 2025-12-29 16:03:31 +08:00
parent 4b6183f0ec
commit b3c5ad2880
80 changed files with 3307 additions and 2059 deletions

View file

@ -3,11 +3,15 @@
osConfig,
config,
pkgs,
helper,
...
}:
with builtins;
let
inherit (osConfig.systemConf.hyprland) monitors;
inherit (helper) getMonitors;
inherit (osConfig.networking) hostName;
monitors = getMonitors hostName config;
nvidia-offload-enabled = osConfig.hardware.nvidia.prime.offload.enableOffloadCmd;
notransTag = "notrans";

View file

@ -67,13 +67,11 @@ let
"match:class ^(it.mijorus.smile)"
"match:class ^(xdg-desktop-portal-gtk)$"
"match:class ^(vesktop)$, match:title ^(Discord Popout)$"
"match:class ^(steam)$, match:title ^(Friends List)$"
"match:title (Open File)"
"match:title branchdialog"
"match:title wlogout"
"match:title ^(Media viewer)$"
"match:title ^(File Operation Progress)$"
"match:title ^(Steam Settings)$"
"match:title ^(Picture-in-Picture)$"
];
@ -91,8 +89,11 @@ let
# Steam
"match:class ^(steam)$" = [
"workspace 7 silent"
"workspace unset, match:float true"
"workspace 7 silent"
"float true, match:title ^(Friends List)$"
"float true, match:title ^(Steam Settings)$"
"center true, match:float true"
];
};
@ -113,6 +114,7 @@ in
"pin true, match:class ^(vesktop)$, match:title ^(Discord Popout)$"
# steam game
"workspace 7 silent, match:class ^(steam_app_)(.*)"
"fullscreen true, match:class ^(steam_app_)(.*)"
# VLC
"workspace 3, match:initial_class ^(vlc), match:float false"
# discord

View file

@ -1,12 +1,21 @@
{ osConfig, ... }:
{
osConfig,
helper,
config,
...
}:
let
inherit (osConfig.systemConf.hyprland) monitors;
inherit (helper) getMonitors;
inherit (osConfig.networking) hostName;
monitors = getMonitors hostName config;
inherit (builtins)
length
genList
toString
elemAt
;
monitorNum = length monitors;
workspaceNum = 10;
workspaceList = genList (
@ -15,7 +24,7 @@ let
currentNum = index - (monitorNum * (index / monitorNum));
default = if index < monitorNum then "true" else "false";
in
"${toString (index + 1)}, monitor:desc:${(elemAt monitors currentNum).desc}, default:${default}"
"${toString (index + 1)}, monitor:desc:${(elemAt monitors currentNum).criteria}, default:${default}"
) workspaceNum;
in
{