felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(gnome): activate wayland

Browse source 
This activates wayland support but keep gnome-xorg as the default
session since some applications do not run with this setup yet.
This commit is contained in:
Felix Schröter 2021-08-04 22:08:30 +02:00
parent 14a8e725a3
commit 7a0f98d20e
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop/gnome.nix
View file

@ -33,12 +33,18 @@ in {
]; ];
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = false; services.xserver.displayManager.gdm.wayland = true;
services.xserver.displayManager.gdm.nvidiaWayland = true;
services.xserver.displayManager.defaultSession = "gnome-xorg";
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.extraGSettingsOverrides = '' services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
[org/gnome/desktop/input-sources] [org/gnome/desktop/input-sources]
sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')] sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')]
[org/gnome/mutter]
experimental-features=['kms-modifiers']
''; '';
programs.xwayland.enable = true;
# exclude some default applications # exclude some default applications
environment.gnome.excludePackages = with pkgs; [ environment.gnome.excludePackages = with pkgs; [

5
hardware/gpu-bumblebee.nix
View file

@ -7,5 +7,10 @@
hardware.opengl = { hardware.opengl = {
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ vaapiIntel vaapiVdpau libvdpau-va-gl ]; extraPackages = with pkgs; [ vaapiIntel vaapiVdpau libvdpau-va-gl ];
extraPackages32 = with pkgs.pkgsi686Linux; [
vaapiIntel
libvdpau-va-gl
vaapiVdpau
];
}; };
} }

6
hardware/gpu-nvidia.nix
View file

@ -3,12 +3,16 @@
{ {
# Graphics drivers # Graphics drivers
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia.modesetting.enable = true;
services.xserver.screenSection = '' services.xserver.screenSection = ''
Option "metamodes" "1920x1080_120 +0+0 {ForceCompositionPipeline=On, ForceFullCompositionPipeline=On}" Option "metamodes" "1920x1080_120 +0+0 {AllowGSYNC=On, AllowGSYNCCompatible=On, ForceCompositionPipeline=On, ForceFullCompositionPipeline=On}"
''; '';
hardware.opengl = { hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ libvdpau-va-gl vaapiVdpau ]; extraPackages = with pkgs; [ libvdpau-va-gl vaapiVdpau ];
extraPackages32 = with pkgs.pkgsi686Linux; [ libvdpau-va-gl vaapiVdpau ];
}; };
} }