trusted import refactor. state version in base.

This commit is contained in:
kat witch 2021-08-05 21:56:49 +01:00
parent 011b4d58ea
commit 8e933e0876
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
3 changed files with 8 additions and 7 deletions

View file

@ -16,4 +16,6 @@
./rink.nix
./secrets.nix
];
home.stateVersion = "20.09";
}

View file

@ -1,5 +1,9 @@
let katUser = { lib }: let
userImport = profile: { config, ... }: {
trustedImport = {
config.home-manager.users.kat = {
imports = lib.optional (builtins.pathExists ../../trusted/users/kat) (import ../../trusted/users/kat);
};
}; userImport = profile: { config, ... }: {
config.home-manager.users.kat = {
imports = [
(./. + "/${profile}")
@ -13,7 +17,7 @@ let katUser = { lib }: let
"personal"
]; userProfiles = with userProfiles;
lib.genAttrs profileNames userImport // {
base = { imports = [ ./nixos.nix (userImport "base") ]; };
base = { imports = [ ./nixos.nix (userImport "base") trustedImport ]; };
server = { imports = [ personal ]; };
guiFull = { imports = [ gui sway dev media personal ]; };
}; in userProfiles;

View file

@ -1,11 +1,6 @@
{ config, pkgs, lib, ... }:
{
home-manager.users.kat = {
imports = lib.optional (builtins.pathExists ../../trusted/users/kat) (import ../../trusted/users/kat);
home.stateVersion = "20.09";
};
users.users.kat = {
uid = 1000;
isNormalUser = true;