From f544fd396052c34df82c615f60891cbcfdeffb63 Mon Sep 17 00:00:00 2001
From: Anish L <anish@lakhwara.com>
Date: Wed, 31 Aug 2022 21:30:06 +1000
Subject: [PATCH] maybe fix eww?

---
 flake.lock | 79 +++++++++++++++++++++++-------------------------------
 flake.nix  | 13 +++++++--
 2 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2d12d19b..b9865d20 100644
--- a/flake.lock
+++ b/flake.lock
@@ -154,7 +154,9 @@
         "nixpkgs": [
           "nixos"
         ],
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": [
+          "rust-overlay"
+        ]
       },
       "locked": {
         "lastModified": 1661783659,
@@ -283,21 +285,6 @@
       }
     },
     "flake-utils_3": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
       "locked": {
         "lastModified": 1652372896,
         "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=",
@@ -312,7 +299,7 @@
         "type": "github"
       }
     },
-    "flake-utils_5": {
+    "flake-utils_4": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -327,7 +314,7 @@
         "type": "github"
       }
     },
-    "flake-utils_6": {
+    "flake-utils_5": {
       "locked": {
         "lastModified": 1638122382,
         "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
@@ -342,9 +329,24 @@
         "type": "github"
       }
     },
+    "flake-utils_6": {
+      "locked": {
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "grasp": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "grasp": "grasp_2",
         "nixpkgs": [
           "nixos"
@@ -456,8 +458,8 @@
     },
     "neovim-flake": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_3"
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "dir": "contrib",
@@ -579,22 +581,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1661353537,
-        "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1657533762,
         "narHash": "sha256-/cxTFSMmpAb8tBp1yVga1fj+i8LB9aAxnMjYFpRMuVs=",
@@ -610,7 +596,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1649667661,
         "narHash": "sha256-9cbstidkXdAC3ZzokV6clgCoeLSbbs2tis9KFsqCzTM=",
@@ -641,7 +627,7 @@
     "nvfetcher": {
       "inputs": {
         "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_5",
         "nixpkgs": [
           "nixos"
         ]
@@ -662,7 +648,7 @@
     },
     "poonam": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1661472019,
@@ -696,20 +682,23 @@
         "nur": "nur",
         "nvfetcher": "nvfetcher",
         "poonam": "poonam",
+        "rust-overlay": "rust-overlay",
         "tidalcycles": "tidalcycles"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": [
+          "nixos"
+        ]
       },
       "locked": {
-        "lastModified": 1661655464,
-        "narHash": "sha256-by9Hb0mNVdiCR7TBvUHIgDb0QIv3znp8VMGh7Bl35VQ=",
+        "lastModified": 1661915084,
+        "narHash": "sha256-+csJO6Ffp9A51N6GlwrhS+U35STAxNbp42vpKmaBrck=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0c4c1432353e12b325d1472bea99e364871d2cb3",
+        "rev": "790cf08a011248a881a516cadf125bbc47f1a420",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b2dc7a10..09c143ad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,8 +30,17 @@
       basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main";
       basant.inputs.nixpkgs.follows = "nixos";
       basant.inputs.poonam.follows = "poonam";
-      eww.url = "github:elkowar/eww";
-      eww.inputs.nixpkgs.follows = "nixos";
+      rust-overlay = {
+        url = "github:oxalica/rust-overlay";
+        inputs.nixpkgs.follows = "nixos";
+      };
+      eww = {
+        url = "github:elkowar/eww";
+        inputs.nixpkgs.follows = "nixos";
+        inputs.rust-overlay.follows = "rust-overlay";
+      };
+      # eww follows rust nightly
+      # eww.inputs.nixpkgs.follows = "latest";
       grasp.url = "git+ssh://gitea@git.sealight.xyz/aynish/grasp.git?ref=main";
       grasp.inputs.nixpkgs.follows = "nixos";
       tidalcycles.url = "github:mitchmindtree/tidalcycles.nix";