Skip to content

Commit 35ec9c3

Browse files
feat(niri): add mako default (system) config
Cf. emersion/mako#557 and emersion/mako#434
1 parent dc8ee02 commit 35ec9c3

File tree

3 files changed

+35
-2
lines changed

3 files changed

+35
-2
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 46ad7a9c98898e0e33504a216d35706003dd5d0f Mon Sep 17 00:00:00 2001
2+
From: John Rinehart <johnrichardrinehart@gmail.com>
3+
Date: Mon, 8 Dec 2025 14:35:46 -0500
4+
Subject: [PATCH] feat: support /etc/mako/config
5+
6+
---
7+
config.c | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/config.c b/config.c
11+
index 817f7e9..7f02139 100644
12+
--- a/config.c
13+
+++ b/config.c
14+
@@ -755,6 +755,7 @@ static char *get_default_config_path() {
15+
}
16+
17+
char *config_paths[] = {
18+
+ mako_asprintf("/etc/mako/config"),
19+
mako_asprintf("%s/.mako/config", home),
20+
mako_asprintf("%s/mako/config", config_home),
21+
};
22+
--
23+
2.51.2
24+

nixos-modules/desktop/greetd+niri.nix

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,16 @@ in
5454
services.greetd.settings.default_session.command = "${lib.getExe pkgs.tuigreet}";
5555
services.greetd.useTextGreeter = true;
5656

57-
environment.systemPackages = [
57+
environment.systemPackages = let
58+
myMako = pkgs.mako.overrideAttrs (old: {
59+
patches = old.patches or [] ++ [ ./0001-feat-support-etc-mako-config.patch ];
60+
});
61+
in
62+
[
5863
pkgs.alacritty
5964
pkgs.xwayland-satellite
6065
pkgs.fuzzel
6166
pkgs.grim
62-
pkgs.mako
6367
pkgs.slurp
6468
pkgs.swaylock
6569
pkgs.xwayland-satellite
@@ -72,6 +76,8 @@ in
7276
pkgs.wl-clip-persist
7377
pkgs.wl-clipboard
7478
pkgs.cliphist
79+
] ++ [
80+
myMako
7581
];
7682

7783
environment.etc."niri/config.kdl".source =
@@ -86,6 +92,7 @@ in
8692
checkPhase = null;
8793
});
8894
environment.etc."xdg/waybar".source = ./waybar;
95+
environment.etc."mako/config".source = ./mako.conf;
8996

9097
# Custom PAM config: fingerprint as first factor (rejects bad fingerprints),
9198
# then mandatory password - applied to greetd, sudo, and TTY logins

nixos-modules/desktop/mako.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
default-timeout=5000
2+
border-radius=5

0 commit comments

Comments
 (0)