From f89c97d3a1f38f0c2b4c6c4fde5d5eedd194300a Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 28 Jul 2024 23:11:38 +0200 Subject: [PATCH 1/2] pkgs/mkScriptOverride: init --- pkgs/by-name/mk/mkScriptOverride/package.nix | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/mk/mkScriptOverride/package.nix diff --git a/pkgs/by-name/mk/mkScriptOverride/package.nix b/pkgs/by-name/mk/mkScriptOverride/package.nix new file mode 100644 index 0000000..6777a0c --- /dev/null +++ b/pkgs/by-name/mk/mkScriptOverride/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, +}: + +{ + src, + script, + ... +} @ args: +lib.hiPrio (stdenv.mkDerivation ( + { + src = src; + name = "${src.name}-script-override"; + phases = [ "installPhase" "scriptOverridePhase" ]; + installPhase = '' + runHook preInstall + + cp -r $src $out + chmod u+w -R $out + + runHook postInstall + ''; + scriptOverridePhase = script; + } // lib.removeAttrs args [ + "pkg" + "commands" + ] +)) From 78ab704ca3f7caefefb590eb76ecb9dc029fd51b Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 28 Jul 2024 23:22:53 +0200 Subject: [PATCH 2/2] nixos/gnupg: create --- hosts/main.nix | 1 + hosts/tablet.nix | 1 + nix-os/gnupg.nix | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 nix-os/gnupg.nix diff --git a/hosts/main.nix b/hosts/main.nix index 0fca5f6..cfa6e41 100644 --- a/hosts/main.nix +++ b/hosts/main.nix @@ -19,6 +19,7 @@ ../nix-os/xdg-default-apps.nix ../nix-os/services/nix-binary-cache.nix ../nix-os/udev.nix + ../nix-os/gnupg.nix "${inputs.nixos-vscode-server}" ]; diff --git a/hosts/tablet.nix b/hosts/tablet.nix index 7c449bf..ad06d9b 100644 --- a/hosts/tablet.nix +++ b/hosts/tablet.nix @@ -8,6 +8,7 @@ ../nix-os/adb.nix ../nix-os/locale.nix ../nix-os/shell.nix + ../nix-os/gnupg.nix ../nix-os/desktopManagers/gnome.nix ../nix-os/displayManagers/gdm.nix diff --git a/nix-os/gnupg.nix b/nix-os/gnupg.nix new file mode 100644 index 0000000..1c9b20e --- /dev/null +++ b/nix-os/gnupg.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + config = { + # Use pcscd for smartcard support + services.pcscd.enable = true; + + environment.systemPackages = [( + pkgs.gnupg.overrideAttrs (superAttrs: { + configureFlags = superAttrs.configureFlags or [] + ++ [ "--disable-ccid-driver" ]; + }) + )]; + }; +}