From e060d03c3416a80373fec0f86d6ee9363d83f745 Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Fri, 17 Nov 2023 20:59:34 +0100
Subject: [PATCH] trying to get niri to work again

---
 modules/niri/default.nix           | 56 ++----------------------------
 modules/niri/{ => niri}/Cargo.lock |  0
 modules/niri/niri/default.nix      | 55 +++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 53 deletions(-)
 rename modules/niri/{ => niri}/Cargo.lock (100%)
 create mode 100644 modules/niri/niri/default.nix

diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index 791e3d0..303d120 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -1,55 +1,5 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, libxkbcommon
-, pipewire
-, seatd
-, udev
-, wayland
-, libinput
-, mesa
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "niri";
-  version = "unstable-2023-10-31";
-
-  src = fetchFromGitHub {
-    owner = "YaLTeR";
-    repo = "niri";
-    rev = "8679eaf34a791fcbb3048a77cfb22540a0d24792";
-    hash = "sha256-QYH3sG1TKJbKBeZdI9FtmJuY5DFmMdOJviYPrPK8FHo=";
-  };
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "smithay-0.3.0" = "sha256-cRBJ8r2fQ8d97DADOxfmUF5JYcOHQ05u8tMhVXmbrbE=";
-    };
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    rustPlatform.bindgenHook
+{ ... }: {
+  environment.systemPackages = [
+    import ./niri
   ];
-
-  buildInputs = [
-    libxkbcommon
-    pipewire
-    seatd
-    udev
-    wayland
-    libinput
-    mesa # libgbm
-  ];
-
-  meta = with lib; {
-    description = "A scrollable-tiling Wayland compositor";
-    homepage = "https://github.com/YaLTeR/niri";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iogamaster ];
-    mainProgram = "niri";
-    inherit (wayland.meta) platforms;
-  };
 }
diff --git a/modules/niri/Cargo.lock b/modules/niri/niri/Cargo.lock
similarity index 100%
rename from modules/niri/Cargo.lock
rename to modules/niri/niri/Cargo.lock
diff --git a/modules/niri/niri/default.nix b/modules/niri/niri/default.nix
new file mode 100644
index 0000000..791e3d0
--- /dev/null
+++ b/modules/niri/niri/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libxkbcommon
+, pipewire
+, seatd
+, udev
+, wayland
+, libinput
+, mesa
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "niri";
+  version = "unstable-2023-10-31";
+
+  src = fetchFromGitHub {
+    owner = "YaLTeR";
+    repo = "niri";
+    rev = "8679eaf34a791fcbb3048a77cfb22540a0d24792";
+    hash = "sha256-QYH3sG1TKJbKBeZdI9FtmJuY5DFmMdOJviYPrPK8FHo=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "smithay-0.3.0" = "sha256-cRBJ8r2fQ8d97DADOxfmUF5JYcOHQ05u8tMhVXmbrbE=";
+    };
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    libxkbcommon
+    pipewire
+    seatd
+    udev
+    wayland
+    libinput
+    mesa # libgbm
+  ];
+
+  meta = with lib; {
+    description = "A scrollable-tiling Wayland compositor";
+    homepage = "https://github.com/YaLTeR/niri";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ iogamaster ];
+    mainProgram = "niri";
+    inherit (wayland.meta) platforms;
+  };
+}