diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 5cf7af19..37ee0fc2 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -42,7 +42,6 @@ ./taffybar.nix ./tailscale.nix ./tts.nix - ./user-specific.nix ./users.nix ./vscode.nix ./waybar.nix diff --git a/nixos/keys.nix b/nixos/keys.nix index 2bfff1e4..670e1b1c 100644 --- a/nixos/keys.nix +++ b/nixos/keys.nix @@ -53,10 +53,6 @@ rec { railbird-sf = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDozY/3Cd9npaYPCgIn/E7MjW9c7Zb5/wTO5Qi7yRU45 root@railbird-sf" ]; - micahKeys = [ - "AAAAB3NzaC1yc2EAAAADAQABAAACAQC4ayU9sly58EHQ2YdrnoJ5o0mFD8I8UiDvN3kVh6oSMMQ9wkVzLUY6wUzlc0uq3P/OYco9mURMt83C+lY4UC+jvN09nIEHV7yVJWsKV3ntmnEqM63e9cOWnpC9XA1MSha7xrf9DaO/doxST4fY6ixZA+nbE0bFgNTqyjzdya7pCamAdnPqKqwUEha+0KfpA8TJlrfgrDLd65f2/+jLU8fhTkU6yhrJ9Piq7C+RwVTu/dlrp50PNirfQRSa7vUPNS8Y973XtK6jzB/xS2Qc6iGJ+4QcCy6lgu2xksO/MNIimZYGOCP2yx6/GDp/gnOlAktrJ3flMycJdEHkZVH61HfQV76O/mY3tck/SiCwhuNxXw0uh9wf4UO8JHlnJcsIsBkSBemJsxQul+G7kV4EV/gqW/iO5U2nKmDqbwNWigO9mN44LqBOwsnAnu78kiSE8sNCEdSy/qVWloBw4VyT/emvmTwP1okh/CKNnu0/HmfSNL6Vib1XuvKSPvrUIOLMrSeRdtu85LrWaS0CvKEoMrIgpvc+3jHtdbxwINE3JBGrbXvfe20CuHl6Fx0ONkhirRmrjG7iUjV/4c6nS2aguPVsGi7q3GYvtz7cNEe3XbfpZaHzrCncnoQPbnSDLjHdeZf4O5Aew6iOwwkpgBBDA3lJO55ujq2vNbgkpH3hmQjltQ==" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEBce6E/XCdo8+dC4PPyyTsO/Z0BZxuz0IrTLaGehrT weitzman.micah@gmail.com" - ]; benKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ6lD0c+frh2vzQjvsrsmJpwM1ovaY59m5NNPml5G+E benjamin.j.corner@gmail.com" ]; diff --git a/nixos/plasma.nix b/nixos/plasma.nix index e4fa84c8..50076e79 100644 --- a/nixos/plasma.nix +++ b/nixos/plasma.nix @@ -1,16 +1,20 @@ -{ pkgs, config, makeEnable, ... }: +{ pkgs, config, makeEnable, realUsers, ... }: makeEnable config "myModules.plasma" true { services.accounts-daemon.enable = true; services.displayManager.sddm = { enable = true; settings = { Users = { - # Show a maximum number of users + # Limit login candidates to regular interactive users. MaximumUid = 60000; MinimumUid = 1000; - # Enable user icons RememberLastUser = true; }; + Theme = { + # Breeze hides the user chooser when users exceed this threshold. + # Keep it aligned with declared normal users so the list stays visible. + DisableAvatarsThreshold = (builtins.length realUsers) + 10; + }; }; extraPackages = with pkgs; [ # sddm-astronaut diff --git a/nixos/user-specific.nix b/nixos/user-specific.nix deleted file mode 100644 index 53a7ba5b..00000000 --- a/nixos/user-specific.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - home-manager.users.micah = {pkgs, ...}: { - home.packages = [ - pkgs.neovim - ]; - }; -} diff --git a/nixos/users.nix b/nixos/users.nix index d31e4202..bd3fd18c 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -28,17 +28,6 @@ in { security.sudo.wheelNeedsPassword = false; users.users = with keys; { - syncthing = { - extraGroups = [ "syncthing" "wheel" ]; - home = "/var/lib/syncthing"; - createHome = true; - openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys; - }; - ivanm = userDefaults // { - extraGroups = extraGroupsWithWheel; - name = "ivanm"; - openssh.authorizedKeys.keys = kanivanKeys; - }; imalison = userDefaults // { extraGroups = extraGroupsWithWheel; name = "imalison"; @@ -55,11 +44,6 @@ in name = "dean"; openssh.authorizedKeys.keys = kanivanKeys ++ deanKeys; }; - will = userDefaults // { - extraGroups = extraGroupsWithWheel; - name = "will"; - openssh.authorizedKeys.keys = kanivanKeys ++ willKeys; - }; alex = userDefaults // { extraGroups = extraGroupsWithWheel; name = "alex"; @@ -70,26 +54,6 @@ in name = "loewy"; openssh.authorizedKeys.keys = kanivanKeys ++ loewyKeys; }; - mike = userDefaults // { - inherit extraGroups; - name = "mike"; - openssh.authorizedKeys.keys = kanivanKeys ++ mikeKeys; - }; - andy = userDefaults // { - inherit extraGroups; - name = "andy"; - openssh.authorizedKeys.keys = kanivanKeys ++ andyKeys; - }; - micah = userDefaults // { - inherit extraGroups; - name = "micah"; - openssh.authorizedKeys.keys = kanivanKeys ++ micahKeys; - }; - unprivileged = userDefaults // { - extraGroups = ["syncthing"]; - name = "unprivileged"; - openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys; - }; ben = userDefaults // { inherit extraGroups; name = "ben";