flake: rework flake inputs, overlays and platforms

1 files changed, 20 insertions, 25 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 21d9686..bed50a3 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,28 +1,23 @@
-pkgs:
-with pkgs.lib; let
-  inherit (pkgs) buildEnv callPackage writeTextDir;
-
-  combined = pkgs // { inherit local; };
-
-  local = {
-    btclone = callPackage ./btclone {};
-    git-aliases = callPackage ./git-aliases.nix {};
-    mssql-tools = callPackage ./mssql-tools.nix {};
-    oregano = callPackage ./oregano {};
-    rqlite = callPackage ./rqlite.nix {};
-    rv8 = callPackage ./rv8.nix {};
-    scripts = callPackage ./scripts {};
-    tmux-lift = callPackage ./tmux-lift {};
+final: prev: let
+  inherit (final) callPackage fetchpatch;
+in {
+  btclone = callPackage ./btclone {};
+  git-aliases = callPackage ./git-aliases.nix {};
+  mssql-tools = callPackage ./mssql-tools.nix {};
+  oregano = callPackage ./oregano {};
+  rqlite = callPackage ./rqlite.nix {};
+  rv8 = callPackage ./rv8.nix {};
+  scripts = callPackage ./scripts {};
+  tmux-lift = callPackage ./tmux-lift {};
   
-    st = pkgs.st.override {
-      conf = import ./st.nix {};
+  st = prev.st.override {
+    conf = import ./st.nix {};
   
-      patches = [
-        (pkgs.fetchpatch {
-          url = "https://st.suckless.org/patches/clipboard/st-clipboard-0.8.3.diff";
-          sha256 = "cbb37675e9b4986836c19aadacc616a006df81c9bf394e9e3573e164fa1867cf";
-        })
-      ];
-    };
+    patches = [
+      (fetchpatch {
+        url = "https://st.suckless.org/patches/clipboard/st-clipboard-0.8.3.diff";
+        sha256 = "cbb37675e9b4986836c19aadacc616a006df81c9bf394e9e3573e164fa1867cf";
+      })
+    ];
   };
-in local
+}