From d3da8ba3ac6a294f301a0c48a82bf7cfdcb0c91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Mon, 8 Apr 2024 16:14:10 +0200
Subject: [PATCH] bulk commit wip vm stuff

---
 flake.lock                             | 19 ++++++++++++++++++-
 flake.nix                              | 22 +++++++++++++++++-----
 hosts/vm/configuration.nix             |  2 +-
 modules/desktop/hyprland.nix           |  8 ++++++++
 modules/desktop/x11-plasma-lightdm.nix | 14 +++++++++++---
 5 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 modules/desktop/hyprland.nix

diff --git a/flake.lock b/flake.lock
index 421eea6..d9afde7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,10 +37,27 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1712439257,
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 9e115e6..b1ea611 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
@@ -10,12 +11,21 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, home-manager, ... }: {
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager }@inputs :
+  let
+    system = "x86_64-linux";
+    overlay-unstable = final: prev: {
+      unstable = nixpkgs-unstable.legacyPackages.${prev.system};
+    };
+  in {
     nixosConfigurations = {
       comfy-station = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs;};
+        inherit system;
+        specialArgs = {
+          inherit inputs;
+        };
         modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           ./hosts/comfy-station/configuration.nix
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
@@ -25,8 +35,10 @@
         ];
       };
       vm = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs;};
+        inherit system;
+        specialArgs = {
+          inherit inputs;
+        };
         modules = [
           ./hosts/vm/configuration.nix
           home-manager.nixosModules.home-manager {
diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix
index e7c4087..6f9f06c 100644
--- a/hosts/vm/configuration.nix
+++ b/hosts/vm/configuration.nix
@@ -16,7 +16,7 @@
       ../../modules/hardware/bluetooth.nix
       ../../modules/hardware/printing.nix
       ../../modules/hardware/sound.nix
-      ../../modules/desktop/x11-plasma-lightdm.nix
+      ../../modules/desktop/hyprland.nix
       ../../modules/services/docker.nix
     ];
 
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
new file mode 100644
index 0000000..b7de2e9
--- /dev/null
+++ b/modules/desktop/hyprland.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+  };
+}
diff --git a/modules/desktop/x11-plasma-lightdm.nix b/modules/desktop/x11-plasma-lightdm.nix
index c9be99c..e7f2c0f 100644
--- a/modules/desktop/x11-plasma-lightdm.nix
+++ b/modules/desktop/x11-plasma-lightdm.nix
@@ -1,6 +1,14 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
+  # Import unstable plasma6 module
+  imports = [
+    "${nixpkgs-unstable}/nixos/modules/services/desktop-managers/plasma6.nix"
+  ];
+  disable = [
+    "services/desktop-managers/plasma6.nix"
+  ];
+
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
@@ -11,8 +19,8 @@
   };
 
   # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.displayManager.sddm.wayland.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # Enable automatic login for the user.
   services.xserver.displayManager.autoLogin.enable = true;