Simplify flake readability, move NixOS configs outside of flake-utils

flake.nix

@@ -52,22 +52,13 @@
 
   outputs = inputs: with inputs;
 
-  flake-utils.lib.eachDefaultSystemPassThrough (system:
   let 
     mkNix = name: channel: channel.lib.nixosSystem {
       modules = [ (./hosts + "/${name}") ];
       specialArgs = inputs;
     };
-      mkHome = extraModules: hm.lib.homeManagerConfiguration {
-        modules = [
-          ./modules/home
-          { targets.genericLinux.enable = true; }
-        ] ++ extraModules;
-        extraSpecialArgs = inputs;
-        pkgs = builtins.getAttr system stable.legacyPackages;
-      };
-
-      hostChannels = {
+  in {
+    nixosConfigurations = builtins.mapAttrs (name: channel: mkNix name channel) {
       tower = stable;
       detritus = stable;
       hidden = stable;
@@ -79,13 +70,21 @@
       kitty = stable;
       prophet = stable;
     };
-    in {
-      nixosConfigurations = builtins.mapAttrs (name: channel: mkNix name channel) hostChannels;
+  }
 
+  // flake-utils.lib.eachDefaultSystemPassThrough (system: let
+    mkHome = extraModules: hm.lib.homeManagerConfiguration {
+      modules = [
+        ./modules/home
+        { targets.genericLinux.enable = true; }
+      ] ++ extraModules;
+      extraSpecialArgs = inputs;
+      pkgs = builtins.getAttr system stable.legacyPackages;
+    };
+  in {
     homeConfigurations = {
       default = mkHome [ ];
       desktop = mkHome [{ home.guifull.enable = true; }];
     };
-    }
-  );
+  });
 }

modules/home/profiles/default.nix

@@ -1,9 +1,6 @@
 { lib, ... }:
 {
-  imports = [
-    ./generic
-    ./guifull
-  ];
+  imports = [ ./guifull ];
 
   options.home = with lib; {
     desktop.enable = mkEnableOption "Desktop programs and services";

modules/home/profiles/generic/default.nix

@@ -1,8 +0,0 @@
-{ config, lib, ... }:
-{
-  config = lib.mkIf config.targets.genericLinux.enable {
-    home = {
-      sessionVariables.PATH = "$HOME/.nix-profile/bin:$PATH";
-    };
-  };
-}