From cfacd69575b5888bf3e054c9f8056a19c4b5903e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 16 Jan 2024 17:00:20 +0100
Subject: Rework

---
 pkgs/default.nix | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index b1246cc..bed1bc4 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,28 +1,23 @@
-pkgs: let
-  callPackage = pkgs.newScope personalpkgs;
-
-  personalpkgs = rec {
-    luks-hw-password = callPackage ./luks-hw-password {};
-    dev = callPackage ./dev {
-      devShells = import ../devShells pkgs;
-    };
+final: prev: {
+  luks-hw-password = final.callPackage ./luks-hw-password {};
+  dev = final.callPackage ./dev {
+    devShells = import ../devShells final;
+  };
 
-    delft-icon-theme = callPackage ./theme/delft-icon-theme.nix {};
-    background-lnxpcs = callPackage ./theme/background-lnxpcs.nix {};
-    swaybackground = callPackage ./theme/swaybackground.nix {};
-    myswaylock = callPackage ./theme/myswaylock.nix {};
+  delft-icon-theme = final.callPackage ./theme/delft-icon-theme.nix {};
+  background-lnxpcs = final.callPackage ./theme/background-lnxpcs.nix {};
+  swaybackground = final.callPackage ./theme/swaybackground.nix {};
+  myswaylock = final.callPackage ./theme/myswaylock.nix {};
 
-    stardict-unwrapped = callPackage ./stardict {};
-    stardict = callPackage ./stardict/wrapper.nix {stardict = stardict-unwrapped;};
-    stardict-en-cz = callPackage ./stardict/en-cz.nix {};
-    stardict-de-cz = callPackage ./stardict/de-cz.nix {};
-    stardict-cz = callPackage ./stardict/cz.nix {};
-    sdcv-unwrapped = callPackage ./sdcv {};
-    sdcv = callPackage ./stardict/wrapper.nix {stardict = sdcv-unwrapped;};
+  stardict-unwrapped = final.callPackage ./stardict {};
+  stardict = final.callPackage ./stardict/wrapper.nix {stardict = final.stardict-unwrapped;};
+  stardict-en-cz = final.callPackage ./stardict/en-cz.nix {};
+  stardict-de-cz = final.callPackage ./stardict/de-cz.nix {};
+  stardict-cz = final.callPackage ./stardict/cz.nix {};
+  sdcv-unwrapped = final.callPackage ./sdcv {};
+  sdcv = final.callPackage ./stardict/wrapper.nix {stardict = final.sdcv-unwrapped;};
 
-    lorem-text = callPackage ./lorem-text {};
+  lorem-text = final.callPackage ./lorem-text {};
 
-    bigclown-leds = callPackage ./bigclown-leds {};
-  };
-in
-  personalpkgs
+  bigclown-leds = final.callPackage ./bigclown-leds {};
+}
-- 
cgit v1.2.3