From 17cbf19db446a22f00752f89260358acd0c001cb Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sat, 27 Feb 2021 13:57:42 +0000
Subject: [PATCH] vendor-reset less cursed, moved scripts

---
 config/users/kat/waybar/default.nix          | 4 ++--
 pkgs/vendor-reset/default.nix                | 6 ------
 scripts/{weather.nix => weather/default.nix} | 0
 scripts/{ => weather}/weather.py             | 0
 4 files changed, 2 insertions(+), 8 deletions(-)
 rename scripts/{weather.nix => weather/default.nix} (100%)
 rename scripts/{ => weather}/weather.py (100%)

diff --git a/config/users/kat/waybar/default.nix b/config/users/kat/waybar/default.nix
index d5632383..9b902fca 100644
--- a/config/users/kat/waybar/default.nix
+++ b/config/users/kat/waybar/default.nix
@@ -31,9 +31,9 @@ in {
             interval = 3600;
             on-click = "xdg-open 'https://google.com/search?q=weather'";
             exec = "nix-shell --command 'python ${
-                ../../../../scripts/weather.py
+                ../../../../scripts/weather/weather.py
               } ${secrets.profiles.sway.city} ${secrets.profiles.sway.api_key}' ${
-                ../../../../scripts/weather.nix
+                ../../../../scripts/weather}
               }";
           };
           cpu = { format = "  {usage}%"; };
diff --git a/pkgs/vendor-reset/default.nix b/pkgs/vendor-reset/default.nix
index ae0ba7cd..efd00cb3 100644
--- a/pkgs/vendor-reset/default.nix
+++ b/pkgs/vendor-reset/default.nix
@@ -5,8 +5,6 @@ let
   rev = "225a49a40941e350899e456366265cf82b87ad25";
   sha256 =
     "071zd8slra0iqsvzqpp6lcvg5dql5hkn161gh9aq34wix7pwzbn5";
-  sources = import ../../nix/sources.nix;
-  unstable = import sources.nixpkgs-unstable { inherit pkgs; };
 
 in stdenv.mkDerivation {
   name = "vendor-reset-${version}-${kernel.version}";
@@ -19,10 +17,6 @@ in stdenv.mkDerivation {
     inherit sha256;
   };
 
-  nativeBuildInputs =  [
-    unstable.pkgs.binutils
-    unstable.pkgs.libelf
-  ];
   hardeningDisable = [ "pic" ];
 
   makeFlags = [
diff --git a/scripts/weather.nix b/scripts/weather/default.nix
similarity index 100%
rename from scripts/weather.nix
rename to scripts/weather/default.nix
diff --git a/scripts/weather.py b/scripts/weather/weather.py
similarity index 100%
rename from scripts/weather.py
rename to scripts/weather/weather.py