realised how self' is supposed to work and removed all stdenv bullshit

modules/empty.nix

@@ -1,18 +1,23 @@
 {
+  wrappers,
 	self,
-  inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.name = {
+  flake.nixosModules.name = moduleWithSystem ({
     pkgs,
-    lib,
+    self',
+		inputs',
     ...
-  }: {
+  }: let
+    modules = with self.nixosModules; [];
+  in {
+    imports = modules;
     programs.name = {
       enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.hello;
+      package = self'.packages.hello;
-    };
     };
+  });
   perSystem = {
     pkgs,
     lib,

modules/features/gotify-desktop/default.nix

@@ -1,21 +1,16 @@
 {
-  self,
+  wrappers,
-  inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.gotify-desktop = {
+  flake.nixosModules.gotify-desktop = moduleWithSystem ({self', ...}: {
-    pkgs,
+    environment.systemPackages = with self'.packages; [
-    lib,
+      gotify-desktop
-    ...
-  }: {
-    environment.systemPackages = [
-      self.packages.${pkgs.stdenv.hostPlatform.system}.gotify-desktop
     ];
-  };
+  });
   perSystem = {
     pkgs,
-    lib,
+    inputs',
-    self',
     ...
   }: {
     packages = {
@@ -29,14 +24,9 @@
           	min_priority = 1
         '';
       in
-        inputs.wrappers.lib.wrapPackage ({
+        wrappers.lib.wrapPackage ({...}: {
-          config,
-          wlib,
-          lib,
-          ...
-        }: {
           inherit pkgs;
-          package = inputs.gotify-desktop.packages.${pkgs.stdenv.hostPlatform.system}.default;
+          package = inputs'.gotify-desktop.default;
           flags = {
             "-c" = config-file;
           };

modules/features/hypr/default.nix

@@ -1,11 +1,12 @@
 {
+  wrappers,
+  moduleWithSystem,
   self,
-  inputs,
   ...
 }: {
-  flake.nixosModules.hyprland = {
+  flake.nixosModules.hyprland = moduleWithSystem ({
+    self',
     pkgs,
-    lib,
     ...
   }: let
     modules = with self.nixosModules; [
@@ -16,7 +17,7 @@
     imports = modules;
     programs.hyprland = {
       enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+      package = self'.packages.hyprland;
     };
     services.xserver.enable = true;
     security.polkit.enable = true;
@@ -24,17 +25,17 @@
       hyprlock
       gsettings-desktop-schemas
     ];
-  };
+  });
   perSystem = {
     pkgs,
-    lib,
     self',
+    inputs',
     ...
   }: {
     packages = {
-      hyprland = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
+      hyprland = inputs'.hyprland.packages.default.override {
         runtimePackages =
-          inputs.hyprland.lib.defaultRuntimePkgs.${pkgs.stdenv.hostPlatform.system}
+          inputs'.hyprland.lib.defaultRuntimePkgs
           // {
             wpaperd = self'.packages.wpaperd;
             kitty = self'.packages.kitty;
@@ -57,12 +58,7 @@
           path = "${./wallpapers/topo3.png}"
         '';
       in
-        inputs.wrappers.lib.wrapPackage ({
+        wrappers.lib.wrapPackage ({...}: {
-          config,
-          wlib,
-          lib,
-          ...
-        }: {
           inherit pkgs;
           package = pkgs.wpaperd;
           flags = {

modules/features/kitty/default.nix

@@ -1,30 +1,26 @@
 {
-  self,
+  wrappers,
-  inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.kitty = {
+  flake.nixosModules.kitty = moduleWithSystem (
+    {
       pkgs,
-    lib,
-    ...
-  }: {
-    environment.systemPackages = [
-      self.packages.${pkgs.stdenv.hostPlatform.system}.kitty
-    ];
-  };
-  perSystem = {
-    pkgs,
-    lib,
       self',
-    ...
     }: {
+      environment.systemPackages = with self'.packages; [
+        kitty
+      ];
+    }
+  );
+  perSystem = {pkgs, ...}: {
     packages.kitty = let
       fira-mono = pkgs.nerd-fonts.fira-mono;
       fontsConf = pkgs.makeFontsConf {
         fontDirectories = [fira-mono];
       };
     in
-      inputs.wrappers.wrappers.kitty.wrap {
+      wrappers.wrappers.kitty.wrap {
         inherit pkgs;
         environment = {
           "FONTCONFIG_FILE" = "${fontsConf}";

modules/features/nvim/default.nix

@@ -1,24 +1,11 @@
-{
+{moduleWithSystem, ...}: {
-  self,
+  flake.nixosModules.nvim = moduleWithSystem ({self', ...}: {
-  inputs,
-  ...
-}: {
-  flake.nixosModules.nvim = {
-    pkgs,
-    lib,
-    ...
-  }: {
     programs.nvim = {
       enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.nvim;
+      package = self'.packages.nvim;
     };
-  };
+  });
-  perSystem = {
+  perSystem = {inputs', ...}: {
-    pkgs,
+    packages.nvim = inputs'.nvim.packages.default;
-    lib,
-    self',
-    ...
-  }: {
-    packages.nvim = inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.default;
   };
 }

modules/features/otter-launcher/default.nix

@@ -1,21 +1,18 @@
 {
-  self,
+  wrappers,
-  inputs,
+  moduleWithSystem,
-  ...
-}: {
-  flake.nixosModules.otter-launcher = {
-    pkgs,
-    lib,
   ...
 }: {
+  flake.nixosModules.otter-launcher = moduleWithSystem ({self', ...}: {
     environment.systemPackages = [
-      self.packages.${pkgs.stdenv.hostPlatform.system}.otter-launcher
+      self'.packages.otter-launcher
     ];
-  };
+  });
   perSystem = {
     pkgs,
     lib,
     self',
+    inputs',
     ...
   }: {
     packages = {
@@ -32,14 +29,9 @@
           ${extra-config}
         '';
       in
-        inputs.wrappers.lib.wrapPackage ({
+        wrappers.lib.wrapPackage ({...}: {
-          config,
-          wlib,
-          lib,
-          ...
-        }: {
           inherit pkgs;
-          package = inputs.otter-launcher.packages.${pkgs.stdenv.hostPlatform.system}.default;
+          package = inputs'.otter-launcher.packages.default;
           runtimePkgs = with pkgs; [
             fsel
             bluetui

modules/features/steam/default.nix

@@ -1,16 +1,15 @@
 {
-  self,
+  moduleWithSystem,
-  inputs,
   ...
 }: {
-  flake.nixosModules.steam = {
+  flake.nixosModules.steam = moduleWithSystem ({
     pkgs,
-    lib,
+    inputs',
     ...
   }: {
     # If buying isn't owning than piracy isn't stealing
     environment.systemPackages = [
-      inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped
+      inputs'.sls-steam.packages.default
     ];
     programs.steam = {
       enable = true;
@@ -21,12 +20,12 @@
       package = pkgs.steam.override {
         extraEnv = {
           LD_AUDIT = "${
-            inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+            inputs'.sls-steam.packages.sls-steam
           }/library-inject.so:${
-            inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+            inputs'.sls-steam.packages.sls-steam
           }/SLSsteam.so";
         };
       };
     };
-  };
+  });
 }

modules/features/zsh/default.nix

@@ -1,16 +1,17 @@
 {
   self,
   inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.zsh = {
+  flake.nixosModules.zsh = moduleWithSystem ({
     pkgs,
-    lib,
+    self',
     ...
   }: {
     nixpkgs.overlays = [
       (final: prev: {
-        zsh = self.packages.${pkgs.stdenv.hostPlatform.system}.zsh;
+        zsh = self'.packages.zsh;
       })
     ];
     programs.zsh = {
@@ -22,7 +23,7 @@
       histSize = 10000;
     };
     users.defaultUserShell = pkgs.zsh;
-  };
+  });
   perSystem = {
     pkgs,
     lib,
@@ -54,7 +55,7 @@
           export EDITOR=nvim
 
           eval "$(${lib.getExe pkgs.devenv} hook zsh)"
-          eval "$(${lib.getExe self.packages.${pkgs.host.stdenv.hostPlatform.system}.ohMyPosh} init zsh)"
+          eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
 
           ${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
         '';