klipper: additional options

This allows for easier interop with Moonraker, as well as giving an
ability to store klipper configuration files in /var/lib/klipper, thus not
littering /etc with all the backups SAVE_CONFIG does.

- Added `configFile` as an alternative way to specify configuration
- Added `isMutableConfig` and `mutableConfigPath`

Co-authored-by: @lovesegfault <bernardo@meurer.org>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Bernardo Meurer <bernardo@meurer.org>

cab 849c40b5 71dd63d5

Changed files
+68 -10
nixos
modules
services
+68 -10
nixos/modules/services/misc/klipper.nix
···
description = lib.mdDoc "Path of the API socket to create.";
};
+
mutableConfig = mkOption {
+
type = types.bool;
+
default = false;
+
example = true;
+
description = lib.mdDoc ''
+
Whether to copy the config to a mutable directory instead of using the one directly from the nix store.
+
This will only copy the config if the file at `services.klipper.mutableConfigPath` doesn't exist.
+
'';
+
};
+
+
mutableConfigFolder = mkOption {
+
type = types.path;
+
default = "/var/lib/klipper";
+
description = lib.mdDoc "Path to mutable Klipper config file.";
+
};
+
+
configFile = mkOption {
+
type = types.nullOr types.path;
+
default = null;
+
description = lib.mdDoc ''
+
Path to default Klipper config.
+
'';
+
};
+
octoprintIntegration = mkOption {
type = types.bool;
default = false;
···
};
settings = mkOption {
-
type = format.type;
-
default = { };
+
type = types.nullOr format.type;
+
default = null;
description = lib.mdDoc ''
Configuration for Klipper. See the [documentation](https://www.klipper3d.org/Overview.html#configuration-and-tuning-guides)
for supported values.
···
building of firmware and addition of klipper-flash tools for manual flashing.
This will add `klipper-flash-$mcu` scripts to your environment which can be called to flash the firmware.
'');
+
serial = mkOption {
+
type = types.nullOr path;
+
description = lib.mdDoc "Path to serial port this printer is connected to. Leave `null` to derive it from `service.klipper.settings`.";
+
};
configFile = mkOption {
type = path;
description = lib.mdDoc "Path to firmware config which is generated using `klipper-genconf`";
···
assertions = [
{
assertion = cfg.octoprintIntegration -> config.services.octoprint.enable;
-
message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
+
message = "Option services.klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
}
{
assertion = cfg.user != null -> cfg.group != null;
-
message = "Option klipper.group is not set when a user is specified.";
+
message = "Option services.klipper.group is not set when services.klipper.user is specified.";
}
{
-
assertion = foldl (a: b: a && b) true (mapAttrsToList (mcu: _: mcu != null -> (hasAttrByPath [ "${mcu}" "serial" ] cfg.settings)) cfg.firmwares);
-
message = "Option klipper.settings.$mcu.serial must be set when klipper.firmware.$mcu is specified";
+
assertion = cfg.settings != null -> foldl (a: b: a && b) true (mapAttrsToList (mcu: _: mcu != null -> (hasAttrByPath [ "${mcu}" "serial" ] cfg.settings)) cfg.firmwares);
+
message = "Option services.klipper.settings.$mcu.serial must be set when settings.klipper.firmware.$mcu is specified";
+
}
+
{
+
assertion = (cfg.configFile != null) != (cfg.settings != null);
+
message = "You need to either specify services.klipper.settings or services.klipper.defaultConfig.";
}
];
-
environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings;
+
environment.etc = mkIf (!cfg.mutableConfig) {
+
"klipper.cfg".source = if cfg.settings != null then format.generate "klipper.cfg" cfg.settings else cfg.configFile;
+
};
services.klipper = mkIf cfg.octoprintIntegration {
user = config.services.octoprint.user;
···
let
klippyArgs = "--input-tty=${cfg.inputTTY}"
+ optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}";
+
printerConfigPath =
+
if cfg.mutableConfig
+
then cfg.mutableConfigFolder + "/printer.cfg"
+
else "/etc/klipper.cfg";
+
printerConfigFile =
+
if cfg.settings != null
+
then format.generate "klipper.cfg" cfg.settings
+
else cfg.configFile;
in
{
description = "Klipper 3D Printer Firmware";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
+
preStart = ''
+
mkdir -p ${cfg.mutableConfigFolder}
+
${lib.optionalString (cfg.mutableConfig) ''
+
[ -e ${printerConfigPath} ] || {
+
cp ${printerConfigFile} ${printerConfigPath}
+
chmod +w ${printerConfigPath}
+
}
+
''}
+
mkdir -p ${cfg.mutableConfigFolder}/gcodes
+
'';
serviceConfig = {
-
ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg";
+
ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} ${printerConfigPath}";
RuntimeDirectory = "klipper";
+
StateDirectory = "klipper";
SupplementaryGroups = [ "dialout" ];
WorkingDirectory = "${cfg.package}/lib";
OOMScoreAdjust = "-999";
···
CPUSchedulingPriority = 99;
IOSchedulingClass = "realtime";
IOSchedulingPriority = 0;
+
UMask = "0002";
} // (if cfg.user != null then {
Group = cfg.group;
User = cfg.user;
···
environment.systemPackages =
with pkgs;
let
+
default = a: b: if a != null then a else b;
firmwares = filterAttrs (n: v: v!= null) (mapAttrs
-
(mcu: { enable, configFile }: if enable then pkgs.klipper-firmware.override {
+
(mcu: { enable, configFile, serial }: if enable then pkgs.klipper-firmware.override {
mcu = lib.strings.sanitizeDerivationName mcu;
firmwareConfig = configFile;
} else null)
···
(mcu: firmware: pkgs.klipper-flash.override {
mcu = lib.strings.sanitizeDerivationName mcu;
klipper-firmware = firmware;
-
flashDevice = cfg.settings."${mcu}".serial;
+
flashDevice = default cfg.firmwares."${mcu}".serial cfg.settings."${mcu}".serial;
firmwareConfig = cfg.firmwares."${mcu}".configFile;
})
firmwares;
in
[ klipper-genconf ] ++ firmwareFlasher ++ attrValues firmwares;
};
+
meta.maintainers = [
+
maintainers.cab404
+
];
}