From 0b77381bb0737f20375c7dd771b45a0ae0fcdf6a Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sat, 23 Mar 2024 22:47:14 +0100 Subject: [PATCH] [eid] Attempt at fixing eid on NixOS --- nixos/hosts/Tibo-NixFat/default.nix | 1 + nixos/modules/hardware/default.nix | 1 + nixos/modules/hardware/eid/default.nix | 18 +++++++ nixos/users/tdpeuter/firefox.nix | 68 +++++++++++++------------- 4 files changed, 55 insertions(+), 33 deletions(-) create mode 100644 nixos/modules/hardware/eid/default.nix diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix index 87186d4..257d51c 100644 --- a/nixos/hosts/Tibo-NixFat/default.nix +++ b/nixos/hosts/Tibo-NixFat/default.nix @@ -9,6 +9,7 @@ desktop.sway.enable = true; hardware = { + eid.enable = true; nvidia = { enable = true; model = "Quadro T2000"; diff --git a/nixos/modules/hardware/default.nix b/nixos/modules/hardware/default.nix index f77ad04..2d38b1e 100644 --- a/nixos/modules/hardware/default.nix +++ b/nixos/modules/hardware/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./eid ./nvidia ./yubikey ]; diff --git a/nixos/modules/hardware/eid/default.nix b/nixos/modules/hardware/eid/default.nix new file mode 100644 index 0000000..187be74 --- /dev/null +++ b/nixos/modules/hardware/eid/default.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs-unstable, ... }: + +let + cfg = config.sisyphus.hardware.eid; +in { + options.sisyphus.hardware.eid.enable = lib.mkEnableOption "Electronic identity card (eID)"; + + config = lib.mkIf cfg.enable { + services.pcscd = { + enable = true; + plugins = [ pkgs-unstable.ccid ]; + }; + + environment.systemPackages = with pkgs-unstable; [ + eid-mw + ]; + }; +} diff --git a/nixos/users/tdpeuter/firefox.nix b/nixos/users/tdpeuter/firefox.nix index ba1e9e2..4006cb0 100644 --- a/nixos/users/tdpeuter/firefox.nix +++ b/nixos/users/tdpeuter/firefox.nix @@ -18,42 +18,44 @@ in { DisableFirefoxStudies = true; DisablePocket = true; DisableTelemetry = true; - ExtensionSettings = {}; OfferToSaveLogins = false; }; + # Support smart cards + pkcs11Modules = with pkgs-unstable; [ + eid-mw + ]; }; - profiles.tdpeuter = { - search = { - default = "DuckDuckGo"; - force = true; - engines = { - "Bing".metaData.hidden = true; - "eBay".metaData.hidden = true; - - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - "GitHub" = { - urls = [{ - template = "https://github.com/search"; - params = [ - { name = "q"; value = "{searchTerms}"; } - { name = "type"; value = "repositories"; } - ]; - }]; - - icon = "${pkgs.icosystem}/share/icons/icosystem/scalable/apps/github-mark.svg"; - definedAliases = [ "@gh" ]; - }; + + profiles.tdpeuter.search = { + default = "DuckDuckGo"; + force = true; + engines = { + "Bing".metaData.hidden = true; + "eBay".metaData.hidden = true; + + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; + }; + "GitHub" = { + urls = [{ + template = "https://github.com/search"; + params = [ + { name = "q"; value = "{searchTerms}"; } + { name = "type"; value = "repositories"; } + ]; + }]; + + icon = "${pkgs.icosystem}/share/icons/icosystem/scalable/apps/github-mark.svg"; + definedAliases = [ "@gh" ]; }; }; };