commit fd8696a17835a0150029765c25b9dd35e89868a5 · pyrox.dev/nixpkgs

+1

nixos/modules/module-list.nix

···

       1690
       1690
        
         ./system/boot/systemd.nix

     

       1691
       1691
        
         ./system/boot/systemd/coredump.nix

     

       1692
       1692
        
         ./system/boot/systemd/dm-verity.nix

     

       1693
       1693
       +
         ./system/boot/systemd/fido2.nix

     

       1693
       1694
        
         ./system/boot/systemd/initrd-secrets.nix

     

       1694
       1695
        
         ./system/boot/systemd/initrd.nix

     

       1695
       1696
        
         ./system/boot/systemd/journald.nix

+32

nixos/modules/system/boot/systemd/fido2.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.boot.initrd.systemd;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         options = {

     

       12
       12
       +
           boot.initrd.systemd.fido2.enable = lib.mkEnableOption "systemd FIDO2 support" // {

     

       13
       13
       +
             default = cfg.package.withFido2;

     

       14
       14
       +
             defaultText = lib.literalExpression "config.boot.initrd.systemd.package.withFido2";

     

       15
       15
       +
           };

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         config = lib.mkIf cfg.fido2.enable {

     

       19
       19
       +
           boot.initrd.services.udev.packages = [

     

       20
       20
       +
             # TODO: Add a better way to include upstream rules files.

     

       21
       21
       +
             (pkgs.runCommand "udev-fido2" { } ''

     

       22
       22
       +
               mkdir -p $out/lib/udev/rules.d/

     

       23
       23
       +
               cp ${cfg.package}/lib/udev/rules.d/60-fido-id.rules $out/lib/udev/rules.d/60-fido-id.rules

     

       24
       24
       +
             '')

     

       25
       25
       +
           ];

     

       26
       26
       +
           boot.initrd.systemd.storePaths = [

     

       27
       27
       +
             "${pkgs.systemd}/lib/udev/fido_id"

     

       28
       28
       +
             "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so"

     

       29
       29
       +
             "${pkgs.libfido2}/lib/libfido2.so.1"

     

       30
       30
       +
           ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

-5

nixos/modules/system/boot/systemd/initrd.nix

···

       547
       547
        
                 # Resolving sysroot symlinks without code exec

     

       548
       548
        
                 "${pkgs.chroot-realpath}/bin/chroot-realpath"

     

       549
       549
        
               ]

     

       550
       550
       -
               ++ optionals cfg.package.withCryptsetup [

     

       551
       551
       -
                 # fido2 support

     

       552
       552
       -
                 "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so"

     

       553
       553
       -
                 "${pkgs.libfido2}/lib/libfido2.so.1"

     

       554
       554
       -
               ]

     

       555
       550
        
               ++ jobScripts

     

       556
       551
        
               ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents);

     

       557
       552

+1 -1

pkgs/os-specific/linux/systemd/default.nix

···

       778
       778
        
           # needed - and therefore `interfaceVersion` should be incremented.

     

       779
       779
        
           interfaceVersion = 2;

     

       780
       780
        
       

     

       781
       781
       -
           inherit withBootloader withCryptsetup withEfi withHostnamed withImportd withKmod

     

       781
       781
       +
           inherit withBootloader withCryptsetup withEfi withFido2 withHostnamed withImportd withKmod

     

       782
       782
        
             withLocaled withMachined withPortabled withTimedated withTpm2Tss withUtmp

     

       783
       783
        
             util-linux kmod kbd;

     

       784
       784