From bbc8cb3d6773737dfb36dc76b80e83620526a13e Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Wed, 4 Dec 2024 18:26:21 -0500
Subject: [PATCH] global/programming: move into nixos modules

---
 lib/options.nix                                   | 4 ++++
 {users/modules => modules}/global/programming.nix | 8 ++------
 users/modules/global/neovim.nix                   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename {users/modules => modules}/global/programming.nix (94%)

diff --git a/lib/options.nix b/lib/options.nix
index 5b08fe0..dc94a5b 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -28,4 +28,8 @@ rec {
     coercedTo packageListType flatten (listOf package);
 
   packageListOpt = mkOpt coercedPackageList [ ];
+
+  addPackageLists = lib.mapAttrs (name: value: value // {
+    packages = packageListOpt;
+  });
 }
diff --git a/users/modules/global/programming.nix b/modules/global/programming.nix
similarity index 94%
rename from users/modules/global/programming.nix
rename to modules/global/programming.nix
index effcb95..50f444a 100644
--- a/users/modules/global/programming.nix
+++ b/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);
 
diff --git a/users/modules/global/neovim.nix b/users/modules/global/neovim.nix
index a344b72..cf60970 100644
--- a/users/modules/global/neovim.nix
+++ b/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 = {