diff --git a/hosts/main.nix b/hosts/main.nix index cfa6e41..0fca5f6 100644 --- a/hosts/main.nix +++ b/hosts/main.nix @@ -19,7 +19,6 @@ ../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 ad06d9b..7c449bf 100644 --- a/hosts/tablet.nix +++ b/hosts/tablet.nix @@ -8,7 +8,6 @@ ../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 deleted file mode 100644 index 1c9b20e..0000000 --- a/nix-os/gnupg.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -{ - config = { - # Use pcscd for smartcard support - services.pcscd.enable = true; - - environment.systemPackages = [( - pkgs.gnupg.overrideAttrs (superAttrs: { - configureFlags = superAttrs.configureFlags or [] - ++ [ "--disable-ccid-driver" ]; - }) - )]; - }; -} diff --git a/pkgs/by-name/mk/mkScriptOverride/package.nix b/pkgs/by-name/mk/mkScriptOverride/package.nix deleted file mode 100644 index 6777a0c..0000000 --- a/pkgs/by-name/mk/mkScriptOverride/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - 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" - ] -))