murex: get working again
This commit is contained in:
		
							parent
							
								
									479986d2f6
								
							
						
					
					
						commit
						1d87223b87
					
				
							
								
								
									
										11
									
								
								murex.nix
									
									
									
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										11
									
								
								murex.nix
									
									
									
									
									
								
							@ -13,9 +13,7 @@
 | 
				
			|||||||
    uboot.enable = true;
 | 
					    uboot.enable = true;
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  boot.kernelPackages = pkgs.linuxPackages_latest;
 | 
					  boot.kernelPackages = pkgs.linuxPackages_5_4;
 | 
				
			||||||
  # boot.kernelPackages = pkgs.linuxPackages_4_18;
 | 
					 | 
				
			||||||
  # boot.kernelPackages = pkgs.linuxPackages_rpi;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  boot.kernelParams = [
 | 
					  boot.kernelParams = [
 | 
				
			||||||
    "cma=32M" # for virtual console, see https://nixos.wiki/wiki/NixOS_on_ARM
 | 
					    "cma=32M" # for virtual console, see https://nixos.wiki/wiki/NixOS_on_ARM
 | 
				
			||||||
@ -72,7 +70,11 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  services.octoprint = {
 | 
					  services.octoprint = {
 | 
				
			||||||
    enable = true;
 | 
					    enable = true;
 | 
				
			||||||
    plugins = ps: with ps; [ printtimegenius touchui psucontrol ];
 | 
					    plugins = ps: with ps; [
 | 
				
			||||||
 | 
					      printtimegenius
 | 
				
			||||||
 | 
					      touchui
 | 
				
			||||||
 | 
					      # psucontrol
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
  # systemd.services.setupGpioForRelais = rec {
 | 
					  # systemd.services.setupGpioForRelais = rec {
 | 
				
			||||||
  #   wantedBy = [ "octoprint.service" ];
 | 
					  #   wantedBy = [ "octoprint.service" ];
 | 
				
			||||||
@ -131,6 +133,7 @@
 | 
				
			|||||||
        # do not cache that octoprint is inaccessible on startup
 | 
					        # do not cache that octoprint is inaccessible on startup
 | 
				
			||||||
        extraConfig = ''
 | 
					        extraConfig = ''
 | 
				
			||||||
          proxy_cache off;
 | 
					          proxy_cache off;
 | 
				
			||||||
 | 
					          proxy_set_header Accept-Encoding "*";
 | 
				
			||||||
        '';
 | 
					        '';
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      locations."/webcam/".proxyPass = "http://localhost:5050/?action=stream";
 | 
					      locations."/webcam/".proxyPass = "http://localhost:5050/?action=stream";
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user