Move more things around

This commit is contained in:
Bun 2025-03-14 18:38:41 -04:00
parent 36c3f778c8
commit 94c28dbb8b
11 changed files with 17 additions and 26 deletions

View file

@ -1,7 +0,0 @@
{ ... }:
{
imports = [
./users
./groups
];
}

View file

@ -1,4 +0,0 @@
{ ... }:
{
imports = [ ./nfsShare ];
}

View file

@ -1,4 +0,0 @@
{ ... }:
{
users.groups.nfsShare.gid = 983;
}

View file

@ -1,12 +1,12 @@
{ lib, ... }:
{
imports = [
./accounts
./devices
./programs
./secrets
./services
./settings
./users
];
options.system = with lib; {

View file

@ -1,5 +1,7 @@
{ config, ... }:
{
imports = [ ./user ];
services.nfs.server = {
enable = config.system.fileserver.enable;
exports = ''

View file

@ -0,0 +1,4 @@
{ config, lib, ... }:
{
users.groups.nfsShare.gid = lib.mkIf config.services.nfs.server.enable 983;
}

View file

@ -3,7 +3,7 @@
imports = [
./mastodon
./owncast
./spacebar
#./spacebar
];
options.system.socialserver.enable = lib.mkEnableOption "Enable social media like services";

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, spacebar, ... }:
{
imports = [
#./nginx
./nginx
./user
];

View file

@ -1,6 +1,6 @@
{ config, lib, ... }:
{
users = lib.mkIf config.system.socialserver.enable {
users = lib.mkIf config.systemd.services.spacebar-server.enable {
users.spacebar = {
group = "spacebar";
isSystemUser = true;

View file

@ -12,14 +12,14 @@
isNormalUser = true;
createHome = true;
openssh.authorizedKeys.keyFiles = [
../../../../../hosts/tower/id_ed25519.pub
../../../../hosts/tower/id_ed25519.pub
../../../../../hosts/envy/id_ed25519.pub
../../../../../hosts/pear/id_ed25519.pub
../../../../../hosts/redmond/id_ed25519.pub
../../../../hosts/envy/id_ed25519.pub
../../../../hosts/pear/id_ed25519.pub
../../../../hosts/redmond/id_ed25519.pub
../../../../../hosts/midas/id_ed25519.pub
../../../../../hosts/prophet/id_ed25519.pub
../../../../hosts/midas/id_ed25519.pub
../../../../hosts/prophet/id_ed25519.pub
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
@ -43,6 +43,6 @@
shell = pkgs.zsh;
};
home-manager.users."${config.sysusers.main}" = import ../../../../home;
home-manager.users."${config.sysusers.main}" = import ../../../home;
};
}