diff options
author | Bernardo Meurer <bernardo@meurer.org> | 2023-05-14 16:48:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-14 16:48:48 -0400 |
commit | d8b94f5b2c1119b06d1be1b4f5e776dcb37978b1 (patch) | |
tree | f6a09221e4a8c857582dd06e155af8c0ddf70368 /nixos | |
parent | 9c63dd372dcf22705f1777c71f7f325afd6b4000 (diff) | |
parent | 570fff5e92d55dd4d071535d35a858d57b69150d (diff) |
Merge pull request #231881 from lovesegfault/klipper-log
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/misc/klipper.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 9f8539980aaab..ad881d4462a3c 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -23,6 +23,16 @@ in description = lib.mdDoc "The Klipper package."; }; + logFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/lib/klipper/klipper.log"; + description = lib.mdDoc '' + Path of the file Klipper should log to. + If `null`, it logs to stdout, which is not recommended by upstream. + ''; + }; + inputTTY = mkOption { type = types.path; default = "/run/klipper/tty"; @@ -151,7 +161,9 @@ in systemd.services.klipper = let klippyArgs = "--input-tty=${cfg.inputTTY}" - + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}"; + + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}" + + optionalString (cfg.logFile != null) " --logfile=${cfg.logFile}" + ; printerConfigPath = if cfg.mutableConfig then cfg.mutableConfigFolder + "/printer.cfg" @@ -177,7 +189,7 @@ in ''; serviceConfig = { - ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} ${printerConfigPath}"; + ExecStart = "${cfg.package}/bin/klippy ${klippyArgs} ${printerConfigPath}"; RuntimeDirectory = "klipper"; StateDirectory = "klipper"; SupplementaryGroups = [ "dialout" ]; |