Moved home-manager work to a place

I can use with other linuxes
This commit is contained in:
ari committed 2024-08-09 21:54:40 -04:00
1 parent 618429e3c0
commit 66a876ee72
9 files changed
+56 -42

No files matched your search

+33 -33
View File
@@ -1,15 +1,9 @@
{ stateVersion
, enableDevelopmentKit
, name
, fullName
, email
, extraGitConfigs ? [ ]
}:
{ stateVersion }:
let
gitconfigs =
(builtins.filterSource (path: type: type != "directory") ./gitconfigs);
gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs);
commonGitConfigs = {
makeCommonGitConfigs = { extraGitConfigs }: {
delta = { enable = true; };
extraConfig = {
color = { ui = "auto"; };
@@ -68,34 +62,40 @@ in
git = {
enable = true;
userName = "root";
} // commonGitConfigs;
} // (makeCommonGitConfigs { extraGitConfigs = [ ]; });
} // (commonProgramsConfig { pkgs = pkgs; });
};
makeCommonUser = { pkgs, ... }: {
home = {
stateVersion = stateVersion;
shellAliases = {
cat = "bat";
makeCommonUser =
{ enableDevelopmentKit
, fullName
, email
, extraGitConfigs ? [ ]
, ...
}: { pkgs, ... }: {
home = {
stateVersion = stateVersion;
shellAliases = {
cat = "bat";
};
packages = with pkgs;
[ jq nixpkgs-fmt ipfetch nixd ]
++ (if enableDevelopmentKit then [
rye
devenv
uv
devbox
terraform
kubectl
] else
[ ]);
};
packages = with pkgs;
[ jq nixpkgs-fmt ipfetch nixd ]
++ (if enableDevelopmentKit then [
rye
devenv
uv
devbox
terraform
kubectl
] else
[ ]);
programs = {
git = {
enable = true;
userName = fullName;
userEmail = email;
} // (makeCommonGitConfigs { extraGitConfigs = extraGitConfigs; });
} // (commonProgramsConfig { pkgs = pkgs; });
};
programs = {
git = {
enable = true;
userName = fullName;
userEmail = email;
} // commonGitConfigs;
} // (commonProgramsConfig { pkgs = pkgs; });
};
}
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
with lib;
+13 -6
View File
@@ -4,7 +4,6 @@ with lib;
let
cfg = config.skyg;
hm = (import ../home-manager.nix cfg.user);
in
{
options = {
@@ -12,6 +11,7 @@ in
type = types.str;
};
skyg.user = {
enabled = mkEnableOption "";
name = mkOption {
type = types.str;
};
@@ -36,9 +36,16 @@ in
};
};
config = {
programs.zsh.enable = true;
home-manager.users.root = hm.makeRootUser { pkgs = pkgs; };
home-manager.users.${cfg.user.name} = hm.makeCommonUser { pkgs = pkgs; };
};
config =
let
hm = (import ../home-manager.nix {
stateVersion = cfg.home-manager.version;
});
in
mkIf cfg.user.enabled
{
programs.zsh.enable = true;
home-manager.users.root = hm.makeRootUser { pkgs = pkgs; };
home-manager.users.${cfg.user.name} = (hm.makeCommonUser cfg.user) { pkgs = pkgs; };
};
}