Mildly insane argument passing to modules

hosts/gerg-desktop/git.nix

@@ -1,5 +1,4 @@
-{ _file }:
-{ pkgs, config, ... }:
+{ pkgs, config }:
 {
   programs.git = {
     enable = true;
@@ -30,5 +29,4 @@
       commit.gpgsign = true;
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/main.nix

@@ -1,10 +1,11 @@
 {
+
   nix-index-database,
   nvim-flake,
-  self,
-  _file,
+  self',
+  pkgs,
+  config,
 }:
-{ pkgs, config, ... }:
 {
   local = {
     remoteBuild.isBuilder = true;
@@ -97,7 +98,7 @@
         #qmk
         ;
       inherit (nvim-flake.packages) neovim;
-      inherit (self.packages) lint;
+      inherit (self'.packages) lint;
 
       librewolf = pkgs.librewolf.override { cfg.speechSynthesisSupport = false; };
       nixpkgs-review = pkgs.nixpkgs-review.override { nix = config.nix.package; };
@@ -194,5 +195,4 @@
   };
 
   system.stateVersion = "23.05";
-  inherit _file;
 }

hosts/gerg-desktop/services/ddns.nix

@@ -1,5 +1,4 @@
-{ _file }:
-{ config, pkgs, ... }:
+{ config, pkgs }:
 {
   sops.secrets.cloudflare = { };
 
@@ -84,5 +83,4 @@
       func "nix-fu.com" "cc2df9163c3730f58b866409ac5a108c"
     '';
   };
-  inherit _file;
 }

hosts/gerg-desktop/services/gitea.nix

@@ -1,5 +1,4 @@
-{ _file }:
-#{ config, ... }:
+#{ config }:
 {
   #  users.users = {
   #    ${config.services.gitea.user} = {
@@ -30,5 +29,4 @@
       createDatabase = true;
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/services/minecraft.nix

@@ -1,5 +1,4 @@
-{ _file, self }:
-{ lib, ... }:
+{ self', lib }:
 {
   # I manually switch this sometimes
   config = lib.mkIf false {
@@ -35,7 +34,7 @@
         "network.target"
         "minecraft-server.socket"
       ];
-      path = [ self.packages.papermc ];
+      path = [ self'.packages.papermc ];
       script = ''
         minecraft-server \
           -Xms8G \
@@ -100,5 +99,4 @@
       '';
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/services/miniflux.nix

@@ -1,9 +1,7 @@
-{ _file }:
 {
   config,
   lib,
   pkgs,
-  ...
 }:
 {
   sops.secrets.minifluxenv = { };
@@ -97,5 +95,4 @@
       ${config.services.nginx.user}.extraGroups = [ "miniflux" ];
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/services/nextcloud.nix

@@ -1,5 +1,4 @@
-{ _file }:
-{ pkgs, config, ... }:
+{ pkgs, config }:
 {
   sops.secrets.nextcloud.owner = "nextcloud";
 
@@ -24,5 +23,4 @@
       default_phone_region = "US";
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/services/nginx.nix

@@ -1,5 +1,4 @@
-{ _file }:
-{ config, lib, ... }:
+{ config, lib }:
 {
   sops.secrets =
     lib.genAttrs
@@ -65,5 +64,4 @@
     80
     443
   ];
-  inherit _file;
 }

hosts/gerg-desktop/services/parrot.nix

@@ -1,9 +1,8 @@
-{ _file }:
 {
   pkgs,
   config,
   lib,
-  ...
+
 }:
 {
   sops.secrets.discordenv = { };
@@ -22,5 +21,4 @@
       RestartSec = "30s";
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/services/postgresql.nix

@@ -1,5 +1,4 @@
-{ _file }:
-{ config, pkgs, ... }:
+{ config, pkgs }:
 {
   services.postgresql = {
     enable = true;
@@ -19,5 +18,4 @@
 
     settings.unix_socket_permissions = "0770";
   };
-  inherit _file;
 }

hosts/gerg-desktop/services/searxng.nix

@@ -1,5 +1,4 @@
-{ _file }:
-{ config, pkgs, ... }:
+{ config, pkgs }:
 {
   sops.secrets.searxngenv = { };
   users.users.${config.services.nginx.user}.extraGroups = [ "searx" ];
@@ -36,5 +35,4 @@
       ui.theme_args.simple_style = "dark";
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/spicetify.nix

@@ -1,4 +1,4 @@
-{ spicetify-nix, _file }:
+{ spicetify-nix }:
 let
   spicePkgs = spicetify-nix.legacyPackages;
 in
@@ -37,5 +37,4 @@ in
       misc = "282a36";
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/vfio.nix

@@ -1,9 +1,8 @@
-{ _dir, _file }:
 {
+  _dir,
   pkgs,
   lib,
-  config,
-  ...
+
 }:
 /*
   This section is just me bullying
@@ -187,5 +186,4 @@ in
       );
     };
   };
-  inherit _file;
 }

hosts/gerg-desktop/zfs.nix

@@ -1,9 +1,9 @@
-{ lanzaboote, _file }:
 {
+  lanzaboote,
   config,
   lib,
   pkgs,
-  ...
+
 }:
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
@@ -86,5 +86,4 @@
       efi.efiSysMountPoint = "/efi";
     };
   };
-  inherit _file;
 }

hosts/iso/main.nix

@@ -1,13 +1,10 @@
 {
   disko,
   nixos-generators,
-  _file,
-}:
-{
   lib,
   modulesPath,
   pkgs,
-  ...
+
 }:
 {
   ##Build wtih nix build .#nixosConfigurations.iso.config.formats.iso
@@ -43,5 +40,4 @@
     edition = lib.mkForce "gerg-minimal";
     isoName = lib.mkForce "NixOS";
   };
-  inherit _file;
 }

hosts/media-laptop/main.nix

@@ -1,9 +1,8 @@
-{ _file }:
 {
   lib,
   pkgs,
   config,
-  ...
+
 }:
 {
   local = {
@@ -84,5 +83,4 @@
       size = 8 * 1024;
     }
   ];
-  inherit _file;
 }