From d7123833566fd733513b343d1544630e135d50b2 Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Mon, 23 Jan 2023 15:46:55 -0800 Subject: [PATCH] disable wayland, fix aurora --- flake.lock | 6 +++--- flake.nix | 5 ++++- systems/common.nix | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 65fa21a..71784e6 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674250603, - "narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=", + "lastModified": 1674511629, + "narHash": "sha256-e2sc2Pv6z3aLuqXrunGvoKAfOABbWV31txgboIro+GE=", "owner": "nix-community", "repo": "home-manager", - "rev": "275ab728912006eecb549338a50f24f294a7cfb7", + "rev": "12d43fd40a7658976c18eaa05bba62b6045e5b3e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 86d3059..5b74cde 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,10 @@ }; aurora = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ ./configuration.nix ]; + modules = [ ./systems/common.nix + ./systems/aurora.nix + ./user-jsutter.nix + ]; }; }; }; diff --git a/systems/common.nix b/systems/common.nix index eb6db3f..4b3b4e4 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -82,6 +82,7 @@ # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.wayland = false; # Configure keymap in X11 services.xserver = {