xun/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

just moved some things around

Browse source
This commit is contained in:
xunuwu 2025-01-14 08:14:04 +01:00
parent 92679e4716
commit bcf8a2ec2c
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
3 changed files with 75 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/machines/hopper/default.nix
View file

@ -4,7 +4,7 @@
inputs.vpn-confinement.nixosModules.default inputs.vpn-confinement.nixosModules.default
./hardware.nix ./hardware.nix
./newlab.nix ./lab
../../systemProfiles/secrets/default.nix ../../systemProfiles/secrets/default.nix
../../systemProfiles/secrets/hopper/default.nix ../../systemProfiles/secrets/hopper/default.nix

81
nix/machines/hopper/newlab.nix → nix/machines/hopper/lab/default.nix
View file

@ -15,6 +15,10 @@
ncPort = 46523; ncPort = 46523;
kanidmPort = 8300; kanidmPort = 8300;
in { in {
imports = [
./samba.nix
];
## TODO use kanidm ## TODO use kanidm
## TODO use impermanence ## TODO use impermanence
## TODO setup fail2ban mayb ## TODO setup fail2ban mayb
@ -117,14 +121,11 @@ in {
config.services.transmission.settings.rpc-port config.services.transmission.settings.rpc-port
80 # homepage 80 # homepage
]; ];
in in (l.map (x: {
(l.map (x: { from = x;
from = x; to = x;
to = x; })
}) passthrough);
passthrough)
++ [
];
}; };
networking.firewall = { networking.firewall = {
@ -436,70 +437,6 @@ in {
credentialsFile = config.sops.secrets.transmission.path; credentialsFile = config.sops.secrets.transmission.path;
}; };
# only used for samba
users.groups.xun = {};
users.users.xun = {
isSystemUser = true;
group = "xun";
extraGroups = ["transmission" "vault" "media"];
};
users.groups.vault = {};
systemd.tmpfiles.rules = [
"d /srv/vault 0770 root vault -"
];
services.samba = {
enable = true;
openFirewall = true;
settings = {
global = {
"log level" = 6;
"log file" = "/var/log/samba/samba.log";
"server string" = config.networking.hostName;
"hosts allow" = "192.168.50.0/24";
"map to guest" = "bad user";
};
transmission = {
path = "/var/lib/transmission";
browseable = "yes";
"read only" = "yes";
"guest ok" = "no";
"create mask" = "0664";
"directory mask" = "0775";
};
vault = {
path = "/srv/vault";
browseable = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0660";
"directory mask" = "0770";
"force user" = "xun";
"force group" = "xun";
};
slskd = {
path = "/var/lib/slskd";
browseable = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0660";
"directory mask" = "0770";
"force user" = "slskd";
"force group" = "slskd";
};
library = {
path = "media/library";
browseable = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0666";
"directory mask" = "0777";
"force user" = "media";
"force group" = "media";
};
};
};
# TODO use this for sso with some things maybe # TODO use this for sso with some things maybe
# services.tailscaleAuth = { # services.tailscaleAuth = {
# enable = true; # enable = true;

65
nix/machines/hopper/lab/samba.nix Normal file
View file

@ -0,0 +1,65 @@
{config, ...}: {
# only used for samba
users.groups.xun = {};
users.users.xun = {
isSystemUser = true;
group = "xun";
extraGroups = ["transmission" "vault" "media"];
};
users.groups.vault = {};
systemd.tmpfiles.rules = [
"d /srv/vault 0770 root vault -"
];
services.samba = {
enable = true;
openFirewall = true;
settings = {
global = {
"log level" = 6;
"log file" = "/var/log/samba/samba.log";
"server string" = config.networking.hostName;
"hosts allow" = "192.168.50.0/24";
"map to guest" = "bad user";
};
transmission = {
path = "/var/lib/transmission";
browseable = "yes";
"read only" = "yes";
"guest ok" = "no";
"create mask" = "0664";
"directory mask" = "0775";
};
vault = {
path = "/srv/vault";
browseable = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0660";
"directory mask" = "0770";
"force user" = "xun";
"force group" = "xun";
};
slskd = {
path = "/var/lib/slskd";
browseable = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0660";
"directory mask" = "0770";
"force user" = "slskd";
"force group" = "slskd";
};
library = {
path = "media/library";
browseable = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0666";
"directory mask" = "0777";
"force user" = "media";
"force group" = "media";
};
};
};
}