finally share with ragdoll

config.nix

@@ -33,19 +33,28 @@ rec {
         requirements: lib.all (req: builtins.elem req capabilities) requirements;
       program =
         {
+          inputs,
+          name,
           requirements ? [ ],
           home-config,
-          system-config ? { },
+          system-config ? (_: { }),
         }:
-        # if (matches-capabilities requirements) then
+        if (matches-capabilities requirements) then
-        if (true) then
+          [ (if builtins.isNull home-only then (system-config inputs) else (home-config inputs)) ]
-          {
+          ++
-            inherit home-config system-config;
+
-          }
+            (
+              if builtins.isNull home-only then
+                [
+                  (_: {
+                    custom.program.${name}.defered-config = home-config;
+                  })
+                ]
               else
-          {
+                [ ]
-            # home-config = _: { };
+            )
-          };
+        else
+          [ ];
       specialArgsForHomeSystem =
         {
           system,

defaults/machine-config.nix

@@ -8,7 +8,6 @@
 {
   imports = [
     ./machine-or-home-config.nix
-    ./xdg.nix
   ];
 
   system.stateVersion = machine.stateVersion;

hosts/fili/services/factorio/default.nix

@@ -61,7 +61,7 @@ let
       };
       privateUsers = "no";
 
-      config =
+      imports =
         {
           config,
           pkgs,

modules/program.nix

@@ -1,4 +1,4 @@
-{
+inputs@{
   lib,
   options,
   machine,
@@ -9,24 +9,16 @@ with lib;
   options = {
     custom.program = mkOption {
       type = types.attrsOf (
-        types.submodule (
+        types.submodule (_: {
-          { config, ... }:
-          {
           options = {
             name = mkOption {
               type = types.string;
             };
-              home-config = mkOption {
+            defered-config = mkOption {
               type = types.deferredModule;
             };
-              system-config = mkOption {
-                type = types.deferredModule;
-                default = _: { };
           };
-            };
+        })
-            config = if builtins.isNull machine.home-only then config.system-config else config.home-config;
-          }
-        )
       );
     };
   };

modules/users.nix

@@ -106,7 +106,7 @@ in
                 imports = (
                   [
                   ]
-                  ++ (map (program: program.home-config) programs)
+                  ++ (map (program: program.defered-config) programs)
                 );
                 home = {
                   inherit stateVersion;

programs/default.nix

@@ -1,6 +1,9 @@
-{ machine, ... }@inputs:
+{ machine, lib, ... }@inputs:
 {
-  imports = [
+
+  imports = lib.concatLists [
+    [
+      ./xdg.nix
       ./nvim
       ./fish
       ./kanata
@@ -11,9 +14,11 @@
       ./niri
       ./zed
       ./firefox
-  ];
+    ]
 
-  custom.program.graphcial-packages = machine.program {
+    (machine.program {
+      name = "graphcial-packages";
+      inherit inputs;
       requirements = [ "graphical" ];
       home-config =
         { pkgs, ... }:
@@ -31,9 +36,11 @@
             hunspellDicts.en_US
           ];
         };
-  };
+    })
 
-  custom.program.discord = machine.program {
+    (machine.program {
+      name = "discord";
+      inherit inputs;
       requirements = [ "graphical" ];
       home-config =
         {
@@ -147,9 +154,11 @@
             })
           ];
         };
-  };
+    })
 
-  custom.program.fun-packages = machine.program {
+    (machine.program {
+      name = "fun-packages";
+      inherit inputs;
       requirements = [ "fun" ];
       home-config =
         { pkgs, ... }:
@@ -159,9 +168,11 @@
             prismlauncher
           ];
         };
-  };
+    })
 
-  custom.program.cli-packages = machine.program {
+    (machine.program {
+      name = "cli-packages";
+      inherit inputs;
       requirements = [ "cli" ];
       home-config =
         { config, pkgs, ... }:
@@ -225,6 +236,6 @@
             '';
           };
         };
-  };
+    })
-
+  ];
 }

programs/firefox/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.firefox = machine.program {
+  imports = machine.program {
+    name = "firefox";
+    inherit inputs;
     requirements = [ "graphical" ];
     home-config =
       {

programs/fish/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.fish = machine.program {
+  imports = machine.program {
+    name = "fish";
+    inherit inputs;
     requirements = [ "cli" ];
     home-config =
       {
@@ -227,6 +229,7 @@
 
               function fish_greeting
                 ${pkgs.blahaj}/bin/blahaj -s
+                echo "welcome to $(uname -n), $(whoami)!"
               end
             '';
           };

programs/git/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.git = machine.program {
+  imports = machine.program {
+    name = "git";
+    inherit inputs;
     requirements = [ "cli" ];
     home-config = _: {
       programs.git = {

programs/jj/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.jujutsu = machine.program {
+  imports = machine.program {
+    name = "jujutsu";
+    inherit inputs;
     requirements = [ "cli" ];
     home-config =
       { config, pkgs, ... }:

programs/kanata/default.nix

@@ -1,4 +1,4 @@
-{ machine, pkgs, ... }:
+inputs@{ machine, pkgs, ... }:
 let
   kanata-config = ''
     (defcfg
@@ -86,7 +86,9 @@ let
   '';
 in
 {
-  custom.program.kanata = machine.program {
+  imports = machine.program {
+    name = "kanata";
+    inherit inputs;
     requirements = [ "graphical" ];
     home-config =
       { pkgs, ... }:

programs/kitty/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.kitty = machine.program {
+  imports = machine.program {
+    name = "kitty";
+    inherit inputs;
     requirements = [ "graphical" ];
     home-config =
       { pkgs, flakes, ... }:

programs/niri/default.nix

@@ -1,14 +1,15 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.niri = machine.program {
+  imports = machine.program {
+    name = "niri";
+    inherit inputs;
     requirements = [ "graphical" ];
     home-config =
-      {
+      { config
-        config,
+      , pkgs
-        pkgs,
+      , flakes
-        flakes,
+      , lib
-        lib,
+      , ...
-        ...
       }:
       let
         noctalia =

programs/nvim/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.nvim = machine.program {
+  imports = machine.program {
+    name = "nvim";
+    inherit inputs;
     requirements = [ "cli" ];
     home-config =
       {

programs/tmux/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.tmux = machine.program {
+  imports = machine.program {
+    name = "tmux";
+    inherit inputs;
     requirements = [ "cli" ];
     home-config =
       { pkgs, ... }:

programs/xdg.nix

@@ -1,4 +1,4 @@
-{ ... }@inputs:
+{ machine, ... }@inputs:
 let
   browsers = [
     "firefox.desktop"
@@ -117,7 +117,10 @@ let
   };
 in
 {
-  custom.program.homedirs = {
+  imports = machine.program {
+    name = "xdg";
+    inherit inputs;
+    requirements = [ ];
     home-config =
       { config, ... }:
       {
@@ -142,8 +145,7 @@ in
           };
         };
       };
-  };
+    system-config = _: {
-
       xdg = {
         mime = {
           enable = true;
@@ -152,5 +154,6 @@ in
           inherit removedAssociations;
         };
       };
-
+    };
+  };
 }

programs/zed/default.nix

@@ -1,6 +1,8 @@
-{ machine, ... }:
+inputs@{ machine, ... }:
 {
-  custom.program.zed = machine.program {
+  imports = machine.program {
+    name = "zed";
+    inherit inputs;
     requirements = [
       "work"
       "graphical"