This commit is contained in:
2025-12-30 16:04:23 +03:00
parent f94e6a70d8
commit c09485e2be
+51 -23
View File
@@ -1,10 +1,15 @@
{ inputs, ... }@flakeContext: { inputs, ... }@flakeContext:
let let
nixosModule = nixosModule =
{ xlib, ... }: {
config,
lib,
xlib,
...
}:
let let
mkHomeModule =
homeModule = { username }:
{ {
config, config,
lib, lib,
@@ -16,31 +21,54 @@ let
(./. + "/${xlib.device.type}.nix") (./. + "/${xlib.device.type}.nix")
]; ];
home = { home = {
username = xlib.device.username; username = username;
stateVersion = lib.mkDefault "25.05"; stateVersion = lib.mkDefault "25.05";
homeDirectory = "/home/${config.home.username}"; homeDirectory = if username == "root" then "/${username}" else "/home/${username}";
enableNixpkgsReleaseCheck = false; enableNixpkgsReleaseCheck = false;
}; };
}; };
rootModule = mkModule = username: mkHomeModule { username = username; };
{
config, homeModule = mkModule xlib.device.username;
lib, rootModule = mkModule "root";
pkgs, # homeModule =
... # {
}: # config,
{ # lib,
imports = [ # pkgs,
(./. + "/${xlib.device.type}.nix") # ...
]; # }:
home = { # {
username = lib.mkDefault "root"; # imports = [
stateVersion = lib.mkDefault "25.05"; # (./. + "/${xlib.device.type}.nix")
homeDirectory = lib.mkDefault "/${config.home.username}"; # ];
enableNixpkgsReleaseCheck = false; # home = {
}; # username = xlib.device.username;
}; # stateVersion = lib.mkDefault "25.05";
# homeDirectory = "/home/${config.home.username}";
# enableNixpkgsReleaseCheck = false;
# };
# };
# rootModule =
# {
# config,
# lib,
# pkgs,
# ...
# }:
# {
# imports = [
# (./. + "/${xlib.device.type}.nix")
# ];
# home = {
# username = "root";
# stateVersion = lib.mkDefault "25.05";
# homeDirectory = lib.mkDefault "/${config.home.username}";
# enableNixpkgsReleaseCheck = false;
# };
# };
in in
{ {