diff --git a/machines/Lilim/hardware-configuration.nix b/machines/Lilim/hardware-configuration.nix index 1d4dc62..74a27fb 100644 --- a/machines/Lilim/hardware-configuration.nix +++ b/machines/Lilim/hardware-configuration.nix @@ -8,9 +8,9 @@ in { boot = { loader.systemd-boot = { enable = true; - signed = true; - signing-key = "${cfg.secretPath}/secureboot/db.key"; - signing-certificate = "${cfg.secretPath}/secureboot/db.crt"; +# signed = true; +# signing-key = "${cfg.secretPath}/secureboot/db.key"; +# signing-certificate = "${cfg.secretPath}/secureboot/db.crt"; }; loader.efi.canTouchEfiVariables = true; tmpOnTmpfs = true; @@ -44,9 +44,9 @@ in { ksm.enable = true; opengl = { 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; - extraPackages32 = with pkgs.pkgsi686Linux; [ libvdpau-va-gl vaapiIntel vaapiVdpau ]; + extraPackages32 = with pkgs.pkgsi686Linux; [ libvdpau-va-gl libva vaapiIntel vaapiVdpau ]; }; pulseaudio = { diff --git a/pkgs/pkgsets/python3.nix b/pkgs/pkgsets/python3.nix index 337f08d..bd475c7 100644 --- a/pkgs/pkgsets/python3.nix +++ b/pkgs/pkgsets/python3.nix @@ -3,7 +3,7 @@ let gitpkgs = import /nixpkgs {}; 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; [ GitPython bpython diff --git a/services/desktop.nix b/services/desktop.nix index 89b59de..041de5c 100644 --- a/services/desktop.nix +++ b/services/desktop.nix @@ -44,10 +44,6 @@ in mkIf (elem "desktop" cfg.services) { i3 = mkIf (elem "i3" cfg.desktop.wms) (import ./desktop/i3.nix { inherit pkgs; }); default = elemAt cfg.desktop.wms 0; }; - multitouch = { - enable = true; - invertScroll = true; - }; libinput = { enable = true; tapping = true;