chore: removed other users and systems

This commit is contained in:
Nick 2025-06-26 02:15:04 -05:00
parent 2b4ad99e25
commit 233cab07dd
135 changed files with 216 additions and 2462 deletions

View file

@ -7,38 +7,7 @@ let
inherit (flake.config.people)
user0
user1
user2
user3
;
inherit (flake.config.machines)
devices
;
hostname = config.networking.hostName;
mars = devices.mars.name;
ceres = devices.ceres.name;
venus = devices.venus.name;
charon = devices.charon.name;
deimos = devices.deimos.name;
userLogic =
if
builtins.elem hostname [
mars
deimos
ceres
]
then
[
user0
user1
user3
]
else if hostname == charon then
[ user1 ]
else if hostname == venus then
[ user2 ]
else
[ ];
in
{
security = {
@ -48,7 +17,10 @@ in
{
keepEnv = true;
noPass = true;
users = userLogic;
users = [
user0
user1
];
}
];
};

View file

@ -14,13 +14,13 @@ in
enable = true;
defaultFonts = {
serif = [
fonts.names.name0
fonts.name
];
monospace = [
fonts.names.name0
fonts.name
];
sansSerif = [
fonts.names.name0
fonts.name
];
emoji = [
"Noto Fonts Color Emoji"

View file

@ -4,55 +4,38 @@
...
}:
let
inherit (flake.config.people)
user0
user1
user2
user3
;
inherit (flake.config.machines)
devices
;
inherit (flake.config.people) user0 user1;
inherit (flake.config.machines) devices;
hostname = config.networking.hostName;
mars = devices.mars.name;
deimos = devices.deimos.name;
ceres = devices.ceres.name;
venus = devices.venus.name;
charon = devices.charon.name;
# Helper function to get SSH keys for a specific user
getUserKeys = user: flake.config.people.users.${user}.sshKeys;
user0Key = {
${user0} = {
openssh.authorizedKeys.keys = getUserKeys user0;
};
};
user1Key = {
${user1} = {
openssh.authorizedKeys.keys = getUserKeys user1;
};
};
in
{
users.users =
if hostname == charon then
{ }
else if hostname == mars then
{
${user0} = {
openssh.authorizedKeys.keys = getUserKeys user0;
};
${user3} = {
openssh.authorizedKeys.keys = getUserKeys user3;
};
}
if hostname == mars then
user0Key // user1Key
else if
builtins.elem hostname [
deimos
ceres
]
then
{
${user0} = {
openssh.authorizedKeys.keys = getUserKeys user0;
};
}
else if hostname == venus then
{
${user2} = {
openssh.authorizedKeys.keys = getUserKeys user2;
};
}
user0Key
else
{ };
}

View file

@ -17,23 +17,12 @@ in
niri
wayland
searx
xserver
flatpak
wireGuard
;
};
};
venus = {
imports = builtins.attrValues {
inherit (modules)
plasma
sddm
tablet
;
};
};
deimos = {
imports = builtins.attrValues {
inherit (modules)
@ -43,7 +32,6 @@ in
plasma
sddm
flatpak
xserver
espanso
wireGuard
glance
@ -56,22 +44,11 @@ in
inherit (modules)
plasma
sddm
xserver
wireGuard
;
};
};
charon = {
imports = builtins.attrValues {
inherit (modules)
gnome
flatpak
xserver
;
};
};
ceres = {
imports = builtins.attrValues {
inherit (modules)
@ -89,9 +66,6 @@ in
searx
vaultwarden
forgejo
xserver
# podgrab
# kanboard
;
};
};
@ -100,6 +74,7 @@ in
imports = builtins.attrValues {
inherit (modules)
sops
xserver
;
};
};

View file

@ -16,8 +16,8 @@ in
systemPackages = [
(pkgs.catppuccin-sddm.override {
flavor = "macchiato";
font = "${fonts.names.name0}";
fontSize = "${toString fonts.sizes.desktop.size0}";
font = "${fonts.name}";
fontSize = "${toString fonts.sizes.popups}";
loginBackground = true;
})
];

View file

@ -8,12 +8,8 @@
let
inherit (flake.config.people)
user0
user1
user2
;
inherit (flake.config.machines) devices;
venus = devices.venus.name;
charon = devices.charon.name;
mars = devices.mars.name;
host = config.networking.hostName;
@ -26,15 +22,7 @@ in
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --time-format '%I:%M %p | %a %h | %F' --theme border=magenta;text=cyan;prompt=green;time=red;action=blue;button=yellow;container=black;input=red --cmd Hyprland";
user =
if host == mars then
"greeter"
else if host == charon then
user1
else if host == venus then
user2
else
user0;
user = if host == mars then "greeter" else user0;
};
};
};

View file

@ -20,7 +20,7 @@ in
# GTK = {
# application_prefer_dark_theme = true;
# cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors";
# font_name = lib.mkForce "${fonts.names.name0} ${font.size.desktop}";
# font_name = lib.mkForce "${fonts.name} ${font.size.desktop}";
# icon_theme_name = lib.mkForce "Papirus-Dark";
# theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact";
# };

View file

@ -4,37 +4,7 @@
...
}:
let
inherit (flake.config.people)
user0
user1
user2
user3
;
inherit (flake.config.machines)
devices
;
hostname = config.networking.hostName;
mars = devices.mars.name;
ceres = devices.ceres.name;
venus = devices.venus.name;
charon = devices.charon.name;
deimos = devices.deimos.name;
userLogic =
if
builtins.elem hostname [
mars
deimos
ceres
]
then
user0
else if hostname == charon then
user1
else if hostname == venus then
user2
else
"";
inherit (flake.config.people) user0;
in
{
sops = {
@ -44,27 +14,23 @@ in
keyFile = "/var/lib/sops-nix/key.txt";
generateKey = false;
};
secrets =
if hostname == charon then
{ }
else
{
"ssh/private" = {
path = "/home/${userLogic}/.ssh/id_ed25519";
owner = userLogic;
};
"ssh/public" = {
path = "/home/${userLogic}/.ssh/id_ed25519.pub";
owner = userLogic;
};
"ssh/hosts" = {
path = "/home/${userLogic}/.ssh/known_hosts";
owner = userLogic;
};
"claude-api-key" = {
path = "/home/${user0}/.config/zed/claude-api-key";
owner = user0;
};
};
secrets = {
"ssh/private" = {
path = "/home/${user0}/.ssh/id_ed25519";
owner = user0;
};
"ssh/public" = {
path = "/home/${user0}/.ssh/id_ed25519.pub";
owner = user0;
};
"ssh/hosts" = {
path = "/home/${user0}/.ssh/known_hosts";
owner = user0;
};
"claude-api-key" = {
path = "/home/${user0}/.config/zed/claude-api-key";
owner = user0;
};
};
};
}