M-Labs/it-infra
M-Labs/it-infra
8
0
Fork 6
Code Issues 11 Pull Requests 1 Releases Wiki Activity

nixops: nixpkgs 21.05 compatibility

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2021-06-02 08:57:07 +08:00
parent 8eded4637b
commit d38b89efc2
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixops/desktop.nix
View File

@ -75,7 +75,7 @@ in
PKCS11Provider "${pkgs.opensc}/lib/opensc-pkcs11.so" PKCS11Provider "${pkgs.opensc}/lib/opensc-pkcs11.so"
''; '';
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
services.gnome3.gnome-keyring.enable = pkgs.lib.mkForce false; services.gnome.gnome-keyring.enable = pkgs.lib.mkForce false;
programs.ssh.agentPKCS11Whitelist = "${pkgs.opensc}/lib/opensc-pkcs11.so"; programs.ssh.agentPKCS11Whitelist = "${pkgs.opensc}/lib/opensc-pkcs11.so";
security.pam.p11.enable = true; security.pam.p11.enable = true;
@ -118,8 +118,8 @@ in
services.xserver.xkbOptions = "eurosign:e"; services.xserver.xkbOptions = "eurosign:e";
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome.enable = true;
environment.gnome3.excludePackages = [ pkgs.epiphany pkgs.gnome3.geary ]; environment.gnome.excludePackages = [ pkgs.epiphany pkgs.gnome3.geary ];
systemd.suppressedSystemUnits = [ systemd.suppressedSystemUnits = [
"hibernate.target" "hibernate.target"

5
nixops/rpi-server.nix
View File

@ -19,9 +19,10 @@
}; };
boot.kernelParams = ["cma=64M"]; # work around https://github.com/raspberrypi/linux/issues/3208 boot.kernelParams = ["cma=64M"]; # work around https://github.com/raspberrypi/linux/issues/3208
boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3; boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3;
boot.initrd.includeDefaultModules = false;
hardware.deviceTree.enable = true; hardware.deviceTree.enable = true;
hardware.deviceTree.base = pkgs.device-tree_rpi; hardware.deviceTree.filter = "*rpi*.dtb";
hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ]; hardware.deviceTree.overlays = [ { name = "poe"; dtboFile = "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo"; } ];
fileSystems = { fileSystems = {
"/" = { "/" = {

5
nixops/rpi.nix
View File

@ -15,9 +15,10 @@ in
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;
boot.kernelParams = if rpi4 then ["cma=64M"] else []; # work around https://github.com/raspberrypi/linux/issues/3208 boot.kernelParams = if rpi4 then ["cma=64M"] else []; # work around https://github.com/raspberrypi/linux/issues/3208
boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3; boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3;
boot.initrd.includeDefaultModules = false;
hardware.deviceTree.enable = true; hardware.deviceTree.enable = true;
hardware.deviceTree.base = pkgs.device-tree_rpi; hardware.deviceTree.filter = "*rpi*.dtb";
hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ]; hardware.deviceTree.overlays = [ { name = "poe"; dtboFile = "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo"; } ];
fileSystems = { fileSystems = {
"/" = { "/" = {