From c5a9f23634eca295f307ce2a0628998b8a895a26 Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Tue, 19 Dec 2023 16:41:35 +0100
Subject: [PATCH] trying to get niri to work (again)

---
 flake.lock                 | 56 ++++++++++++++++++++++++++++++++------
 flake.nix                  |  8 +++++-
 modules/niri/default.nix   |  5 ++++
 modules/system/default.nix |  1 +
 4 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 modules/niri/default.nix

diff --git a/flake.lock b/flake.lock
index b195646..b0f9a00 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702814335,
-        "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=",
+        "lastModified": 1702937117,
+        "narHash": "sha256-4GjkL2D01bDg00UZN/SeGrnBZrDVOFeZTbQx6U702Vc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4dba0bd01956170667458be7b45f68170a63651",
+        "rev": "e8aaced73ebaf6bfa8e3c6ab0a19cb184bc4d798",
         "type": "github"
       },
       "original": {
@@ -20,6 +20,43 @@
         "type": "github"
       }
     },
+    "niri": {
+      "inputs": {
+        "nix-filter": "nix-filter",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703000056,
+        "narHash": "sha256-d4LrEmhj9w26SknUadcIM7Y1rllMxArKdFCyspADBn4=",
+        "owner": "twoneis",
+        "repo": "niri",
+        "rev": "fa2a60977e8d96738cd96a532244798028282eb7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "twoneis",
+        "ref": "nixify",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1701697642,
+        "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "c843418ecfd0344ecb85844b082ff5675e02c443",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1702453208,
@@ -38,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702312524,
-        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
+        "lastModified": 1702830618,
+        "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
+        "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
         "type": "github"
       },
       "original": {
@@ -54,11 +91,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1702820084,
-        "narHash": "sha256-Y8z31CWQB8hKRDiovx40s9AAOixrG9PBlfgPntjWVBc=",
+        "lastModified": 1702997397,
+        "narHash": "sha256-th/EqbtB6jDFhe12kTsssDzF9Ev0p9Yq/oaiWXS3H9w=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "0f3c510de06615a8cf9a2ad3b77758bb9d155753",
+        "rev": "a04eea76ecdc42258fc3ed8391ba838145d0b96a",
         "type": "github"
       },
       "original": {
@@ -70,6 +107,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "niri": "niri",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nur": "nur"
diff --git a/flake.nix b/flake.nix
index 66d0936..bce6876 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,9 +18,14 @@
     nur = {
       url = "github:nix-community/nur";
     };
+
+    niri = {
+      url = "github:twoneis/niri/nixify";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, home-manager, nixos-hardware, nur, ... }:
+  outputs = { nixpkgs, home-manager, nixos-hardware, nur, niri, ... }:
   let
     x86 = "x86_64-linux";
     common = ./modules/system;
@@ -37,6 +42,7 @@
 
           home-manager.nixosModules.home-manager {
             nixpkgs.overlays = [
+              niri.overlay
               nur.overlay
             ];
             home-manager = {
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
new file mode 100644
index 0000000..1e96254
--- /dev/null
+++ b/modules/niri/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    niri
+  ];
+}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 9ffe4ad..3f46caa 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -5,6 +5,7 @@
 { pkgs, ... }: {
   imports = [
     ../gnome
+    ../niri
     ../virt
   ];