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
@@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
mkdir -p .locks mkdir -p .locks
rm -f .locks/.built_via_skg rm -f .locks/.built_via_skg
+9 -17
View File
@@ -68,11 +68,7 @@
localNixCaches = localNixCaches; localNixCaches = localNixCaches;
enableNetworkDrives = true; enableNetworkDrives = true;
enableHomelabServices = true; enableHomelabServices = true;
home-manager = { homeManagerVersion = homeManagerVersion;
enable = true;
version = homeManagerVersion;
enableDevelopmentKit = false;
};
os = { os = {
enable = true; enable = true;
firewall = { enable = false; }; firewall = { enable = false; };
@@ -125,16 +121,14 @@
# MacBooks Setups # MacBooks Setups
# ------------- # -------------
darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule { darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule {
user = sumoUser; user = sumoUser // {
enableDevelopmentKit = true;
};
systemStateVersion = 4; systemStateVersion = 4;
localNixCaches = localNixCaches; localNixCaches = localNixCaches;
system = "x86_64-darwin"; system = "x86_64-darwin";
hostName = "asosnovsky-mac"; hostName = "asosnovsky-mac";
home-manager = { homeManagerVersion = homeManagerVersion;
enable = true;
enableDevelopmentKit = true;
version = homeManagerVersion;
};
configuration = configuration =
(import ./hosts/asosnovsky-mac.nix { user = sumoUser; }); (import ./hosts/asosnovsky-mac.nix { user = sumoUser; });
}; };
@@ -145,16 +139,14 @@
# ------------- # -------------
fwbook = lib.makeNixOsModule { fwbook = lib.makeNixOsModule {
system = "x86_64-linux"; system = "x86_64-linux";
user = user; user = user // {
enableDevelopmentKit = true;
};
systemStateVersion = "23.11"; systemStateVersion = "23.11";
hostName = "fwbook"; hostName = "fwbook";
localNixCaches = localNixCaches; localNixCaches = localNixCaches;
localDockerRegistries = localDockerRegistries; localDockerRegistries = localDockerRegistries;
home-manager = { homeManagerVersion = homeManagerVersion;
enable = true;
version = homeManagerVersion;
enableDevelopmentKit = true;
};
desktop = { desktop = {
enable = true; enable = true;
user = user; user = user;
-17
View File
@@ -1,17 +0,0 @@
{ hostName, version, user, enableDevelopmentKit ? false, ... }:
{ pkgs, ... }:
{
home-manager.users.root = {
home.stateVersion = version;
programs.git = {
enable = true;
userName = "root";
};
programs.zsh = {
enable = true;
autosuggestion.enable = true;
};
programs.zsh.oh-my-zsh.enable = true;
};
}
-10
View File
@@ -1,10 +0,0 @@
{ user }:
{ ... }: {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${user.name} = {
home = {
sessionVariables = { "DOCKER_DEFAULT_PLATFORM" = "linux/amd64"; };
};
};
}
+2 -13
View File
@@ -1,4 +1,5 @@
{ user { user
, homeManagerVersion
, systemStateVersion , systemStateVersion
, hostName , hostName
, system , system
@@ -12,11 +13,6 @@
, os ? { , os ? {
enable = false; enable = false;
} }
# Home Manager
, home-manager ? {
enable = false;
enableDevelopmentKit = false;
}
, localNixCaches ? { keys = [ ]; urls = [ ]; } , localNixCaches ? { keys = [ ]; urls = [ ]; }
, ... , ...
}: }:
@@ -38,14 +34,6 @@
hostName = hostName; hostName = hostName;
} // os)) } // os))
] ]
else
[ ]) ++ (if home-manager.enable then
[
(import ./home-manager ({
user = user;
hostName = hostName;
} // home-manager))
]
else else
[ ]) [ ])
++ (if enableNetworkDrives then [ (import ./network-drives.nix) ] else [ ]) ++ (if enableNetworkDrives then [ (import ./network-drives.nix) ] else [ ])
@@ -53,4 +41,5 @@
++ (if enableHomelabServices then [ (import ./hl-hardware) ] else [ ]) ++ (if enableHomelabServices then [ (import ./hl-hardware) ] else [ ])
; ;
skyg.user = user; skyg.user = user;
skyg.home-manager.version = home-manager.version;
} }
+1
View File
@@ -3,5 +3,6 @@
imports = [ imports = [
./core.nix ./core.nix
./user.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; with lib;
let let
cfg = config.skyg.core; cfg = config.skyg;
gitconfigs = gitconfigs =
(builtins.filterSource (path: type: type != "directory") ./gitconfigs); (builtins.filterSource (path: type: type != "directory") ./gitconfigs);
gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs); gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs);
@@ -11,6 +11,9 @@ let
in in
{ {
options = { options = {
skyg.home-manager.version = mkOption {
type = types.str;
};
skyg.user = { skyg.user = {
name = mkOption { name = mkOption {
type = types.str; type = types.str;
@@ -22,7 +25,7 @@ in
type = types.str; type = types.str;
}; };
extraGitConfigs = mkOption { extraGitConfigs = mkOption {
type = types.listOf (types.attrsOf { type = types.listOf (types.submodule {
path = mkOption { path = mkOption {
type = types.str; type = types.str;
}; };
@@ -37,10 +40,22 @@ in
}; };
config = { 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-manager.users.${cfg.user.name} = {
home = { home = {
sessionVariables = { }; sessionVariables = { };
stateVersion = version; stateVersion = cfg.home-manager.version;
shellAliases = { shellAliases = {
cat = "bat"; cat = "bat";
}; };
@@ -83,10 +98,7 @@ in
}; };
includes = includes =
(builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles) (builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles)
++ (if builtins.hasAttr "extraGitConfigs" user then ++ cfg.user.extraGitConfigs;
cfg.user.extraGitConfigs
else
[ ]);
}; };
zsh = { zsh = {
enable = true; enable = true;