Revert "qenya: plasma: workaround for issue in randomcat's config"

This reverts commit 7189fae109.

This didn't actually fix the issue, as it turns out mkIf still
resolves the children of its attrset recursively. The longer-term
solution is to export my home-manager config as a flake output,
which I'm moving towards.

common/users/qenya.nix

@@ -11,9 +11,4 @@ in {
   };
 
   programs.zsh.enable = true;
-
-  home-manager.users.qenya = { config, lib, pkgs, osConfig, ... }: {
-    home.homeDirectory = osConfig.users.users.qenya.home;
-    imports = [ ../../home/qenya ];
-  };
 }

flake.nix

@@ -27,6 +27,19 @@
   };
 
   outputs = inputs@{ self, nixpkgs, home-manager, plasma-manager, nur, agenix, birdsong, ... }: {
+    # The name of this output type is not standardised. I have picked
+    # "homeManagerModules" as the discussion here suggests it's the most common:
+    # https://github.com/nix-community/home-manager/issues/1783
+    #
+    # However, note CppNix >= 2.22.3, >= 2.24 has blessed "homeModules":
+    # https://github.com/NixOS/nix/pull/10858
+    homeManagerModules."qenya" = { config, lib, pkgs, ... }: {
+      imports = [
+        plasma-manager.homeManagerModules.plasma-manager
+        ./home/qenya
+      ];
+    };
+
     colmena = {
       meta = {
         nixpkgs = import nixpkgs { system = "x86_64-linux"; };
@@ -35,7 +48,7 @@
         };
       };
 
-      defaults = { name, nodes, config, ... }: {
+      defaults = { name, nodes, ... }: {
         networking.hostName = name;
 
         nix.settings.experimental-features = "nix-command flakes";
@@ -43,7 +56,10 @@
         nixpkgs.config.allowUnfree = true;
 
         nixpkgs.overlays = [ nur.overlay ];
-        home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
+        
+        # TODO: make this or something like it work without infinite recursion
+        # home-manager.users."qenya" = lib.mkIf (config.users.users ? "qenya") self.homeManagerModules."qenya";
+        home-manager.users."qenya" = self.homeManagerModules."qenya";
 
         imports = [
           home-manager.nixosModules.home-manager

home/qenya/plasma/default.nix

@@ -1,19 +1,11 @@
 { config, lib, pkgs, osConfig, ... }:
 
 let
-  inherit (lib) mkIf;
   isPlasma = osConfig.services.desktopManager.plasma6.enable || osConfig.services.xserver.desktopManager.plasma5.enable;
 in
 {
-  # FIXME: this mkIf is necessary because home/qenya is imported into shaw here:
+  programs.plasma.enable = isPlasma;
-  #  https://github.com/randomnetcat/nix-configs/blob/75d491dc6904475e43a820287edf3cf2f89abcfb/hosts/shaw/birdsong.nix#L74
+  programs.plasma.overrideConfig = true;
-  #  shaw doesn't understand programs.plasma because randomcat doesn't import
-  #  plasma-manager, and is unwilling to because none of her machines run KDE.
-  #  This probably can't be fixed until we merge our configs completely.
-  programs = mkIf isPlasma {
-    plasma.enable = isPlasma;
-    plasma.overrideConfig = true;
-  };
 
   imports = [ ];
 }