From b5addef848103713ddb84cb7d9ca03a6f4a4d005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Fri, 23 Sep 2022 23:31:14 +0200
Subject: [PATCH] fix: dont get scripts from overlay

---
 configs/default.nix  | 11 ++---------
 configs/i3.nix       | 19 ++++++++++---------
 configs/mpv.nix      |  3 ++-
 configs/newsboat.nix |  5 ++++-
 configs/packages.nix |  2 ++
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/configs/default.nix b/configs/default.nix
index 466cba3..b29594c 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -7,6 +7,7 @@
 }: let
   inherit (lib.strings) makeBinPath;
   inherit (import <niveum/lib>) localAddresses kieran;
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
 in {
   imports = [
     <home-manager/nixos>
@@ -38,14 +39,6 @@ in {
             });
           };
         };
-        overlays = [
-          (self: super: {
-            scripts = import <niveum/packages/scripts> {
-              pkgs = super;
-              lib = super.lib;
-            };
-          })
-        ];
       };
     }
     {
@@ -121,7 +114,7 @@ in {
           cd "$(mktemp -d)"
           pwd
         '';
-        swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
+        swallow = command: "${scripts.swallow}/bin/swallow ${command}";
       in {
         "ß" = "${pkgs.utillinux}/bin/setsid";
         cat = "${pkgs.bat}/bin/bat --style=plain";
diff --git a/configs/i3.nix b/configs/i3.nix
index 1fc49bc..8194928 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -5,6 +5,7 @@
   ...
 }: let
   inherit (import <niveum/lib>) defaultApplications colours;
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
   klem = import <niveum/packages/scripts/klem.nix> {
     inherit pkgs lib;
     config.scripts = {
@@ -26,13 +27,13 @@
         ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
       '';
       "ipa" = pkgs.writers.writeDash "ipa" ''
-        ${pkgs.scripts.ipa}/bin/ipa
+        ${scripts.ipa}/bin/ipa
       '';
       "betacode" = pkgs.writers.writeDash "betacode" ''
-        ${pkgs.scripts.betacode}/bin/betacode
+        ${scripts.betacode}/bin/betacode
       '';
       "devanagari" = pkgs.writers.writeDash "devanagari" ''
-        ${pkgs.scripts.devanagari}/bin/devanagari
+        ${scripts.devanagari}/bin/devanagari
       '';
       "avesta" = pkgs.writeScript "avesta" (builtins.readFile <niveum/packages/scripts/avesta.sed>);
       "curl" = pkgs.writers.writeDash "curl" ''
@@ -227,9 +228,9 @@ in {
         "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
         "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
         "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
-        "${modifier}+0" = "exec ${pkgs.scripts.menu-calc}/bin/=";
+        "${modifier}+0" = "exec ${scripts.menu-calc}/bin/=";
 
-        "${modifier}+Shift+w" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
+        "${modifier}+Shift+w" = "exec ${scripts.k-lock}/bin/k-lock";
         "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec ${pkgs.rofi}/bin/rofi -modi run,window,ssh,filebrowser -show run''}";
         "${modifier}+Shift+d" = "exec ${
           pkgs.writers.writeDash "notemenu" ''
@@ -251,10 +252,10 @@ in {
           ''
         }";
         "${modifier}+p" = "exec --no-startup-id ${pkgs.rofi-pass}/bin/rofi-pass";
-        "${modifier}+u" = "exec ${pkgs.scripts.unicodmenu}/bin/unicodmenu";
+        "${modifier}+u" = "exec ${scripts.unicodmenu}/bin/unicodmenu";
 
         "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
-        "${modifier}+F7" = "exec ${pkgs.scripts.showkeys-toggle}/bin/showkeys-toggle";
+        "${modifier}+F7" = "exec ${scripts.showkeys-toggle}/bin/showkeys-toggle";
         "${modifier}+F8" = "exec switch-theme toggle";
         "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
         "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
@@ -270,9 +271,9 @@ in {
         "XF86AudioNext" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl next";
         "XF86AudioPrev" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl previous";
         "XF86AudioStop" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl stop";
-        "XF86ScreenSaver" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
+        "XF86ScreenSaver" = "exec ${scripts.k-lock}/bin/k-lock";
 
-        "XF86Display" = "exec ${pkgs.scripts.dmenurandr}/bin/dmenurandr";
+        "XF86Display" = "exec ${scripts.dmenurandr}/bin/dmenurandr";
 
         # key names detected with xorg.xev:
         # XF86WakeUp (fn twice)
diff --git a/configs/mpv.nix b/configs/mpv.nix
index 7395146..0e0de1b 100644
--- a/configs/mpv.nix
+++ b/configs/mpv.nix
@@ -4,7 +4,8 @@
   config,
   ...
 }: let
-  swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  swallow = command: "${scripts.swallow}/bin/swallow ${command}";
 in {
   environment.shellAliases.smpv = swallow "mpv";
 
diff --git a/configs/newsboat.nix b/configs/newsboat.nix
index 0657976..104beb8 100644
--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -1,14 +1,17 @@
 {
   pkgs,
   config,
+  lib,
   ...
 }: let
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+
   ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
 
   youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";
 
   newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
-  linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
+  linkhandler-bin = "${scripts.linkhandler}/bin/linkhandler";
 
   newsboat-config = pkgs.writeText "config" ''
     auto-reload no
diff --git a/configs/packages.nix b/configs/packages.nix
index 86b4e01..9d0b776 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -8,6 +8,8 @@
   menstruation = pkgs.callPackage <menstruation-backend> {};
   pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
 
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+
   zoteroStyle = {
     name,
     sha256,