ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix home-manager import issue

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2022-05-24 18:02:56 +02:00
parent 8a6fb6c6cc
commit 0793eaa1c3
Failed to extract signature
2 changed files with 116 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
flake.nix
View File

@ -47,69 +47,74 @@
}; };
}; };
outputs = {self, nixpkgs, flake-utils-plus, ...}@inputs: outputs = { self, nixpkgs, flake-utils-plus, ... }@inputs:
let let
extended-lib = nixpkgs.lib.extend extended-lib = nixpkgs.lib.extend
(final: prev: { (final: prev: {
elss = (import ./lib {lib = final; }) prev; elss = (import ./lib { lib = final; }) prev;
}); });
inherit (extended-lib.elss) discoverModules moduleNames; inherit (extended-lib.elss) discoverModules moduleNames;
in in
flake-utils-plus.lib.mkFlake rec{ flake-utils-plus.lib.mkFlake rec{
inherit self inputs; inherit self inputs;
supportedSystems = [ "x86_64-linux" ]; supportedSystems = [ "x86_64-linux" ];
lib = extended-lib; lib = extended-lib;
channelsConfig = { channelsConfig = {
allowUnfreePredicate = pkg: builtins.elem (extended-lib.getName pkg) [ allowUnfreePredicate = pkg: builtins.elem (extended-lib.getName pkg) [
"steam" "steam"
"steam-original" "steam-original"
"steam-runtime" "steam-runtime"
"skypeforlinux" "skypeforlinux"
"teams" "teams"
"zoom" "zoom"
];
};
channels.nixpkgs.overlaysBuilder = channels: [
(final: prev: {
unstable = channels.nixpkgs-unstable;
})
inputs.nix.overlay
inputs.emacs-overlay.overlay
]; ];
};
hostDefaults = { channels.nixpkgs.overlaysBuilder = channels: [
system = "x86_64-linux"; (final: prev: {
channelName = "nixpkgs"; unstable = channels.nixpkgs-unstable;
modules = [ })
inputs.home-manager.nixosModules.home-manager inputs.nix.overlay
inputs.dwarffs.nixosModules.dwarffs inputs.emacs-overlay.overlay
] ++ (map (name: ./modules + "/${name}") (moduleNames ./modules)); ];
specialArgs = {
nixos-hardware = inputs.nixos-hardware.nixosModules; hostDefaults = {
inherit inputs; system = "x86_64-linux";
}; channelName = "nixpkgs";
extraArgs = { inherit homeConfigurations; }; modules = [
inputs.home-manager.nixosModules.home-manager
inputs.dwarffs.nixosModules.dwarffs
] ++ (map (name: ./modules + "/${name}") (moduleNames ./modules));
specialArgs = {
nixos-hardware = inputs.nixos-hardware.nixosModules;
inherit inputs;
}; };
extraArgs = {
homeConfigurations = discoverModules ./users
(name:
import (./users + "/${name}")
);
};
};
hosts = discoverModules ./machines (name: { hosts = discoverModules ./machines (name: {
modules = [ (./machines + "/${name}") ]; modules = [ (./machines + "/${name}") ];
specialArgs = { lib = extended-lib; }; specialArgs = { lib = extended-lib; };
}); });
homeConfigurations = discoverModules ./users homeConfigurations = discoverModules ./users
(name: (name:
let let
username = extended-lib.removeSuffix ".nix" name; username = extended-lib.removeSuffix ".nix" name;
in in
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
configuration = import (./users + "/${name}"); configuration = import (./users + "/${name}");
inherit username; inherit username;
system = "x86_64-linux"; system = "x86_64-linux";
homeDirectory = "/home/${username}"; homeDirectory = "/home/${username}";
stateVersion = "21.05"; stateVersion = "21.05";
}); });
}; };
} }

109
modules/users.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, homeConfigurations, ... }:
with lib; { with lib; {
options.elss.users = { options.elss.users = {
@ -82,38 +82,38 @@ with lib; {
mkUser = login: mkUser = login:
let meta = getMeta login; let meta = getMeta login;
in in
{ {
inherit (meta) description; inherit (meta) description;
isNormalUser = true; isNormalUser = true;
home = "/home/${login}"; home = "/home/${login}";
extraGroups = [ ]; extraGroups = [ ];
openssh.authorizedKeys.keys = meta.publicKeys; openssh.authorizedKeys.keys = meta.publicKeys;
}; };
mkGitUser = login: mkGitUser = login:
let meta = getMeta login; let meta = getMeta login;
in in
{ {
programs.git = { programs.git = {
userEmail = meta.mailAddress; userEmail = meta.mailAddress;
userName = meta.description; userName = meta.description;
extraConfig ={ extraConfig = {
gpg = lib.mkIf meta.git.gpgsm { gpg = lib.mkIf meta.git.gpgsm {
format = "x509"; format = "x509";
program = "${pkgs.gnupg}/bin/gpgsm"; program = "${pkgs.gnupg}/bin/gpgsm";
}; };
user = { user = {
signingKey = meta.git.key; signingKey = meta.git.key;
signByDefault = meta.git.signDefault; signByDefault = meta.git.signDefault;
};
}; };
}; };
}; };
};
mkX11User = login: mkX11User = login:
let meta = getMeta login; let meta = getMeta login;
in in
mkIf (cfg.x11.enable) mkIf (cfg.x11.enable)
{ {
xsession = { xsession = {
numlock.enable = true; numlock.enable = true;
@ -133,36 +133,41 @@ with lib; {
}; };
in in
mkIf (cfg.enable) mkIf (cfg.enable)
{ {
assertions = assertions =
let let
cfg = config.elss.users; cfg = config.elss.users;
in in
[ [
{ {
assertion = mutuallyExclusive cfg.users cfg.admins; assertion = mutuallyExclusive cfg.users cfg.admins;
message = "kbs.users.users and kbs.users.admins are mutually exclusive"; message = "elss.users.users and elss.users.admins are mutually exclusive";
} }
{ {
assertion = all (hash: hash != "") assertion = all (hash: hash != "")
(catAttrs "hashedPassword" (attrVals cfg.admins cfg.meta)); (catAttrs "hashedPassword" (attrVals cfg.admins cfg.meta));
message = "No admin without password"; message = "No admin without password";
} }
{ {
assertion = length (cfg.admins) > 0; assertion = length (cfg.admins) > 0;
message = "One admin needed at least"; message = "One admin needed at least";
} }
]; ];
users = { users = {
mutableUsers = false; mutableUsers = false;
users = users =
mkMerge [ mkMerge [
(mapAdmins mkAdmin) (mapAdmins mkAdmin)
(mapUsers mkUser) (mapUsers mkUser)
]; ];
};
home-manager.users = (mapAllUsers mkGitUser) // (mapAllUsers mkX11User) // (mapAllUsersAndRoot (_: { config.home.stateVersion = mkDefault "21.05"; }));
}; };
home-manager.users = mapAllUsersAndRoot (login:
mkMerge [
{ config.home.stateVersion = mkDefault "21.11"; }
(if homeConfigurations ? "${login}" then homeConfigurations."${login}" else { })
]
);
};
} }