From ad24ee33d92e73ec1d0feff9655546be7e266235 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Thu, 14 Mar 2024 12:58:26 -0500
Subject: [PATCH] switch to nil

---
 flake.lock      | 28 +++++++++++++++++++++-------
 flake.nix       | 12 ++----------
 modules/nix.nix |  1 +
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3ac8258..d9ebbea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,7 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
+          "nixpkgs-wayland",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -223,9 +224,7 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -245,6 +244,7 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
+          "nixpkgs-wayland",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -318,9 +318,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "lib-aggregate": "lib-aggregate",
-        "nix-eval-jobs": [
-          "nix-eval-jobs"
-        ],
+        "nix-eval-jobs": "nix-eval-jobs",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -339,6 +337,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1703134684,
+        "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pinix": {
       "inputs": {
         "nixpkgs": [
@@ -363,7 +377,6 @@
       "inputs": {
         "hyprland": "hyprland",
         "hyprland-contrib": "hyprland-contrib",
-        "nix-eval-jobs": "nix-eval-jobs",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "nixpkgs-wayland": "nixpkgs-wayland",
@@ -435,6 +448,7 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
+          "nixpkgs-wayland",
           "nix-eval-jobs",
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index f407d8d..e8dcc3b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,18 +13,10 @@
 
     hyprland.url = "github:hyprwm/Hyprland/main";
     hyprland.inputs.nixpkgs.follows = "nixpkgs";
-
     hyprland-contrib.url = "github:hyprwm/contrib";
     hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
-
-    nixpkgs-wayland = {
-      url = "github:nix-community/nixpkgs-wayland";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nix-eval-jobs.follows = "nix-eval-jobs";
-    };
-
-    nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
-    nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
+    nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
 
     pinix.url = "github:remi-dupre/pinix";
     pinix.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/nix.nix b/modules/nix.nix
index d0940b7..57f2dba 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -22,6 +22,7 @@
   };
 
   environment.systemPackages = with pkgs; [
+    nil
     alejandra
 
     self.packages.${pkgs.system}.oizys