nix: bump template and t480s-work to nixos 20.03

Notable changes:
* add extraConfig for gpg-agent to define the path to the pinentry-program
* removed X11 session directory activation script
This commit is contained in:
steveej 2020-03-13 08:57:12 +01:00
parent 07c0ebe3c1
commit de0de83c5b
6 changed files with 19 additions and 15 deletions

View file

@ -346,6 +346,8 @@ in {
unstablepkgs.swagger-codegen
# Misc Desktop Tools
# TODO: this may be required if brightness control isn't working
# brightnessctl
ltunify
# solaar # TODO: conflicts with solar over udev rules
dex

View file

@ -259,7 +259,8 @@ in {
services = {
gnome-keyring.enable = true;
blueman-applet.enable = true;
# TODO: this has been broken for a while, removing for now.
# blueman-applet.enable = true;
screen-locker = {
enable = true;
inactiveInterval = 7;
@ -273,6 +274,7 @@ in {
enableScDaemon = true;
enableSshSupport = true;
grabKeyboardAndMouse = true;
extraConfig = "pinentry-program ${pkgs.pinentry-gtk2}/bin/pinentry";
};
flameshot.enable = true;
};