fix hoem manager config access

This commit is contained in:
RingOfStorms (Joshua Bell) 2025-11-30 00:29:32 -06:00
parent 971d997920
commit 7dfa665b73
7 changed files with 79 additions and 51 deletions

View file

@ -1,6 +1,11 @@
{ config, lib, pkgs, ... }:
{
osConfig,
lib,
pkgs,
...
}:
let
cfg = config.ringofstorms.dePlasma;
cfg = osConfig.ringofstorms.dePlasma;
inherit (lib) mkIf;
delayMs = cfg.monitors.scriptDelayMs;
script = pkgs.writeShellScriptBin "plasma-kscreen-overrides" ''
@ -10,7 +15,7 @@ let
'';
in
{
options = {};
options = { };
config = mkIf (cfg.enable && cfg.monitors.enableOverrides && cfg.monitors.commands != [ ]) {
# Use XDG autostart
xdg.autostart."ringofstorms-kscreen-overrides" = {

View file

@ -5,7 +5,6 @@
./shortcuts.nix
./panel.nix
./theme.nix
./polkit.nix
./autostart.nix
];
}

View file

@ -1,13 +1,19 @@
{ config, lib, pkgs, ... }:
{
osConfig,
lib,
...
}:
let
cfg = config.ringofstorms.dePlasma;
cfg = osConfig.ringofstorms.dePlasma;
inherit (lib) mkIf;
mkPanel = {
mkPanel =
{
location ? cfg.panel.location,
height ? cfg.panel.height,
opacity ? cfg.panel.opacity,
widgets ? cfg.panel.widgets
}: {
widgets ? cfg.panel.widgets,
}:
{
location = location;
height = height;
opacity = opacity;
@ -15,8 +21,8 @@ let
};
in
{
options = {};
options = { };
config = mkIf (cfg.enable && cfg.panel.enabled) {
programs.plasma.panels = [ (mkPanel {}) ];
programs.plasma.panels = [ (mkPanel { }) ];
};
}

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
{ osConfig, lib, pkgs, ... }:
let
cfg = config.ringofstorms.dePlasma;
cfg = osConfig.ringofstorms.dePlasma;
inherit (lib) mkIf;
in
{

View file

@ -1,4 +0,0 @@
{ ... }:
{
# Plasma ships polkit-agent in its session; keep placeholder for parity
}

View file

@ -1,38 +1,56 @@
{ config, lib, pkgs, ... }:
{ osConfig, lib, ... }:
let
cfg = config.ringofstorms.dePlasma;
cfg = osConfig.ringofstorms.dePlasma;
inherit (lib) mkIf;
workspaces = builtins.genList (i: i + 1) 9;
kwinWorkspace = builtins.listToAttrs (map (i: {
kwinWorkspace = builtins.listToAttrs (
map (i: {
name = "Switch to Desktop ${toString i}";
value = "Meta+${toString i}";
}) workspaces);
kwinMoveWorkspace = builtins.listToAttrs (map (i: {
}) workspaces
);
kwinMoveWorkspace = builtins.listToAttrs (
map (i: {
name = "Window to Desktop ${toString i}";
value = "Meta+Shift+${toString i}";
}) workspaces);
krunnerShortcut = if cfg.shortcuts.launcher == "krunner" then {
krunner = { "Run Command" = "Meta+Space"; };
} else { };
}) workspaces
);
krunnerShortcut =
if cfg.shortcuts.launcher == "krunner" then
{
krunner = {
"Run Command" = "Meta+Space";
};
}
else
{ };
in
{
options = {};
options = { };
config = mkIf (cfg.enable && cfg.shortcuts.useI3Like) {
programs.plasma.shortcuts =
({
programs.plasma.shortcuts = (
{
kwin = ({ "Close Window" = cfg.shortcuts.closeWindow; } // kwinWorkspace // kwinMoveWorkspace);
} // krunnerShortcut);
}
// krunnerShortcut
);
programs.plasma.hotkeys.commands = {
ringofstorms_terminal = {
key = "Meta+Return";
command = cfg.shortcuts.terminal;
};
} // (if cfg.shortcuts.launcher == "rofi" then {
}
// (
if cfg.shortcuts.launcher == "rofi" then
{
ringofstorms_launcher = {
key = "Meta+Space";
command = "rofi -show drun";
};
} else {});
}
else
{ }
);
};
}

View file

@ -1,10 +1,14 @@
{ config, lib, pkgs, ... }:
{
osConfig,
lib,
...
}:
let
cfg = config.ringofstorms.dePlasma;
cfg = osConfig.ringofstorms.dePlasma;
inherit (lib) mkIf;
in
{
options = {};
options = { };
config = mkIf (cfg.enable && cfg.appearance.dark.enable) {
programs.plasma = {
workspace = {