diff --git a/host/Rias/modules/lucid/default.nix b/host/Rias/modules/lucid/default.nix index 365454a..8326277 100644 --- a/host/Rias/modules/lucid/default.nix +++ b/host/Rias/modules/lucid/default.nix @@ -1,4 +1,23 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: +let + monitors = pkgs.runCommand "lucid-rias-monitors.lua" { nativeBuildInputs = [ pkgs.python3 ]; } '' + python3 - ${config.lucid.upstreamSource}/support/hypr/modules/monitors.lua "$out" <<'PY' +import pathlib, sys +source = pathlib.Path(sys.argv[1]).read_text() +default = """hl.monitor({ + output = "", + mode = M.defaults.mode, + position = M.defaults.position, + scale = M.defaults.scale, +}) +""" +initial = 'pcall(M.apply)' +if source.count(default) != 1 or source.count(initial) != 1: + raise SystemExit('Lucid monitor module changed') +pathlib.Path(sys.argv[2]).write_text(source.replace(default, "", 1).replace(initial, "", 1)) +PY + ''; +in { lucid.widgetSeed = ./lucid-widgets-rias.json; lucid.liveDecoder = "cuda"; @@ -13,7 +32,7 @@ "modules/misc.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/misc.lua"; "modules/plugins.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/plugins.lua"; "modules/windowrules.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/windowrules.lua"; - "modules/monitors.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/monitors.lua"; autoLoad = false; }; + "modules/monitors.lua" = { content = monitors; autoLoad = false; }; "modules/glass.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/glass.lua"; autoLoad = false; }; "modules/settings.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/settings.lua"; autoLoad = false; }; "modules/startup.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/startup.lua"; autoLoad = false; }; diff --git a/user/sweetbread/modules/lucid/rias.nix b/user/sweetbread/modules/lucid/rias.nix index 19d2707..ee9624b 100644 --- a/user/sweetbread/modules/lucid/rias.nix +++ b/user/sweetbread/modules/lucid/rias.nix @@ -6,6 +6,7 @@ } ))); lucid.extraHyprlandConfig = '' + require("modules.monitors") require("modules.settings") require("modules.glass") require("modules.startup")