removed ester user
This commit is contained in:
parent
cd825313dc
commit
4d0aa119b0
|
@ -6,10 +6,6 @@
|
|||
isTerminalUser = true;
|
||||
isPrincipleUser = true;
|
||||
};
|
||||
ester = {
|
||||
isPrincipleUser = true;
|
||||
isNormalUser = true;
|
||||
};
|
||||
eve.isNormalUser = false;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -6,6 +6,5 @@
|
|||
users = config.host.users;
|
||||
in {
|
||||
leyla = lib.mkIf users.leyla.isNormalUser (import ./leyla);
|
||||
ester = lib.mkIf users.ester.isNormalUser (import ./ester);
|
||||
eve = lib.mkIf users.eve.isNormalUser (import ./eve);
|
||||
}
|
||||
|
|
|
@ -1,78 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
osConfig,
|
||||
...
|
||||
}: let
|
||||
userConfig = osConfig.host.users.ester;
|
||||
in {
|
||||
imports = [];
|
||||
|
||||
config = {
|
||||
home = {
|
||||
username = userConfig.name;
|
||||
homeDirectory = osConfig.users.users.ester.home;
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
stateVersion = "23.11"; # Please read the comment before changing.
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
file = {
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
# ".screenrc".source = dotfiles/screenrc;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
# ".gradle/gradle.properties".text = ''
|
||||
# org.gradle.console=verbose
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
};
|
||||
|
||||
keyboard.layout = "it,us";
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. If you don't want to manage your shell through Home
|
||||
# Manager then you have to manually source 'hm-session-vars.sh' located at
|
||||
# either
|
||||
#
|
||||
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# /etc/profiles/per-user/ester/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
sessionVariables = {
|
||||
# EDITOR = "emacs";
|
||||
};
|
||||
|
||||
packages = lib.lists.optionals userConfig.isDesktopUser (
|
||||
with pkgs; [
|
||||
# helvetica font
|
||||
aileron
|
||||
|
||||
firefox
|
||||
bitwarden
|
||||
discord
|
||||
]
|
||||
);
|
||||
};
|
||||
|
||||
programs = {
|
||||
# Let Home Manager install and manage itself.
|
||||
home-manager.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -44,11 +44,6 @@
|
|||
user = "eve";
|
||||
group = "eve";
|
||||
}
|
||||
{
|
||||
folder = "ester";
|
||||
user = "ester";
|
||||
group = "ester";
|
||||
}
|
||||
{
|
||||
folder = "users";
|
||||
user = "root";
|
||||
|
@ -57,7 +52,7 @@
|
|||
];
|
||||
nfs = {
|
||||
enable = true;
|
||||
directories = ["leyla" "eve" "ester"];
|
||||
directories = ["leyla" "eve"];
|
||||
};
|
||||
};
|
||||
reverse_proxy = {
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
isTerminalUser = true;
|
||||
isPrincipleUser = true;
|
||||
};
|
||||
ester.isDesktopUser = true;
|
||||
eve.isDesktopUser = true;
|
||||
};
|
||||
sync = {
|
||||
|
|
|
@ -50,12 +50,6 @@
|
|||
options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"];
|
||||
};
|
||||
|
||||
"/mnt/ester_home" = {
|
||||
device = "defiant:/exports/ester";
|
||||
fsType = "nfs";
|
||||
options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"];
|
||||
};
|
||||
|
||||
"/mnt/users_home" = {
|
||||
device = "defiant:/exports/users";
|
||||
fsType = "nfs";
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
isTerminalUser = true;
|
||||
isPrincipleUser = true;
|
||||
};
|
||||
ester.isDesktopUser = true;
|
||||
eve.isDesktopUser = true;
|
||||
};
|
||||
hardware = {
|
||||
|
|
|
@ -11,10 +11,6 @@ in {
|
|||
name = lib.mkForce host.users.leyla.name;
|
||||
home = lib.mkForce "/home/${host.users.leyla.name}";
|
||||
};
|
||||
ester = {
|
||||
name = lib.mkForce host.users.ester.name;
|
||||
home = lib.mkForce "/home/${host.users.ester.name}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
|
||||
uids = {
|
||||
leyla = 1000;
|
||||
ester = 1001;
|
||||
eve = 1002;
|
||||
jellyfin = 2000;
|
||||
forgejo = 2002;
|
||||
|
@ -27,7 +26,6 @@
|
|||
|
||||
gids = {
|
||||
leyla = 1000;
|
||||
ester = 1001;
|
||||
eve = 1002;
|
||||
users = 100;
|
||||
jellyfin_media = 2001;
|
||||
|
@ -42,7 +40,6 @@
|
|||
|
||||
users = config.users.users;
|
||||
leyla = users.leyla.name;
|
||||
ester = users.ester.name;
|
||||
eve = users.eve.name;
|
||||
in {
|
||||
config = lib.mkMerge [
|
||||
|
@ -77,10 +74,6 @@ in {
|
|||
neededForUsers = true;
|
||||
sopsFile = "${inputs.secrets}/user-passwords.yaml";
|
||||
};
|
||||
"passwords/ester" = {
|
||||
neededForUsers = true;
|
||||
sopsFile = "${inputs.secrets}/user-passwords.yaml";
|
||||
};
|
||||
"passwords/eve" = {
|
||||
neededForUsers = true;
|
||||
sopsFile = "${inputs.secrets}/user-passwords.yaml";
|
||||
|
@ -105,17 +98,6 @@ in {
|
|||
group = config.users.users.leyla.name;
|
||||
};
|
||||
|
||||
ester = {
|
||||
uid = lib.mkForce uids.ester;
|
||||
name = lib.mkForce host.users.ester.name;
|
||||
description = "Ester";
|
||||
extraGroups = lib.optionals host.users.ester.isNormalUser ["networkmanager"];
|
||||
hashedPasswordFile = config.sops.secrets."passwords/ester".path;
|
||||
isNormalUser = host.users.ester.isNormalUser;
|
||||
isSystemUser = !host.users.ester.isNormalUser;
|
||||
group = config.users.users.ester.name;
|
||||
};
|
||||
|
||||
eve = {
|
||||
uid = lib.mkForce uids.eve;
|
||||
name = lib.mkForce host.users.eve.name;
|
||||
|
@ -178,13 +160,6 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
ester = {
|
||||
gid = lib.mkForce gids.ester;
|
||||
members = [
|
||||
ester
|
||||
];
|
||||
};
|
||||
|
||||
eve = {
|
||||
gid = lib.mkForce gids.eve;
|
||||
members = [
|
||||
|
@ -196,7 +171,6 @@ in {
|
|||
gid = lib.mkForce gids.users;
|
||||
members = [
|
||||
leyla
|
||||
ester
|
||||
eve
|
||||
];
|
||||
};
|
||||
|
@ -206,7 +180,6 @@ in {
|
|||
members = [
|
||||
users.jellyfin.name
|
||||
leyla
|
||||
ester
|
||||
eve
|
||||
];
|
||||
};
|
||||
|
@ -264,7 +237,6 @@ in {
|
|||
members = [
|
||||
users.syncthing.name
|
||||
leyla
|
||||
ester
|
||||
eve
|
||||
];
|
||||
};
|
||||
|
|
|
@ -84,11 +84,6 @@ in {
|
|||
isDesktopUser = lib.mkDefault false;
|
||||
isTerminalUser = lib.mkDefault false;
|
||||
};
|
||||
ester = {
|
||||
isPrincipleUser = lib.mkDefault false;
|
||||
isDesktopUser = lib.mkDefault false;
|
||||
isTerminalUser = lib.mkDefault false;
|
||||
};
|
||||
eve = {
|
||||
isPrincipleUser = lib.mkDefault false;
|
||||
isDesktopUser = lib.mkDefault false;
|
||||
|
|
Loading…
Reference in a new issue