From 0f5a4d121523920bf599809f378f1be62831ef3d Mon Sep 17 00:00:00 2001
From: Frank Lyder Bredland <fl@nyggen.com>
Date: Sun, 14 Jul 2024 18:31:27 +0200
Subject: [PATCH] Replace hyprland/wayland with gnome/x11

---
 os/nixos/home-manager/home.nix     |  2 +-
 os/nixos/host/mods/audio-video.nix |  2 +-
 os/nixos/host/mods/gnome-x11.nix   | 21 +++++++++++++++++++++
 os/nixos/host/nixos.config.nix     |  1 +
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 os/nixos/host/mods/gnome-x11.nix

diff --git a/os/nixos/home-manager/home.nix b/os/nixos/home-manager/home.nix
index 29bae53..9f5dbb7 100644
--- a/os/nixos/home-manager/home.nix
+++ b/os/nixos/home-manager/home.nix
@@ -3,7 +3,7 @@
 {
 	imports = [
 		./env.nix
-		./wayland.nix
+#		./wayland.nix
     ./eww.nix
     ./apps.nix
 	];
diff --git a/os/nixos/host/mods/audio-video.nix b/os/nixos/host/mods/audio-video.nix
index c7078a2..a711126 100644
--- a/os/nixos/host/mods/audio-video.nix
+++ b/os/nixos/host/mods/audio-video.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  services.seatd.enable = true; # seatd is needed to run hyprland
+  #services.seatd.enable = true; # seatd is needed to run hyprland
 
 	environment.sessionVariables = {
 		# Hint electron apps to use wayland
diff --git a/os/nixos/host/mods/gnome-x11.nix b/os/nixos/host/mods/gnome-x11.nix
new file mode 100644
index 0000000..d606489
--- /dev/null
+++ b/os/nixos/host/mods/gnome-x11.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+		kitty         # Terminal emulator
+    xorg.xinit
+  ];
+
+  services.xserver = {
+    enable = true;
+
+    displayManager = {
+      gdm.enable = true;
+      gdm.wayland = false;
+    };
+
+    desktopManager = {
+      gnome.enable = true;
+    };
+  };
+}
diff --git a/os/nixos/host/nixos.config.nix b/os/nixos/host/nixos.config.nix
index ce78808..f0684b4 100644
--- a/os/nixos/host/nixos.config.nix
+++ b/os/nixos/host/nixos.config.nix
@@ -9,6 +9,7 @@
 		./mods/steam.nix
 		./mods/audio-video.nix
     ./mods/virtual.nix
+    ./mods/gnome-x11.nix
 	];
 
 	# Enable flakes