feat: switch to updated octoprint

This commit is contained in:
Patrick 2024-08-19 15:58:24 +02:00
parent 596cc35690
commit ccd83ce53e
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
3 changed files with 27 additions and 4 deletions

View file

@ -1,5 +1,8 @@
{ config, ... }: { config, inputs, ... }:
{ {
disabledModules = [ "services/misc/octoprint.nix" ];
imports = [ "${inputs.nixpkgs-octoprint}/nixos/modules/services/misc/octoprint.nix" ];
wireguard.elisabeth = { wireguard.elisabeth = {
client.via = "elisabeth"; client.via = "elisabeth";
firewallRuleForNode.elisabeth.allowedTCPPorts = [ config.services.octoprint.port ]; firewallRuleForNode.elisabeth.allowedTCPPorts = [ config.services.octoprint.port ];
@ -16,9 +19,9 @@
port = 3000; port = 3000;
enable = true; enable = true;
plugins = ps: with ps; [ ender3v2tempfix ]; plugins = ps: with ps; [ ender3v2tempfix ];
extraConfig = { settings = {
accessControl = { accessControl = {
addRemoteUser = true; addRemoteUsers = true;
trustRemoteUser = true; trustRemoteUser = true;
remoteUserHeader = "X-User"; remoteUserHeader = "X-User";
}; };

View file

@ -1339,6 +1339,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-octoprint": {
"locked": {
"lastModified": 1724074482,
"narHash": "sha256-yYJ+Tatu1+Mv98MmX5SxlB75XOLhjj7LjH5ipS+xy3A=",
"owner": "patrickdag",
"repo": "nixpkgs",
"rev": "c56804b205f94edeb066cc8460a64cfcd52d798f",
"type": "github"
},
"original": {
"owner": "patrickdag",
"ref": "octoprint-update",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1685801374, "lastModified": 1685801374,
@ -1697,6 +1713,7 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-nftables-firewall": "nixos-nftables-firewall", "nixos-nftables-firewall": "nixos-nftables-firewall",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-octoprint": "nixpkgs-octoprint",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nixvim": "nixvim", "nixvim": "nixvim",
"pre-commit-hooks": "pre-commit-hooks_4", "pre-commit-hooks": "pre-commit-hooks_4",

View file

@ -2,11 +2,14 @@
description = "patricks tolle nix config"; description = "patricks tolle nix config";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-octoprint.url = "github:patrickdag/nixpkgs/octoprint-update";
nixpkgs-wayland = { nixpkgs-wayland = {
url = "github:nix-community/nixpkgs-wayland"; url = "github:nix-community/nixpkgs-wayland";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-extra-modules = { nixos-extra-modules = {
url = "github:oddlama/nixos-extra-modules"; url = "github:oddlama/nixos-extra-modules";