commit 09fb07e4aff0a3554a170f4ce9378c322048e7d4 · pyrox.dev/nixpkgs

+3 -3

nixos/modules/services/hardware/lirc.nix

···

       32
       32
        
               default = [];

     

       33
       33
        
               description = "Extra arguments to lircd.";

     

       34
       34
        
             };

     

       35
       35
       -
       

     

       36
       35
        
           };

     

       37
       36
        
         };

     

       38
       37
        
       

     
···

       43
       42
        
           # Note: LIRC executables raises a warning, if lirc_options.conf do not exists

     

       44
       43
        
           environment.etc."lirc/lirc_options.conf".text = cfg.options;

     

       45
       44
        
       

     

       45
       45
       +
           passthru.lirc.socket = "/run/lirc/lircd";

     

       46
       46
       +
       

     

       46
       47
        
           environment.systemPackages = [ pkgs.lirc ];

     

       47
       48
        
       

     

       48
       49
        
           systemd.sockets.lircd = {

     

       49
       50
        
             description = "LIRC daemon socket";

     

       50
       51
        
             wantedBy = [ "sockets.target" ];

     

       51
       52
        
             socketConfig = {

     

       52
       52
       -
               # default search path

     

       53
       53
       -
               ListenStream = "/run/lirc/lircd";

     

       53
       53
       +
               ListenStream = config.passthru.lirc.socket;

     

       54
       54
        
               SocketUser = "lirc";

     

       55
       55
        
               SocketMode = "0660";

     

       56
       56
        
             };

+12 -2

nixos/modules/services/hardware/vdr.nix

···

       33
       33
        
               default = [];

     

       34
       34
        
               description = "Additional command line arguments to pass to VDR.";

     

       35
       35
        
             };

     

       36
       36
       +
       

     

       37
       37
       +
             enableLirc = mkEnableOption "enable LIRC";

     

       36
       38
        
           };

     

       37
       39
        
         };

     

       38
       40
        
       

     

       39
       41
        
         ###### implementation

     

       40
       42
        
       

     

       41
       41
       -
         config = mkIf cfg.enable {

     

       43
       43
       +
         config = mkIf cfg.enable (mkMerge [{

     

       42
       44
        
           systemd.tmpfiles.rules = [

     

       43
       45
        
             "d ${cfg.videoDir} 0755 vdr vdr -"

     

       44
       46
        
             "Z ${cfg.videoDir} - vdr vdr -"

     
···

       67
       69
        
           };

     

       68
       70
        
       

     

       69
       71
        
           users.groups.vdr = {};

     

       70
       70
       -
         };

     

       72
       72
       +
         }

     

       73
       73
       +
       

     

       74
       74
       +
         (mkIf cfg.enableLirc {

     

       75
       75
       +
           services.lirc.enable = true;

     

       76
       76
       +
           users.users.vdr.extraGroups = [ "lirc" ];

     

       77
       77
       +
           services.vdr.extraArguments = [

     

       78
       78
       +
             "--lirc=${config.passthru.lirc.socket}"

     

       79
       79
       +
           ];

     

       80
       80
       +
         })]);

     

       71
       81
        
       }