feat: rewrite to more nixy flakes

pkgs/tetrio/default.nix

@@ -1,30 +1,22 @@
 {
-    pkgs ? import <nixpkgs> { },
-    fetchzip ? pkgs.fetchzip,
-	withTetrioPlus ? false,
-	tetrio-plus ? pkgs.tetrio-plus,
+    dpkg,
+    fetchzip,
+    tetrio-desktop,
+    withTetrioPlus ? false,
+    tetrio-plus,
     ...
 }:
 
 let
-    tetrio-desktop =
-        let
-            version = "10";
-        in
-        {
-            inherit version;
-            src = fetchzip {
-                url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup.deb";
-                hash = "sha256-2FtFCajNEj7O8DGangDecs2yeKbufYLx1aZb3ShnYvw=";
-                nativeBuildInputs = with pkgs; [ dpkg ];
-            };
-        };
+    version = "10";
+    src = fetchzip {
+        url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup.deb";
+        hash = "sha256-2FtFCajNEj7O8DGangDecs2yeKbufYLx1aZb3ShnYvw=";
+        nativeBuildInputs = [ dpkg ];
+    };
 
 in
 
-(pkgs.tetrio-desktop.overrideAttrs {
-    version = tetrio-desktop.version;
-    src = tetrio-desktop.src;
-}).override {
-	inherit withTetrioPlus tetrio-plus;
+(tetrio-desktop.overrideAttrs { inherit src version; }).override {
+    inherit withTetrioPlus tetrio-plus;
 }

pkgs/tetrio/leveldb.nix

@@ -1,31 +1,32 @@
 {
-    pkgs ? import <nixpkgs> { },
-    mpkgs ? import /etc/nixos/pkgs/default.nix { },
+    stdenv,
+    lib,
+    leveldb-cli,
+    value,
     origin ? "https://tetr.io",
     key ? "userConfig",
-    value,
-	...
+    ...
 }:
 
 let
     src = ./.;
 in
-pkgs.stdenv.mkDerivation {
+stdenv.mkDerivation {
     pname = "tetrio-leveldb";
     version = "1";
 
     inherit src;
 
-    nativeBuildInputs = [ mpkgs.leveldb-cli ];
+    nativeBuildInputs = [ leveldb-cli ];
 
     buildPhase = ''
                 runHook preBuild
 
-                ${pkgs.lib.getExe mpkgs.leveldb-cli} \
+                ${lib.getExe leveldb-cli} \
         			$out \
-        			${pkgs.lib.escapeShellArg origin} \
-        			${pkgs.lib.escapeShellArg key} \
-        			${pkgs.lib.escapeShellArg (builtins.toJSON value)}
+        			${lib.escapeShellArg origin} \
+        			${lib.escapeShellArg key} \
+        			${lib.escapeShellArg (builtins.toJSON value)}
 
                 runHook postBuild
     '';

pkgs/tetrio/module.nix

@@ -18,8 +18,6 @@ let
         else
             x;
 
-    leveldb = import ./leveldb.nix;
-
     cfg = config.programs.tetrio-desktop;
 in
 {
@@ -586,7 +584,7 @@ in
 
                 home.initialFile.".config/tetrio-desktop/Local Storage/leveldb" = {
                     mode = "0644";
-                    source = leveldb {
+                    source = pkgs.callPackage ./leveldb.nix {
                         value = {
                             handling =
                                 let

pkgs/tetrio/skins/simple-connected.nix

@@ -1,21 +1,18 @@
-{
-    pkgs ? import <nixpkgs> { },
-    ...
-}:
+{ stdenv, fetchurl, ... }:
 
 let
-    src = pkgs.fetchurl {
+    src = fetchurl {
         url = "https://you.have.fail/tetrioplus/data/tpsefiles/skin/SpooKoArts/simple_connected.zip.tpse";
         hash = "sha256-dIrEpEV9Gy2iU6K6rMrNX4XFQEchkJqSmOuQwVF4EQQ=";
     };
 in
-pkgs.stdenv.mkDerivation {
+stdenv.mkDerivation {
     name = "simple-connected";
     version = "2022-06-26";
     inherit src;
 
-	dontUnpack = true;
-	dontBuild = true;
+    dontUnpack = true;
+    dontBuild = true;
 
     installPhase = ''
         		runHook preInstall
@@ -23,9 +20,9 @@ pkgs.stdenv.mkDerivation {
         		runHook postInstall
         	'';
 
-	fixupPhase = ''
-		runHook preFixup
-		sed -i 's/\bskin\b/value/' $out
-		runHook postFixup
-	'';
+    fixupPhase = ''
+        		runHook preFixup
+        		sed -i 's/\bskin\b/value/' $out
+        		runHook postFixup
+        	'';
 }