mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2025-10-29 05:40:21 -04:00
refactor: format nix code with alejandra and optimize src path
This commit is contained in:
parent
f202a16abe
commit
6c99eeaeb3
4 changed files with 109 additions and 109 deletions
15
flake.nix
15
flake.nix
|
|
@ -13,8 +13,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
outputs = {
|
||||
self,
|
||||
flake-parts,
|
||||
treefmt-nix,
|
||||
|
|
@ -30,14 +29,13 @@
|
|||
nixosModules.maomaowm = import ./nix/nixos-modules.nix self;
|
||||
};
|
||||
|
||||
perSystem =
|
||||
{
|
||||
perSystem = {
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (pkgs)
|
||||
}: let
|
||||
inherit
|
||||
(pkgs)
|
||||
callPackage
|
||||
;
|
||||
maomaowm = callPackage ./nix {
|
||||
|
|
@ -49,8 +47,7 @@
|
|||
buildInputs = old.buildInputs ++ [];
|
||||
};
|
||||
treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
|
||||
in
|
||||
{
|
||||
in {
|
||||
packages.default = maomaowm;
|
||||
overlayAttrs = {
|
||||
inherit (config.packages) maomaowm;
|
||||
|
|
|
|||
|
|
@ -18,15 +18,17 @@
|
|||
ninja,
|
||||
wlroots,
|
||||
mmsg,
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
pname = "maomaowm";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
version = "nightly";
|
||||
|
||||
src = ../.;
|
||||
src = builtins.path {
|
||||
path = ../.;
|
||||
name = "source";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
|
|
@ -62,7 +64,7 @@ stdenv.mkDerivation {
|
|||
description = "A streamlined but feature-rich Wayland compositor";
|
||||
homepage = "https://github.com/DreamMaoMao/maomaowm";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = [];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
self:
|
||||
{
|
||||
self: {
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
inherit (self.packages.${pkgs.system}) maomaowm;
|
||||
cfg = config.wayland.windowManager.maomaowm;
|
||||
variables = lib.concatStringsSep " " cfg.systemd.variables;
|
||||
|
|
@ -15,8 +13,7 @@ let
|
|||
${lib.optionalString cfg.systemd.enable systemdActivation}
|
||||
${cfg.autostart_sh}
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
options = {
|
||||
wayland.windowManager.maomaowm = with lib; {
|
||||
enable = mkOption {
|
||||
|
|
@ -121,9 +118,11 @@ in
|
|||
Description = "maomao compositor session";
|
||||
Documentation = ["man:systemd.special(7)"];
|
||||
BindsTo = ["graphical-session.target"];
|
||||
Wants = [
|
||||
Wants =
|
||||
[
|
||||
"graphical-session-pre.target"
|
||||
] ++ lib.optional cfg.systemd.xdgAutostart "xdg-desktop-autostart.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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
self:
|
||||
{
|
||||
self: {
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
cfg = config.programs.maomaowm;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options = {
|
||||
programs.maomaowm = {
|
||||
enable = lib.mkEnableOption "maomaowm, a wayland compositor based on dwl";
|
||||
|
|
@ -21,9 +18,15 @@ in
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
environment.systemPackages =
|
||||
[
|
||||
cfg.package
|
||||
] ++ (if (builtins.hasAttr "mmsg" cfg.package) then [ cfg.package.mmsg ] else [ ]);
|
||||
]
|
||||
++ (
|
||||
if (builtins.hasAttr "mmsg" cfg.package)
|
||||
then [cfg.package.mmsg]
|
||||
else []
|
||||
);
|
||||
|
||||
xdg.portal = {
|
||||
enable = lib.mkDefault true;
|
||||
|
|
@ -42,6 +45,5 @@ in
|
|||
|
||||
graphical-desktop.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue