modules: create home/common module

modules/system/common/default.nix

@@ -3,6 +3,7 @@
   configurationName,
   lib,
   pkgs,
+  inputs,
   inputs',
   username,
   ...
@@ -16,32 +17,10 @@
       };
       flake-qol.enable = true;
       user = {
-        enable = true;
-        config = {
-          home.packages = let
-            extraPkgs = [pkgs.nh];
-          in
-            [inputs'.settei.packages.base-packages] ++ extraPkgs;
-
-          home.sessionVariables.EDITOR = "hx";
-          programs.git = {
-            enable = true;
-            difftastic.enable = true;
-            lfs.enable = true;
-            userName = "Nikodem Rabuliński";
-            userEmail = lib.mkDefault "nikodem@rabulinski.com";
-            signing = {
-              key = config.settei.sane-defaults.allSshKeys.${configurationName};
-              signByDefault = true;
-            };
-            extraConfig = {
-              gpg.format = "ssh";
-              push.followTags = true;
-            };
-          };
-
-          programs.fish.enable = true;
-        };
+        enable = lib.mkDefault true;
+        # TODO: Move to settei or leave here?
+        extraArgs.machineName = configurationName;
+        config.imports = [inputs.settei.homeModules.common];
       };
     };
 

modules/system/settei/user.nix

@@ -3,7 +3,7 @@
   options,
   lib,
   ...
-}: let
+} @ args: let
   hasHomeManager = options ? home-manager;
   cfg = config.settei.user;
   inherit (config.settei) username;
@@ -26,7 +26,11 @@ in {
     hmConfig = lib.optionalAttrs hasHomeManager {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = cfg.extraArgs;
+      home-manager.extraSpecialArgs =
+        {
+          inherit (args) inputs inputs';
+        }
+        // cfg.extraArgs;
 
       home-manager.users.${username} = {
         _file = ./user.nix;