feat(repositories): add optional dependencies (#35)

Author: IceDBorn

config.toml

@@ -1,5 +1,6 @@
 [[icedos.repositories]]
 url = "github:icedos/apps"
+fetchOptionalDependencies = true
 modules = [
   "btop",
   "celluloid",
@@ -15,6 +16,7 @@ modules = [
   "network-manager",
   "obs",
   "proton-launch",
+  "reigntweak",
   "scx",
   "sd-inhibitor",
   "steam",
@@ -150,6 +152,7 @@ serviceArgs = "-p 0 -v 3C -f A0"
 
 [[icedos.repositories]]
 url = "github:icedos/cosmic"
+fetchOptionalDependencies = true
 
 [icedos.desktop.cosmic.wallpaper]
 wallpaper = "path:/home/icedborn/Pictures/wallpaper.jpg"
@@ -206,15 +209,6 @@ startupScript = """
   zen-social &
 """
 
-[[icedos.repositories]]
-url = "github:icedos/desktop"
-modules = ["cosmic-greeter"]
-
-[icedos.desktop]
-autologinUser = "icedborn"
-
-[icedos.desktop.users.icedborn]
-
 [[icedos.repositories]]
 url = "github:icedos/hardware"
 modules = [
@@ -291,5 +285,26 @@ url = "github:icedos/users"
 [icedos.users.icedborn]
 description = "IceDBorn"
 
+[icedos.desktop]
+autologinUser = "icedborn"
+
+[icedos.desktop.users.icedborn]
+
 [icedos.system]
 version = "23.05"
+
+# [[icedos.system.channels]]
+# name = "master"
+# url = "github:nixos/nixpkgs/master"
+
+[[icedos.system.channels]]
+name = "small"
+url = "github:nixos/nixpkgs/nixos-unstable-small"
+
+# [[icedos.system.channels]]
+# name = "unstable"
+# url = "github:nixos/nixpkgs/nixpkgs-unstable"
+
+# [[icedos.system.channels]]
+# name = "stable"
+# url = "github:nixos/nixpkgs/nixos-25.05"

lib/genflake.nix

@@ -60,7 +60,7 @@ in
           system = "${system}";
           pkgs = nixpkgs.legacyPackages.''${system};
           inherit (pkgs) lib;
-          inherit (lib) fileContents flatten map;
+          inherit (lib) fileContents map;
 
           inherit (builtins) fromTOML;
           inherit ((fromTOML (fileContents ./config.toml))) icedos;

lib/icedos.nix

@@ -213,7 +213,7 @@ let
           length
           ;
 
-        inherit (lib) optional unique;
+        inherit (lib) optional optionals unique;
 
         getModuleKey = url: name: "${url}/${name}";
 
@@ -276,16 +276,24 @@ let
             # Get deps
             innerDeps = flatMap (
               mod:
-              map (
-                {
-                  url ? newDep.url,
-                  modules ? [ ],
-                }:
-                {
-                  url = if (url == "self") then newDep.url else url;
-                  modules = filter (mod: !elem (getModuleKey url mod) allKnownKeys) modules;
-                }
-              ) (mod.meta.dependencies or [ ])
+              map
+                (
+                  {
+                    url ? newDep.url,
+                    modules ? [ ],
+                  }:
+                  {
+                    url = if (url == "self") then newDep.url else url;
+                    modules = filter (mod: !elem (getModuleKey url mod) allKnownKeys) modules;
+                  }
+                )
+                (
+                  let
+                    inherit (mod) meta;
+                  in
+                  (meta.dependencies or [ ])
+                  ++ optionals (newDep.fetchOptionalDependencies or false) (meta.optionalDependencies or [ ])
+                )
             ) newModules;
           in
           flatten (

modules/options.nix

@@ -33,8 +33,8 @@ in
       };
 
       repositories = mkSubmoduleListOption { } {
-        name = mkStrOption { };
         url = mkStrOption { };
+        fetchOptionalDependencies = mkBoolOption { };
         modules = mkStrListOption { };
       };
     };