From 4d0aa119b07b37b8a1b7606693b465f6966ac42d Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Tue, 21 Jan 2025 15:56:40 -0600 Subject: [PATCH] removed ester user --- .../darwin/hesperium/configuration.nix | 4 - configurations/home-manager/default.nix | 1 - configurations/home-manager/ester/default.nix | 78 ------------------- .../nixos/defiant/configuration.nix | 7 +- .../nixos/horizon/configuration.nix | 1 - .../nixos/horizon/hardware-configuration.nix | 6 -- .../nixos/twilight/configuration.nix | 1 - modules/darwin-modules/users.nix | 4 - modules/nixos-modules/users.nix | 28 ------- modules/system-modules/users.nix | 5 -- 10 files changed, 1 insertion(+), 134 deletions(-) delete mode 100644 configurations/home-manager/ester/default.nix diff --git a/configurations/darwin/hesperium/configuration.nix b/configurations/darwin/hesperium/configuration.nix index 08fc59f..f8af5c8 100644 --- a/configurations/darwin/hesperium/configuration.nix +++ b/configurations/darwin/hesperium/configuration.nix @@ -6,10 +6,6 @@ isTerminalUser = true; isPrincipleUser = true; }; - ester = { - isPrincipleUser = true; - isNormalUser = true; - }; eve.isNormalUser = false; }; }; diff --git a/configurations/home-manager/default.nix b/configurations/home-manager/default.nix index 587d1c2..3aa4c0e 100644 --- a/configurations/home-manager/default.nix +++ b/configurations/home-manager/default.nix @@ -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); } diff --git a/configurations/home-manager/ester/default.nix b/configurations/home-manager/ester/default.nix deleted file mode 100644 index 181a487..0000000 --- a/configurations/home-manager/ester/default.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix index f60e146..ca24db1 100644 --- a/configurations/nixos/defiant/configuration.nix +++ b/configurations/nixos/defiant/configuration.nix @@ -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 = { diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix index 0c48bb3..232456c 100644 --- a/configurations/nixos/horizon/configuration.nix +++ b/configurations/nixos/horizon/configuration.nix @@ -16,7 +16,6 @@ isTerminalUser = true; isPrincipleUser = true; }; - ester.isDesktopUser = true; eve.isDesktopUser = true; }; sync = { diff --git a/configurations/nixos/horizon/hardware-configuration.nix b/configurations/nixos/horizon/hardware-configuration.nix index a30decb..ca6bf4b 100644 --- a/configurations/nixos/horizon/hardware-configuration.nix +++ b/configurations/nixos/horizon/hardware-configuration.nix @@ -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"; diff --git a/configurations/nixos/twilight/configuration.nix b/configurations/nixos/twilight/configuration.nix index 18e9972..c288149 100644 --- a/configurations/nixos/twilight/configuration.nix +++ b/configurations/nixos/twilight/configuration.nix @@ -12,7 +12,6 @@ isTerminalUser = true; isPrincipleUser = true; }; - ester.isDesktopUser = true; eve.isDesktopUser = true; }; hardware = { diff --git a/modules/darwin-modules/users.nix b/modules/darwin-modules/users.nix index f0b55c0..72fd1b1 100644 --- a/modules/darwin-modules/users.nix +++ b/modules/darwin-modules/users.nix @@ -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}"; - }; }; }; } diff --git a/modules/nixos-modules/users.nix b/modules/nixos-modules/users.nix index c3a316e..5cfa7fb 100644 --- a/modules/nixos-modules/users.nix +++ b/modules/nixos-modules/users.nix @@ -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 ]; }; diff --git a/modules/system-modules/users.nix b/modules/system-modules/users.nix index fe88850..cd9c900 100644 --- a/modules/system-modules/users.nix +++ b/modules/system-modules/users.nix @@ -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;