snowfall migration wip fixed user config

homes/x86_64-linux/kylekrein/default.nix

@@ -23,14 +23,16 @@ in
       };
     };
     home = {
-      packages = with pkgs; [
+      packages = with pkgs;
+        [
           gdb
           element-desktop
           obs-studio
           neovim
           localsend
           kdePackages.kdenlive
-      ] ++ lib.optionals osConfig.custom.presets.gaming.enable [mcpelauncher-ui-qt];
+        ]
+        ++ lib.optionals osConfig.custom.presets.gaming.enable [mcpelauncher-ui-qt];
 
       sessionVariables = {
         EDITOR = "emacsclient -c";

homes/x86_64-linux/kylekrein/kitty.nix

@@ -1,5 +1,8 @@
-{osConfig, pkgs, ...}:
 {
+  osConfig,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [kitty-themes];
   programs.fzf = {
     enable = true;

lib/users/default.nix

@@ -5,8 +5,6 @@
   ...
 }:
 with lib; rec {
-  mkHomeManagerConfigOpt = config: lib.${namespace}.mkOpt' types.anything {};
-
   mkUser = {
     config,
     enable,
@@ -25,7 +23,7 @@ with lib; rec {
 
       home = {
         enable = enable;
-        #config = homeConfig;
+        config = homeConfig;
       };
     };
     users.users.${username} = mkIf enable {

modules/nixos/hardware/framework12/default.nix

@@ -17,6 +17,7 @@ with lib.${namespace}; let
 in {
   options.${namespace}.hardware.framework12 = with types; {
     enable = mkBoolOpt false "Enable hardware support for framework 12. P.s. you still need to import inputs.nixos-hardware.nixosModules.framework-12-13th-gen-intel yourself";
+    imports = [inputs.nixos-hardware.nixosModules.framework-12-13th-gen-intel];
   };
   config = mkIf cfg.enable {
     # Ensure that the `pinctrl_tigerlake` kernel module is loaded before `soc_button_array`.

modules/nixos/users/kylekrein/default.nix

@@ -26,7 +26,7 @@ with lib.${namespace}; let
 in {
   options.${namespace}.users.${username} = with types; {
     enable = mkBoolOpt false "Enable ${username} user";
-    config = mkHomeManagerConfigOpt config;
+    config = mkOpt types.attrs {} "Additional home manager config for ${username}";
   };
 
   config = mkUser {

modules/nixos/users/tania/default.nix

@@ -22,7 +22,7 @@ with lib.${namespace}; let
 in {
   options.${namespace}.users.${username} = with types; {
     enable = mkBoolOpt false "Enable ${username} user";
-    config = mkHomeManagerConfigOpt config;
+    config = mkOpt types.attrs {} "Additional home manager config for ${username}";
   };
 
   config = mkUser {

systems/x86_64-linux/kylekrein-homepc/default.nix

@@ -10,7 +10,22 @@
   systems,
   config,
   ...
-}:
+}: let
+  niri-outputs = {
+    programs.niri.settings.outputs = {
+      "DP-1" = {
+        scale = 1.6;
+        position.x = 1600;
+        position.y = 0;
+      };
+      "DP-3" = {
+        scale = 1.6;
+        position.x = 0;
+        position.y = 0;
+      };
+    };
+  };
+in
   with lib;
   with lib.${namespace}; {
     facter.reportPath = ./facter.json;
@@ -35,23 +50,12 @@ with lib.${namespace}; {
     };
 
     custom.users = {
-    tania = enabled;
       kylekrein = {
         enable = true;
+        config = niri-outputs;
       };
-  };
-  snowfallorg.users.kylekrein.home.config = {
-        programs.niri.settings.outputs = {
-          "DP-1" = {
-            scale = 1.6;
-            position.x = 1600;
-            position.y = 0;
-          };
-          "DP-3" = {
-            scale = 1.6;
-            position.x = 0;
-            position.y = 0;
-          };
+      tania = {
+        inherit (config.custom.users.kylekrein) enable config;
       };
     };
 

templates/user/default.nix

@@ -22,7 +22,7 @@ with lib.${namespace}; let
 in {
   options.${namespace}.users.${username} = with types; {
     enable = mkBoolOpt false "Enable ${username} user";
-    config = mkHomeManagerConfigOpt config;
+    config = mkOpt types.attrs {} "Additional home manager config for ${username}";
   };
 
   config = mkUser {