This commit is contained in:
Yorick van Pelt 2022-03-16 15:54:46 +01:00
parent bff94e4f1a
commit 21fed419f5
Signed by: yorick
GPG key ID: A36E70F9DC014A15
4 changed files with 14 additions and 4 deletions

View file

@ -6,6 +6,15 @@
# ''; # '';
# makeFlags = pkgs.lib.filter (x: x != "CC=$CC") o.makeFlags; # makeFlags = pkgs.lib.filter (x: x != "CC=$CC") o.makeFlags;
# }); # });
yubikey-manager = super.yubikey-manager.overrideAttrs (o: {
# remove after 7d8d3c71228756406b70e142411295affbbb3fa1 is merged
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'cryptography = "^2.1 || ^3.0"' 'cryptography = "*"'
substituteInPlace "ykman/pcsc/__init__.py" \
--replace 'pkill' '${pkgs.procps}/bin/pkill'
'';
});
notmuch = super.notmuch.overrideAttrs (o: { notmuch = super.notmuch.overrideAttrs (o: {
doCheck = false; doCheck = false;
}); });

View file

@ -26,10 +26,10 @@ in {
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.fprintd.enable = true; services.fprintd.enable = true;
system.stateVersion = "21.05"; system.stateVersion = "21.05";
boot.kernelPackages = pkgs.linuxPackages_5_14; # todo: zfs boot.kernelPackages = pkgs.linuxPackages_5_15;
boot.initrd.availableKernelModules = [ "i915" ]; boot.initrd.availableKernelModules = [ "i915" ];
boot.loader.timeout = 0; boot.loader.timeout = 1;
boot.kernelParams = ["i915.fastboot=1" "quiet"]; boot.kernelParams = ["i915.fastboot=1" "i915.enable_psr=0" ]; # todo: 2?, "quiet"
#boot.plymouth.enable = true; #boot.plymouth.enable = true;
} }

View file

@ -23,6 +23,7 @@ in {
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pkgs.ghostscript pkgs.ghostscript
pkgs.yubikey-manager
pkgs.glib pkgs.glib
]; ];
environment.sessionVariables.XDG_DATA_DIRS = with pkgs; [ environment.sessionVariables.XDG_DATA_DIRS = with pkgs; [

View file

@ -51,7 +51,7 @@ in {
hledger hledger
#transmission-remote-gtk #transmission-remote-gtk
gopass gopass
#yubioath-desktop # todo yubioath-desktop # todo
]; ];
media = mkEnv "y-media" [ media = mkEnv "y-media" [