From aeb63b345b583b5f8790e92a63c9f23718bdfd1a Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 12 Jul 2024 13:45:21 -0700 Subject: [PATCH] feat(logistics): cura --- overlays/cura.nix | 15 +++++++++++++++ overlays/default.nix | 2 ++ systems/logistics/nixos.nix | 4 ++++ 3 files changed, 21 insertions(+) create mode 100644 overlays/cura.nix diff --git a/overlays/cura.nix b/overlays/cura.nix new file mode 100644 index 00000000..a0ab7461 --- /dev/null +++ b/overlays/cura.nix @@ -0,0 +1,15 @@ +final: prev: { + cura-octoprint = final.cura.override { + plugins = [ final.curaPlugins.octoprint ]; + }; + + curaengine = prev.curaengine.override { + inherit (final.python311Packages) libarcus; + }; + cura = prev.cura.override { + python3 = final.python311; + }; + curaPlugins = prev.curaPlugins.override { + python3Packages = final.python311Packages; + }; +} diff --git a/overlays/default.nix b/overlays/default.nix index bb69231e..263be76a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,6 +4,7 @@ in rec { default = nixlib.composeManyExtensions [ barcodebuddy builders + cura krb5 minecraft nfs @@ -12,6 +13,7 @@ in rec { samba ]; barcodebuddy = import ./barcodebuddy.nix; + cura = import ./cura.nix; krb5 = import ./krb5.nix; minecraft = import ./minecraft.nix; nfs = import ./nfs.nix; diff --git a/systems/logistics/nixos.nix b/systems/logistics/nixos.nix index ba0cd868..a4205305 100644 --- a/systems/logistics/nixos.nix +++ b/systems/logistics/nixos.nix @@ -1,4 +1,5 @@ { + pkgs, config, meta, lib, @@ -56,12 +57,15 @@ in { }; }; + environment.systemPackages = [ pkgs.cura-octoprint ]; + users.users.logistics = { uid = 1000; isNormalUser = true; description = "Logistics"; extraGroups = [ "nixbuilder" + (mkIf (!config.services.octoprint.enable) "dialout") (mkIf config.networking.networkmanager.enable "networkmanager") ]; hashedPasswordFile = config.sops.secrets.logistics-user-password.path;