refactor(flake): Consolidate overlay configurations into shared functions

Extract duplicated overlay and home-manager configuration code into two
reusable factory functions:

- mkBaseOverlay: Creates the base overlay with unstable pkgs, custom
  packages, and bitwarden-desktop compatibility. Accepts optional
  unstableOverlays parameter for darwin-specific customizations.

- mkHomeManagerConfig: Creates home-manager configuration with shared
  settings (useGlobalPkgs, useUserPackages, doom-emacs module). Accepts
  sharedModules parameter for platform-specific modules like plasma-manager.

This reduces code duplication across nixosModules, nixosModulesUnstable,
and darwinModules, making the flake easier to maintain and extend.

Implements bead: nixos-configs-ek5

flake.nix

@@ -56,94 +56,75 @@
   };
 
   outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let
-    nixosModules = [
-      ./roles
-    ] ++ [
-      inputs.home-manager.nixosModules.home-manager
-      {
-        nixpkgs.overlays = [
-          (final: prev: {
+    # Shared overlay function to reduce duplication across module sets
+    # Parameters:
+    #   unstableOverlays: Additional overlays to apply when importing nixpkgs-unstable
+    mkBaseOverlay = { unstableOverlays ? [] }: (final: prev: {
       unstable = import nixpkgs-unstable {
         system = prev.stdenv.hostPlatform.system;
         config.allowUnfree = true;
+        overlays = unstableOverlays;
       };
       custom = prev.callPackage ./packages {};
       # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
       bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
-          })
-        ];
+    });
+
+    # Shared home-manager configuration factory
+    # Parameters:
+    #   sharedModules: Additional modules to include in home-manager.sharedModules
+    mkHomeManagerConfig = { sharedModules ? [] }: {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
-        home-manager.sharedModules = [
-          inputs.plasma-manager.homeModules.plasma-manager
+      home-manager.sharedModules = sharedModules ++ [
         inputs.nix-doom-emacs-unstraightened.homeModule
       ];
       home-manager.extraSpecialArgs = {
         globalInputs = inputs;
       };
+    };
+
+    nixosModules = [
+      ./roles
+      inputs.home-manager.nixosModules.home-manager
+      {
+        nixpkgs.overlays = [ (mkBaseOverlay {}) ];
       }
+      (mkHomeManagerConfig {
+        sharedModules = [ inputs.plasma-manager.homeModules.plasma-manager ];
+      })
     ];
+
     # Modules for unstable-based systems (like nix-deck)
     nixosModulesUnstable = [
       ./roles
-    ] ++ [
       inputs.home-manager-unstable.nixosModules.home-manager
       inputs.jovian.nixosModules.jovian
       {
-        nixpkgs.overlays = [
-          (final: prev: {
-            unstable = import nixpkgs-unstable {
-              system = prev.stdenv.hostPlatform.system;
-              config.allowUnfree = true;
-            };
-            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
+        nixpkgs.overlays = [ (mkBaseOverlay {}) ];
+      }
+      (mkHomeManagerConfig {
+        sharedModules = [ inputs.plasma-manager-unstable.homeModules.plasma-manager ];
       })
     ];
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.sharedModules = [
-          inputs.plasma-manager-unstable.homeModules.plasma-manager
-          inputs.nix-doom-emacs-unstraightened.homeModule
-        ];
-        home-manager.extraSpecialArgs = {
-          globalInputs = inputs;
-        };
-      }
-    ];
+
     darwinModules = [
       ./roles/darwin.nix
-    ] ++ [
       inputs.home-manager.darwinModules.home-manager
       {
         nixpkgs.overlays = [
-          (final: prev: {
-            unstable = import nixpkgs-unstable {
-              system = prev.stdenv.hostPlatform.system;
-              config.allowUnfree = true;
-              overlays = [
+          (mkBaseOverlay {
             # Override claude-code in unstable to use our custom GCS-based build
             # (needed for corporate networks that block npm registry)
+            unstableOverlays = [
               (ufinal: uprev: {
-                  claude-code = prev.custom.claude-code or (prev.callPackage ./packages {}).claude-code;
+                claude-code = uprev.callPackage ./packages/claude-code {};
               })
             ];
-            };
-            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
           })
         ];
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.sharedModules = [
-          inputs.nix-doom-emacs-unstraightened.homeModule
-        ];
-        home-manager.extraSpecialArgs = {
-          globalInputs = inputs;
-        };
       }
+      (mkHomeManagerConfig { sharedModules = []; })
     ];
 
   in {

roles/nfs-mounts/default.nix

@@ -8,21 +8,6 @@ in
 {
   options.roles.nfs-mounts = {
     enable = mkEnableOption "Enable default NFS mounts";
-    server = mkOption {
-      type = types.str;
-      default = "10.0.0.43";
-      description = "IP address or hostname of the NFS server";
-    };
-    remotePath = mkOption {
-      type = types.str;
-      default = "/media";
-      description = "Remote path to mount from the NFS server";
-    };
-    mountPoint = mkOption {
-      type = types.str;
-      default = "/media";
-      description = "Local mount point for the NFS share";
-    };
     # TODO: implement requireMount
     requireMount = mkOption {
       type = types.bool;
@@ -33,8 +18,8 @@ in
 
   config = mkIf cfg.enable
     {
-      fileSystems.${cfg.mountPoint} = {
-        device = "${cfg.server}:${cfg.remotePath}";
+      fileSystems."/media" = {
+        device = "10.0.0.43:/media";
         fsType = "nfs";
         options = [
           "defaults"

roles/printing/default.nix

@@ -8,21 +8,6 @@ in
 {
   options.roles.printing = {
     enable = mkEnableOption "Enable default printing setup";
-    printerName = mkOption {
-      type = types.str;
-      default = "MFC-L8900CDW_series";
-      description = "Name for the default printer";
-    };
-    printerUri = mkOption {
-      type = types.str;
-      default = "ipp://brother.oglehome/ipp/print";
-      description = "Device URI for the default printer (e.g., ipp://hostname/ipp/print)";
-    };
-    printerModel = mkOption {
-      type = types.str;
-      default = "everywhere";
-      description = "PPD model for the printer (use 'everywhere' for driverless IPP)";
-    };
   };
 
   config = mkIf cfg.enable
@@ -36,11 +21,11 @@ in
       };
 
       hardware.printers.ensurePrinters = [{
-        name = cfg.printerName;
-        deviceUri = cfg.printerUri;
-        model = cfg.printerModel;
+        name = "MFC-L8900CDW_series";
+        deviceUri = "ipp://brother.oglehome/ipp/print";
+        model = "everywhere";
       }];
-      hardware.printers.ensureDefaultPrinter = cfg.printerName;
+      hardware.printers.ensureDefaultPrinter = "MFC-L8900CDW_series";
 
       # Fix ensure-printers service to wait for network availability
       systemd.services.ensure-printers = {

roles/virtualisation/default.nix

@@ -8,11 +8,6 @@ in
 {
   options.roles.virtualisation = {
     enable = mkEnableOption "Enable virtualisation";
-    dockerUsers = mkOption {
-      type = types.listOf types.str;
-      default = [ "johno" ];
-      description = "List of users to add to the docker group";
-    };
   };
 
   config = mkIf cfg.enable
@@ -20,6 +15,6 @@ in
       virtualisation.libvirtd.enable = true;
       programs.virt-manager.enable = true;
       virtualisation.docker.enable = true;
-      users.extraGroups.docker.members = cfg.dockerUsers;
+      users.extraGroups.docker.members = [ "johno" ];
     };
 }