diff options
| -rw-r--r-- | hosts/common/desktop/default.nix | 5 | ||||
| -rw-r--r-- | hosts/common/desktop/gnome.nix | 11 | ||||
| -rw-r--r-- | hosts/common/hardware/default.nix | 4 | ||||
| -rw-r--r-- | hosts/glados/default.nix | 1 | ||||
| -rw-r--r-- | users/seth/desktop/gnome.nix | 1 |
5 files changed, 15 insertions, 7 deletions
diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix index 3a651ea..68ac655 100644 --- a/hosts/common/desktop/default.nix +++ b/hosts/common/desktop/default.nix @@ -19,7 +19,10 @@ in { ); environment.noXlibs = lib.mkForce false; - programs.xwayland.enable = gui; + programs = { + dconf.enable = gui; + xwayland.enable = gui; + }; services.xserver.enable = gui; xdg.portal.enable = gui; } diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix index b72d757..04e32e1 100644 --- a/hosts/common/desktop/gnome.nix +++ b/hosts/common/desktop/gnome.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { environment = { gnome.excludePackages = with pkgs; [ epiphany @@ -11,7 +15,10 @@ }; services.xserver = { - displayManager.gdm.enable = true; + displayManager.gdm = { + enable = true; + wayland = lib.mkForce true; + }; desktopManager.gnome.enable = true; }; } diff --git a/hosts/common/hardware/default.nix b/hosts/common/hardware/default.nix index a01e1a9..be395d2 100644 --- a/hosts/common/hardware/default.nix +++ b/hosts/common/hardware/default.nix @@ -1,5 +1,3 @@ _: { - imports = [ - ./nvidia.nix - ]; + hardware.enableAllFirmware = true; } diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix index 0994349..1bccb8c 100644 --- a/hosts/glados/default.nix +++ b/hosts/glados/default.nix @@ -1,5 +1,6 @@ _: { imports = [ + ../common/hardware ../common/hardware/nvidia.nix ./boot.nix ./hardware-configuration.nix diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome.nix index f6dcd75..0c44946 100644 --- a/users/seth/desktop/gnome.nix +++ b/users/seth/desktop/gnome.nix @@ -6,7 +6,6 @@ disable-user-extensions = false; enabled-extensions = [ ]; favorite-apps = [ |