global/programming: move into nixos modules

lib/options.nix

@@ -28,4 +28,8 @@ rec {
     coercedTo packageListType flatten (listOf package);
 
   packageListOpt = mkOpt coercedPackageList [ ];
+
+  addPackageLists = lib.mapAttrs (name: value: value // {
+    packages = packageListOpt;
+  });
 }

modules/global/programming.nix

@@ -1,17 +1,13 @@
 { config, pkgs, lib, ... }:
 let
   inherit (lib) flip;
-  inherit (lib.our) mkBoolOpt' packageListOpt;
+  inherit (lib.our) mkBoolOpt' addPackageLists;
 
   cfg = config.universe.programming;
 
 
   programmingOpt' = kind: flip mkBoolOpt' "Programming: ${kind}";
   programmingOpt = flip programmingOpt' cfg.all.enable;
-
-  addPackageLists = lib.mapAttrs (name: value: value // {
-    packages = packageListOpt;
-  });
 in
 {
   options.universe.programming = (addPackageLists {
@@ -146,7 +142,7 @@ in
       ];
     };
 
-    home.packages = lib.concatMap
+    universe.packages = lib.concatMap
       (v: lib.optionals (v ? packages && v.enable) v.packages)
       (lib.attrValues cfg);
 

users/modules/global/neovim.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ main, pkgs, lib, ... }:
 let
   flattenTree = lib.our.flattenTree' (val: val ? action) "";
 
@@ -15,7 +15,7 @@ let
         { leader = "<M- >"; mode = [ "n" "v" "i" ]; }
       ];
 
-  inherit (config.universe) programming;
+  inherit (main.universe) programming;
 in
 {
   programs.nixvim = {