derped
/
nixos
1
0
Fork 0
Code Releases Activity

Fix breakage after switching back from git to unstable channel.

This commit is contained in:
Kevin Baensch 2019-12-18 09:49:39 +01:00
parent bf80718916
commit 627a45c070
Signed by: derped
GPG Key ID: C0F1D326C7626543
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
machines/Lilim/hardware-configuration.nix
View File

@ -8,9 +8,9 @@ in {
boot = { boot = {
loader.systemd-boot = { loader.systemd-boot = {
enable = true; enable = true;
signed = true; # signed = true;
signing-key = "${cfg.secretPath}/secureboot/db.key"; # signing-key = "${cfg.secretPath}/secureboot/db.key";
signing-certificate = "${cfg.secretPath}/secureboot/db.crt"; # signing-certificate = "${cfg.secretPath}/secureboot/db.crt";
}; };
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
tmpOnTmpfs = true; tmpOnTmpfs = true;
@ -44,9 +44,9 @@ in {
ksm.enable = true; ksm.enable = true;
opengl = { opengl = {
driSupport = true; driSupport = true;
extraPackages = with pkgs; [ intel-media-driver libvdpau-va-gl vaapiIntel vaapiVdpau intel-media-driver ]; extraPackages = with pkgs; [ intel-media-driver libvdpau-va-gl libva vaapiIntel vaapiVdpau intel-media-driver ];
driSupport32Bit = true; driSupport32Bit = true;
extraPackages32 = with pkgs.pkgsi686Linux; [ libvdpau-va-gl vaapiIntel vaapiVdpau ]; extraPackages32 = with pkgs.pkgsi686Linux; [ libvdpau-va-gl libva vaapiIntel vaapiVdpau ];
}; };
pulseaudio = { pulseaudio = {

2
pkgs/pkgsets/python3.nix
View File

@ -3,7 +3,7 @@
let let
gitpkgs = import /nixpkgs {}; gitpkgs = import /nixpkgs {};
in { in {
config.machine.pkgsets.python3.pkgwrap = (gitpkgs.python3Full.withPackages (ps: with ps; config.machine.pkgsets.python3.pkgs)); config.machine.pkgsets.python3.pkgwrap = (pkgs.python3Full.withPackages (ps: with ps; config.machine.pkgsets.python3.pkgs));
config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [ config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
GitPython GitPython
bpython bpython

4
services/desktop.nix
View File

@ -44,10 +44,6 @@ in mkIf (elem "desktop" cfg.services) {
i3 = mkIf (elem "i3" cfg.desktop.wms) (import ./desktop/i3.nix { inherit pkgs; }); i3 = mkIf (elem "i3" cfg.desktop.wms) (import ./desktop/i3.nix { inherit pkgs; });
default = elemAt cfg.desktop.wms 0; default = elemAt cfg.desktop.wms 0;
}; };
multitouch = {
enable = true;
invertScroll = true;
};
libinput = { libinput = {
enable = true; enable = true;
tapping = true; tapping = true;