diff --git a/flake.nix b/flake.nix
index 53b2872..9482eff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -78,7 +78,10 @@
     stylix,
     ...
   }:
-    {
+  let
+    lib = nixpkgs.lib;
+    eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
+  in {
       apps = {
         x86_64-darwin = let
           pkgs = nixpkgs.legacyPackages.x86_64-darwin;
@@ -141,6 +144,9 @@
           };
       };
 
+      # TODO overlay for packages
+      # TODO remove flake-utils dependency from my own repos
+
       nixosModules = {
         htgen = import modules/htgen.nix;
         moodle-dl = import modules/moodle-dl.nix;
@@ -318,30 +324,29 @@
           ];
         };
       };
-    }
-    // flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.x86_64-darwin flake-utils.lib.system.aarch64-linux] (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-        overlays = [
-          nur.overlays.default
-          (self: super: {
-            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
-            dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
-          })
-        ];
-      };
-      unstablePackages = import nixpkgs-unstable {
-        inherit system;
-      };
-      wrapScript = {
-        packages ? [],
-        name,
-        script,
-      }:
-        pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
-    in {
-      packages = rec {
+
+      packages = eachSupportedSystem (system: let
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          overlays = [
+            nur.overlays.default
+            (self: super: {
+              mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
+              dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+            })
+          ];
+        };
+        unstablePackages = import nixpkgs-unstable {
+          inherit system;
+        };
+        wrapScript = {
+          packages ? [],
+          name,
+          script,
+        }:
+          pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
+      in {
         auc = pkgs.callPackage packages/auc.nix {};
         betacode = pkgs.callPackage packages/betacode.nix {};
         brainmelter = pkgs.callPackage packages/brainmelter.nix {};
@@ -442,9 +447,6 @@
         weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
         wttr = pkgs.callPackage packages/wttr.nix {};
 
-        itl = pkgs.callPackage packages/itl.nix {};
-        itools = pkgs.callPackage packages/itools.nix {itl = itl;};
-
         booksplit = wrapScript {
           script = inputs.voidrice.outPath + "/.local/bin/booksplit";
           name = "booksplit";
@@ -456,6 +458,6 @@
           name = "tag";
           packages = [pkgs.ffmpeg];
         };
-      };
-    });
+      });
+    };
 }