This commit is contained in:
ari committed 2025-12-16 09:50:09 -05:00
1 parent bccb61ec27
commit f1613955f7
6 files changed
+187 -137

No files matched your search

+27 -18
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
with lib;
@@ -25,11 +30,13 @@ in
type = types.str;
};
extraGitConfigs = mkOption {
type = types.listOf (types.submodule {
path = mkOption {
type = types.str;
};
});
type = types.listOf (
types.submodule {
path = mkOption {
type = types.str;
};
}
);
default = [ ];
};
};
@@ -37,18 +44,20 @@ in
config =
let
hm = (import ../home {
stateVersion = cfg.home-manager.version;
});
hm = (
import ../home {
stateVersion = cfg.home-manager.version;
}
);
in
mkIf cfg.user.enable
{
programs.zsh.enable = true;
home-manager.users.root =
(hm.makeRootUser { hostName = config.skyg.core.hostName; }) { pkgs = pkgs; };
home-manager.users.${cfg.user.name} =
((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
mkIf cfg.user.enable {
programs.zsh.enable = true;
home-manager.users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
pkgs = pkgs;
};
home-manager.backupFileExtension = ".bak";
home-manager.users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
};
}
+60 -50
View File
@@ -16,64 +16,74 @@ let
};
in
{
makeRootUser = { hostName }: { pkgs, ... }: {
home = homeModule // {
packages = with pkgs; [
jq
kubectl
kubectx
htop
btop
duf
];
};
programs = (programsModule {
pkgs = pkgs;
user = {
name = "root";
makeRootUser =
{ hostName }:
{ pkgs, ... }:
{
home = homeModule // {
packages = with pkgs; [
jq
kubectl
kubectx
htop
btop
duf
];
};
}) // (makeCommonGitConfigs {
userName = "root";
userEmail = "root@${hostName}";
extraGitConfigs = [ ];
});
services = servicesModule { pkgs = pkgs; };
fonts = fontsModule;
};
programs =
(programsModule {
pkgs = pkgs;
user = {
name = "root";
};
})
// (makeCommonGitConfigs {
userName = "root";
userEmail = "root@${hostName}";
extraGitConfigs = [ ];
});
services = servicesModule { pkgs = pkgs; };
fonts = fontsModule;
};
makeCommonUser =
{ fullName
, email
, extraGitConfigs ? [ ]
, name
, ...
}@user: { pkgs, ... }: {
{
fullName,
email,
extraGitConfigs ? [ ],
name,
...
}@user:
{ pkgs, ... }:
{
fonts = fontsModule;
# xdg.configFile."mimeapps.list".force = true;
home = homeModule // {
username = name;
homeDirectory = "/home/${name}";
packages = with pkgs;
[
jq
nixpkgs-fmt
ipfetch
nixd
htop
btop
fastfetch
kubectl
kubectx
terraform
dust
];
packages = with pkgs; [
jq
nixpkgs-fmt
ipfetch
nixd
htop
btop
fastfetch
kubectl
kubectx
terraform
dust
];
};
programs = (programsModule {
inherit pkgs user;
}) // (makeCommonGitConfigs {
userName = fullName;
userEmail = email;
extraGitConfigs = extraGitConfigs;
});
programs =
(programsModule {
inherit pkgs user;
})
// (makeCommonGitConfigs {
userName = fullName;
userEmail = email;
extraGitConfigs = extraGitConfigs;
});
services = servicesModule { pkgs = pkgs; };
};
}