diff --git a/provision/hosts/wsl/configuration.nix b/provision/hosts/wsl/configuration.nix index 18d21a9f..76b53e74 100644 --- a/provision/hosts/wsl/configuration.nix +++ b/provision/hosts/wsl/configuration.nix @@ -51,13 +51,13 @@ in # Add DoD CA certs to trusted source security.pki.certificateFiles = [ - ./certs/DoDWCFInterCA1.crt - ./certs/DoDRootCA3.crt - ./certs/DoDRootCA4.crt - ./certs/DoDRootCA5.crt - ./certs/DoDRootCA6.crt - ./certs/DoDInteroperabilityRootCA2.crt - ./certs/USDoDCCEBInteroperabilityRootCA2.crt + ../../../resources/dod_certs/DoDWCFInterCA1.crt + ../../../resources/dod_certs/DoDRootCA3.crt + ../../../resources/dod_certs/DoDRootCA4.crt + ../../../resources/dod_certs/DoDRootCA5.crt + ../../../resources/dod_certs/DoDRootCA6.crt + ../../../resources/dod_certs/DoDInteroperabilityRootCA2.crt + ../../../resources/dod_certs/USDoDCCEBInteroperabilityRootCA2.crt ]; # Modules diff --git a/provision/modules/desktop/peripherals.nix b/provision/modules/desktop/peripherals.nix index b27e407c..acb6c43d 100644 --- a/provision/modules/desktop/peripherals.nix +++ b/provision/modules/desktop/peripherals.nix @@ -6,9 +6,6 @@ in { environment.systemPackages = with pkgs; [ libimobiledevice # Library to support iPhone, iPod Touch and iPad devices on Linux ifuse # Fuse filesystem implementation to access the contents of iOS devices - opensc # Open source smart card tools and middleware - pcsc-tools # Tools are used to test a PC/SC drivers - pkcs11helper # Library that simplifies the interaction with PKCS#11 pySVS # Control SVS subwoofers from the command-line (pkgs.writeScriptBin "sv" '' #!/bin/sh diff --git a/provision/modules/programs/firefox.nix b/provision/modules/programs/firefox.nix index 9ec8e21d..177e60ff 100644 --- a/provision/modules/programs/firefox.nix +++ b/provision/modules/programs/firefox.nix @@ -10,12 +10,30 @@ in { }; config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + opensc # Open source smart card tools and middleware + pcsc-tools # Tools are used to test a PC/SC drivers + pkcs11helper # Library that simplifies the interaction with PKCS#11 + ]; + + # Add DoD CA certs to trusted source + security.pki.certificateFiles = [ + ../../../resources/dod_certs/DoDWCFInterCA1.crt + ../../../resources/dod_certs/DoDRootCA3.crt + ../../../resources/dod_certs/DoDRootCA4.crt + ../../../resources/dod_certs/DoDRootCA5.crt + ../../../resources/dod_certs/DoDRootCA6.crt + ../../../resources/dod_certs/DoDInteroperabilityRootCA2.crt + ../../../resources/dod_certs/USDoDCCEBInteroperabilityRootCA2.crt + ]; + home-manager.users.${user} = { programs.firefox = { enable = true; policies = { SecurityDevices = { Add = { + # "NIPR" = "${pkgs.opensc}/lib/opensc-pkcs11.so"; }; }; diff --git a/provision/hosts/wsl/certs/DoDInteroperabilityRootCA2.crt b/resources/dod_certs/DoDInteroperabilityRootCA2.crt similarity index 100% rename from provision/hosts/wsl/certs/DoDInteroperabilityRootCA2.crt rename to resources/dod_certs/DoDInteroperabilityRootCA2.crt diff --git a/provision/hosts/wsl/certs/DoDRootCA3.crt b/resources/dod_certs/DoDRootCA3.crt similarity index 100% rename from provision/hosts/wsl/certs/DoDRootCA3.crt rename to resources/dod_certs/DoDRootCA3.crt diff --git a/provision/hosts/wsl/certs/DoDRootCA4.crt b/resources/dod_certs/DoDRootCA4.crt similarity index 100% rename from provision/hosts/wsl/certs/DoDRootCA4.crt rename to resources/dod_certs/DoDRootCA4.crt diff --git a/provision/hosts/wsl/certs/DoDRootCA5.crt b/resources/dod_certs/DoDRootCA5.crt similarity index 100% rename from provision/hosts/wsl/certs/DoDRootCA5.crt rename to resources/dod_certs/DoDRootCA5.crt diff --git a/provision/hosts/wsl/certs/DoDRootCA6.crt b/resources/dod_certs/DoDRootCA6.crt similarity index 100% rename from provision/hosts/wsl/certs/DoDRootCA6.crt rename to resources/dod_certs/DoDRootCA6.crt diff --git a/provision/hosts/wsl/certs/DoDWCFInterCA1.crt b/resources/dod_certs/DoDWCFInterCA1.crt similarity index 100% rename from provision/hosts/wsl/certs/DoDWCFInterCA1.crt rename to resources/dod_certs/DoDWCFInterCA1.crt diff --git a/provision/hosts/wsl/certs/USDoDCCEBInteroperabilityRootCA2.crt b/resources/dod_certs/USDoDCCEBInteroperabilityRootCA2.crt similarity index 100% rename from provision/hosts/wsl/certs/USDoDCCEBInteroperabilityRootCA2.crt rename to resources/dod_certs/USDoDCCEBInteroperabilityRootCA2.crt