commit 4a01f70f8f374f3f0e07f24957e212305325cf11 · pyrox.dev/nixpkgs

+12 -3
nixos/modules/services/misc/octoprint.nix
···

       6
       6
        
       

     

       7
       7
        
         cfg = config.services.octoprint;

     

       8
       8
        
       

     

       9
       9
       -
         cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON {

     

       9
       9
       +
         baseConfig = {

     

       10
       10
        
           plugins.cura.cura_engine = "${pkgs.curaengine}/bin/CuraEngine";

     

       11
       11
        
           server.host = cfg.host;

     

       12
       12
        
           server.port = cfg.port;

     

       13
       13
        
           webcam.ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";

     

       14
       14
       -
         });

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         fullConfig = recursiveUpdate cfg.extraConfig baseConfig;

     

       17
       17
       +
       

     

       18
       18
       +
         cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig);

     

       15
       19
        
       

     

       16
       20
        
         pluginsEnv = pkgs.python.buildEnv.override {

     

       17
       21
        
           extraLibs = cfg.plugins pkgs.octoprint-plugins;

     
···

       62
       66
        
             };

     

       63
       67
        
       

     

       64
       68
        
             plugins = mkOption {

     

       65
       65
       -
               #type = types.functionTo (types.listOf types.package);

     

       66
       69
        
               default = plugins: [];

     

       67
       70
        
               defaultText = "plugins: []";

     

       68
       71
        
               example = literalExample "plugins: [ m3d-fio ]";

     

       69
       72
        
               description = "Additional plugins.";

     

       73
       73
       +
             };

     

       74
       74
       +
       

     

       75
       75
       +
             extraConfig = mkOption {

     

       76
       76
       +
               type = types.attrs;

     

       77
       77
       +
               default = {};

     

       78
       78
       +
               description = "Extra options which are added to OctoPrint's YAML configuration file.";

     

       70
       79
        
             };

     

       71
       80
        
       

     

       72
       81
        
           };