refactor of user

This commit is contained in:
ari committed 2024-08-09 13:42:20 -04:00
1 parent 6ba046dd50
commit b6cc6828b6
8 files changed
+57 -65

No files matched your search

+1
View File
@@ -3,5 +3,6 @@
imports = [
./core.nix
./user.nix
./macos.nix
];
}
+24
View File
@@ -0,0 +1,24 @@
{ config, lib, pkgs, ... }:
with lib;
let
skygUser = config.skyg.user;
in
{
options = {
skyg.skyg.user.macos = {
enableOverride = mkEnableOption "";
};
};
config = mkIf skygUser.macos.enableOverride {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${skygUser.name} = {
home = {
sessionVariables = { "DOCKER_DEFAULT_PLATFORM" = "linux/amd64"; };
};
};
};
}
+20 -8
View File
@@ -1,9 +1,9 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.skyg.core;
cfg = config.skyg;
gitconfigs =
(builtins.filterSource (path: type: type != "directory") ./gitconfigs);
gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs);
@@ -11,6 +11,9 @@ let
in
{
options = {
skyg.home-manager.version = mkOption {
type = types.str;
};
skyg.user = {
name = mkOption {
type = types.str;
@@ -22,7 +25,7 @@ in
type = types.str;
};
extraGitConfigs = mkOption {
type = types.listOf (types.attrsOf {
type = types.listOf (types.submodule {
path = mkOption {
type = types.str;
};
@@ -37,10 +40,22 @@ in
};
config = {
home-manager.users.root = {
home.stateVersion = cfg.home-manager.version;
programs.git = {
enable = true;
userName = "root";
};
programs.zsh = {
enable = true;
autosuggestion.enable = true;
};
programs.zsh.oh-my-zsh.enable = true;
};
home-manager.users.${cfg.user.name} = {
home = {
sessionVariables = { };
stateVersion = version;
stateVersion = cfg.home-manager.version;
shellAliases = {
cat = "bat";
};
@@ -83,10 +98,7 @@ in
};
includes =
(builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles)
++ (if builtins.hasAttr "extraGitConfigs" user then
cfg.user.extraGitConfigs
else
[ ]);
++ cfg.user.extraGitConfigs;
};
zsh = {
enable = true;