mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-10-29 05:40:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: format nix code with alejandra and optimize src path

Browse source
This commit is contained in:
Yappaholic 2025-06-17 22:46:26 +03:00
parent f202a16abe
commit 6c99eeaeb3
4 changed files with 109 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake.nix
View file

@ -13,8 +13,7 @@
}; };
}; };
outputs = outputs = {
{
self, self,
flake-parts, flake-parts,
treefmt-nix, treefmt-nix,
@ -30,14 +29,13 @@
nixosModules.maomaowm = import ./nix/nixos-modules.nix self; nixosModules.maomaowm = import ./nix/nixos-modules.nix self;
}; };
perSystem = perSystem = {
{
config, config,
pkgs, pkgs,
... ...
}: }: let
let inherit
inherit (pkgs) (pkgs)
callPackage callPackage
; ;
maomaowm = callPackage ./nix { maomaowm = callPackage ./nix {
@ -49,8 +47,7 @@
buildInputs = old.buildInputs ++ []; buildInputs = old.buildInputs ++ [];
}; };
treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix; treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
in in {
{
packages.default = maomaowm; packages.default = maomaowm;
overlayAttrs = { overlayAttrs = {
inherit (config.packages) maomaowm; inherit (config.packages) maomaowm;

10
nix/default.nix
View file

@ -18,15 +18,17 @@
ninja, ninja,
wlroots, wlroots,
mmsg, mmsg,
}: }: let
let
pname = "maomaowm"; pname = "maomaowm";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname; inherit pname;
version = "nightly"; version = "nightly";
src = ../.; src = builtins.path {
path = ../.;
name = "source";
};
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
@ -62,7 +64,7 @@ stdenv.mkDerivation {
description = "A streamlined but feature-rich Wayland compositor"; description = "A streamlined but feature-rich Wayland compositor";
homepage = "https://github.com/DreamMaoMao/maomaowm"; homepage = "https://github.com/DreamMaoMao/maomaowm";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ]; maintainers = [];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

15
nix/hm-modules.nix
View file

@ -1,11 +1,9 @@
self: self: {
{
lib, lib,
config, config,
pkgs, pkgs,
... ...
}: }: let
let
inherit (self.packages.${pkgs.system}) maomaowm; inherit (self.packages.${pkgs.system}) maomaowm;
cfg = config.wayland.windowManager.maomaowm; cfg = config.wayland.windowManager.maomaowm;
variables = lib.concatStringsSep " " cfg.systemd.variables; variables = lib.concatStringsSep " " cfg.systemd.variables;
@ -15,8 +13,7 @@ let
${lib.optionalString cfg.systemd.enable systemdActivation} ${lib.optionalString cfg.systemd.enable systemdActivation}
${cfg.autostart_sh} ${cfg.autostart_sh}
''; '';
in in {
{
options = { options = {
wayland.windowManager.maomaowm = with lib; { wayland.windowManager.maomaowm = with lib; {
enable = mkOption { enable = mkOption {
@ -121,9 +118,11 @@ in
Description = "maomao compositor session"; Description = "maomao compositor session";
Documentation = ["man:systemd.special(7)"]; Documentation = ["man:systemd.special(7)"];
BindsTo = ["graphical-session.target"]; BindsTo = ["graphical-session.target"];
Wants = [ Wants =
[
"graphical-session-pre.target" "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"]; After = ["graphical-session-pre.target"];
Before = lib.optional cfg.systemd.xdgAutostart "xdg-desktop-autostart.target"; Before = lib.optional cfg.systemd.xdgAutostart "xdg-desktop-autostart.target";
}; };

20
nix/nixos-modules.nix
View file

@ -1,14 +1,11 @@
self: self: {
{
config, config,
lib, lib,
pkgs, pkgs,
... ...
}: }: let
let
cfg = config.programs.maomaowm; cfg = config.programs.maomaowm;
in in {
{
options = { options = {
programs.maomaowm = { programs.maomaowm = {
enable = lib.mkEnableOption "maomaowm, a wayland compositor based on dwl"; enable = lib.mkEnableOption "maomaowm, a wayland compositor based on dwl";
@ -21,9 +18,15 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages =
[
cfg.package 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 = { xdg.portal = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
@ -42,6 +45,5 @@ in
graphical-desktop.enable = lib.mkDefault true; graphical-desktop.enable = lib.mkDefault true;
}; };
}; };
} }