mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2025-10-29 05:40:21 -04:00
refactor: optimize hmModule options
This commit is contained in:
parent
1a55178fd6
commit
56da92a0a6
2 changed files with 107 additions and 20 deletions
|
|
@ -140,6 +140,7 @@ like `MAOMAOCONFIG=/home/xxx/maomao`
|
||||||
'';
|
'';
|
||||||
autostart_sh = ''
|
autostart_sh = ''
|
||||||
# see autostart.sh
|
# see autostart.sh
|
||||||
|
# Note: here no need to add shebang
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,41 +4,127 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
maomaowm = pkgs.callPackage ./. { };
|
maomaowm = pkgs.callPackage ./. { };
|
||||||
|
cfg = config.wayland.windowManager.maomaowm;
|
||||||
|
variables = lib.concatStringsSep " " cfg.systemd.variables;
|
||||||
|
extraCommands = lib.concatStringsSep " && " cfg.systemd.extraCommands;
|
||||||
|
systemdActivation = ''${pkgs.dbus}/bin/dbus-update-activation-environment --systemd ${variables}; ${extraCommands}'';
|
||||||
|
autostart_sh = pkgs.writeShellScript "autostart.sh" ''
|
||||||
|
${lib.optionalString cfg.systemd.enable systemdActivation}
|
||||||
|
${cfg.autostart_sh}
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
wayland.windowManager.maomaowm = {
|
wayland.windowManager.maomaowm = with lib; {
|
||||||
enable = lib.mkOption {
|
enable = mkOption {
|
||||||
type = lib.types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
};
|
};
|
||||||
|
systemd = {
|
||||||
settings = lib.mkOption {
|
enable = mkOption {
|
||||||
type = lib.types.str;
|
type = types.bool;
|
||||||
default = "";
|
default = pkgs.stdenv.isLinux;
|
||||||
|
example = false;
|
||||||
|
description = ''
|
||||||
|
Whether to enable {file}`maomao-session.target` on
|
||||||
|
maomao startup. This links to
|
||||||
|
{file}`graphical-session.target`.
|
||||||
|
Some important environment variables will be imported to systemd
|
||||||
|
and dbus user environment before reaching the target, including
|
||||||
|
* {env}`DISPLAY`
|
||||||
|
* {env}`WAYLAND_DISPLAY`
|
||||||
|
* {env}`XDG_CURRENT_DESKTOP`
|
||||||
|
* {env}`XDG_SESSION_TYPE`
|
||||||
|
* {env}`NIXOS_OZONE_WL`
|
||||||
|
You can extend this list using the `systemd.variables` option.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
variables = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [
|
||||||
|
"DISPLAY"
|
||||||
|
"WAYLAND_DISPLAY"
|
||||||
|
"XDG_CURRENT_DESKTOP"
|
||||||
|
"XDG_SESSION_TYPE"
|
||||||
|
"NIXOS_OZONE_WL"
|
||||||
|
"XCURSOR_THEME"
|
||||||
|
"XCURSOR_SIZE"
|
||||||
|
];
|
||||||
|
example = [ "--all" ];
|
||||||
|
description = ''
|
||||||
|
Environment variables imported into the systemd and D-Bus user environment.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
extraCommands = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [
|
||||||
|
"systemctl --user reset-failed"
|
||||||
|
"systemctl --user start maomao-session.target"
|
||||||
|
];
|
||||||
|
description = ''
|
||||||
|
Extra commands to run after D-Bus activation.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
xdgAutostart = mkEnableOption ''
|
||||||
|
autostart of applications using
|
||||||
|
{manpage}`systemd-xdg-autostart-generator(8)`
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
settings = mkOption {
|
||||||
autostart_sh = lib.mkOption {
|
description = "maomaowm config content";
|
||||||
type = lib.types.str;
|
type = types.str;
|
||||||
default = "";
|
default = "";
|
||||||
|
example = ''
|
||||||
|
# menu and terminal
|
||||||
|
bind=Alt,space,spawn,rofi -show drun
|
||||||
|
bind=Alt,Return,spawn,foot
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
autostart_sh = mkOption {
|
||||||
|
description = "WARRNING: This is a shell script, but no need to add shebang";
|
||||||
|
type = types.str;
|
||||||
|
default = "";
|
||||||
|
example = ''
|
||||||
|
waybar &
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.wayland.windowManager.maomaowm.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
home.packages = [ maomaowm ];
|
home.packages = [ maomaowm ];
|
||||||
|
home.activation =
|
||||||
home.file = {
|
lib.optionalAttrs (cfg.autostart_sh != "") {
|
||||||
".config/maomao/config.conf" = {
|
createMaomaoScript = lib.hm.dag.entryAfter [ "clearMaomaoConfig" ] ''
|
||||||
text = config.wayland.windowManager.maomaowm.settings;
|
cat ${autostart_sh} > $HOME/.config/maomao/autostart.sh
|
||||||
|
chmod +x $HOME/.config/maomao/autostart.sh
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
// lib.optionalAttrs (cfg.settings != "") {
|
||||||
|
createMaomaoConfig = lib.hm.dag.entryAfter [ "clearMaomaoConfig" ] ''
|
||||||
|
cat > $HOME/.config/maomao/config.conf <<EOF
|
||||||
|
${cfg.settings}
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
// {
|
||||||
|
clearMaomaoConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||||
|
rm -rf $HOME/.config/maomao
|
||||||
|
mkdir -p $HOME/.config/maomao
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
systemd.user.targets.maomao-session = lib.mkIf cfg.systemd.enable {
|
||||||
".config/maomao/autostart.sh" = {
|
Unit = {
|
||||||
text = config.wayland.windowManager.maomaowm.autostart_sh;
|
Description = "maomao compositor session";
|
||||||
executable = true;
|
Documentation = [ "man:systemd.special(7)" ];
|
||||||
|
BindsTo = [ "graphical-session.target" ];
|
||||||
|
Wants = [
|
||||||
|
"graphical-session-pre.target"
|
||||||
|
] ++ lib.optional cfg.systemd.xdgAutostart "xdg-desktop-autostart.target";
|
||||||
|
After = [ "graphical-session-pre.target" ];
|
||||||
|
Before = lib.optional cfg.systemd.xdgAutostart "xdg-desktop-autostart.target";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue