Reorganize overlays

configurations/firefox.nix

@@ -3,6 +3,14 @@
     home.packages = with pkgs; [ firefox ];
   };
 
+  nixpkgs.overlays = [
+    (self: super: {
+      firefox = super.firefox.override { extraNativeMessagingHosts = [ self.passff-host ]; pkcs11Modules = [ self.eid-mw ]; };
+      # Avoids a double firefox install, see https://github.com/NixOS/nixpkgs/pull/31772
+      firefox-bin = self.firefox;
+    })
+  ];
+
   custom.zfs.homeLinks = [
     { path = ".cache/mozilla"; type = "cache"; }
     { path = ".mozilla"; type = "data"; }

configurations/pass.nix

@@ -0,0 +1,11 @@
+{ ... }: {
+  nixpkgs.overlays = [
+    (self: super: {
+      pass = (super.pass-wayland.override { pass = super.pass-wayland; }).withExtensions (ext: [ ext.pass-otp ]);
+    })
+  ];
+
+  home-manager.users.charlotte = { pkgs, ... }: {
+    home.packages = [ pkgs.pass ];
+  };
+}

configurations/ssh.nix

@@ -7,6 +7,25 @@
     { path = ".ssh/known_hosts"; type = "cache"; }
   ];
 
+  nixpkgs.overlays = [
+    (self: super: {
+      ssh = self.symlinkJoin {
+        name = "openssh";
+        paths = [
+          (
+            self.writeScriptBin "ssh" ''
+              #!${self.zsh}/bin/zsh
+
+              export TERM=xterm-256color
+              ${super.openssh}/bin/ssh $@
+            ''
+          )
+          super.openssh
+        ];
+      };
+    })
+  ];
+
   home-manager.users.charlotte = { pkgs, ... }: {
     home.packages = with pkgs; [
       ssh

configurations/zeroad.nix

@@ -5,9 +5,13 @@
     { path = ".config/0ad"; type = "cache"; }
   ];
 
+  nixpkgs.overlays = [
+    (self: super: {
+      zeroadPackages = super.zeroadPackages.override { newScope = extra: self.newScope ({ stdenv = self.stdenvAdapters.impureUseNativeOptimizations self.stdenv; } // extra); };
+    })
+  ];
+
   home-manager.users.charlotte = { pkgs, ... }: {
-    home.packages = [
+    home.packages = [ pkgs.zeroad ];
-      pkgs.zeroad
-    ];
   };
 }

overlays/default.nix

@@ -1,14 +0,0 @@
-{ ... }:
-let
-  files = [
-    "firefox.nix"
-    "pass.nix"
-    "ssh.nix"
-    "zeroad.nix"
-  ];
-  overlays = map (f: import (./. + "/${f}")) files;
-  set = builtins.listToAttrs (map (f: { name = f; value = (./. + "/${f}"); }) files);
-in
-{
-  nixpkgs.overlays = overlays;
-}

overlays/firefox.nix

@@ -1,5 +0,0 @@
-self: super: {
-  firefox = super.firefox.override { extraNativeMessagingHosts = [ self.passff-host ]; pkcs11Modules = [ self.eid-mw ]; };
-  # Avoids a double firefox install, see https://github.com/NixOS/nixpkgs/pull/31772
-  firefox-bin = self.firefox;
-}

overlays/pass.nix

@@ -1,3 +0,0 @@
-self: super: {
-  pass = (super.pass-wayland.override { pass = super.pass-wayland; }).withExtensions (ext: [ ext.pass-otp ]);
-}

overlays/ssh.nix

@@ -1,16 +0,0 @@
-self: super: {
-  ssh = self.symlinkJoin {
-    name = "openssh";
-    paths = [
-      (
-        self.writeScriptBin "ssh" ''
-          #!${self.zsh}/bin/zsh
-
-          export TERM=xterm-256color
-          ${super.openssh}/bin/ssh $@
-        ''
-      )
-      super.openssh
-    ];
-  };
-}

overlays/zeroad.nix

@@ -1,3 +0,0 @@
-self: super: {
-  zeroadPackages = super.zeroadPackages.override { newScope = extra: self.newScope ({ stdenv = self.stdenvAdapters.impureUseNativeOptimizations self.stdenv; } // extra); };
-}

profiles/common.nix

@@ -7,7 +7,6 @@ in
   imports = [
     "${home-manager}/nixos"
     ../modules/zfs.nix
-    ../overlays/default.nix
     ../configurations/direnv.nix
     ../configurations/git.nix
     ../configurations/gnupg.nix
@@ -15,6 +14,7 @@ in
     ../configurations/neovim.nix
     ../configurations/nix-index.nix
     ../configurations/nix-store.nix
+    ../configurations/pass.nix
     ../configurations/ssh.nix
     ../configurations/tmux.nix
     ../configurations/users.nix
@@ -29,7 +29,6 @@ in
       moreutils
       ncdu
       pandoc
-      pass
       ripgrep
       texlive.combined.scheme-medium
       unzip