From 29b0281c728775253bef0042e5d42fae13b44b37 Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Sun, 5 May 2024 09:33:47 -0400
Subject: [PATCH] universedesktop: Back to Tiling:tm:

---
 machines/universedesktop/desktop/audio.nix    | 13 ++++++++
 machines/universedesktop/desktop/default.nix  | 33 +++----------------
 .../desktop/displaymanager.nix                | 19 +++++++++++
 machines/universedesktop/desktop/dwl.nix      |  5 +++
 machines/universedesktop/desktop/wayland.nix  | 15 +++++++++
 machines/universedesktop/programs/games.nix   |  2 ++
 6 files changed, 58 insertions(+), 29 deletions(-)
 create mode 100644 machines/universedesktop/desktop/audio.nix
 create mode 100644 machines/universedesktop/desktop/displaymanager.nix
 create mode 100644 machines/universedesktop/desktop/dwl.nix
 create mode 100644 machines/universedesktop/desktop/wayland.nix

diff --git a/machines/universedesktop/desktop/audio.nix b/machines/universedesktop/desktop/audio.nix
new file mode 100644
index 0000000..fea0d60
--- /dev/null
+++ b/machines/universedesktop/desktop/audio.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, lib, ... }: {
+  # Enable sound.
+  # rtkit is optional but recommended
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    # jack.enable = true;
+  };
+}
diff --git a/machines/universedesktop/desktop/default.nix b/machines/universedesktop/desktop/default.nix
index 9f0422f..4472177 100644
--- a/machines/universedesktop/desktop/default.nix
+++ b/machines/universedesktop/desktop/default.nix
@@ -1,31 +1,6 @@
 { config, pkgs, lib, ... }: {
-  # Wayland support
-  hardware = {
-    opengl.enable = true;
-    opengl.driSupport = true;
-    opengl.driSupport32Bit = true;
-
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = true;
-      open = false;
-    };
-  };
-  services.xserver.enable = true;
-  services.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-  programs.xwayland.enable = true;
-  # Configure keymap in X11
-  services.xserver.xkb.layout = "us";
-  # Enable sound.
-  # rtkit is optional but recommended
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    # jack.enable = true;
-  };
+  imports = [
+    ./audio.nix
+    ./displaymanager.nix
+  ];
 }
diff --git a/machines/universedesktop/desktop/displaymanager.nix b/machines/universedesktop/desktop/displaymanager.nix
new file mode 100644
index 0000000..eb5ae7b
--- /dev/null
+++ b/machines/universedesktop/desktop/displaymanager.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, lib, ... }: let
+  
+in {
+  imports = [
+    ./dwl.nix
+  ];
+  
+  services.displayManager = {
+    enable = true;
+    execCmd = "${pkgs.lemurs}/bin/lemurs";
+  };
+
+  environment.etc."lemurs/wayland/dwl" = {
+    source = pkgs.writeScript "dwl-startup" ''
+      #!${pkgs.bash}/bin/bash
+      exec ${pkgs.dwl}/bin/dwl
+    '';
+  };
+}
diff --git a/machines/universedesktop/desktop/dwl.nix b/machines/universedesktop/desktop/dwl.nix
new file mode 100644
index 0000000..b7a5299
--- /dev/null
+++ b/machines/universedesktop/desktop/dwl.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }: {
+  imports = [
+    ./wayland.nix
+  ];
+}
diff --git a/machines/universedesktop/desktop/wayland.nix b/machines/universedesktop/desktop/wayland.nix
new file mode 100644
index 0000000..126d0b3
--- /dev/null
+++ b/machines/universedesktop/desktop/wayland.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... }: {
+  # Wayland support
+  hardware = {
+    opengl.enable = true;
+    opengl.driSupport = true;
+    opengl.driSupport32Bit = true;
+
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = true;
+      open = false;
+    };
+  };
+  programs.xwayland.enable = true;
+}
diff --git a/machines/universedesktop/programs/games.nix b/machines/universedesktop/programs/games.nix
index 75a1a88..7759e62 100644
--- a/machines/universedesktop/programs/games.nix
+++ b/machines/universedesktop/programs/games.nix
@@ -1,6 +1,8 @@
 { lib, config, pkgs, ... }: {
   # For steam
   services.flatpak.enable = true;
+  ## Flatpak requires this
+  xdg.portal.enable = true;
   programs.steam.enable = true;
   # Game compat
   programs.gamemode.enable = true;