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

Update all to mycelium ips

Browse source
This commit is contained in:
Bun 2025-05-29 23:29:05 -04:00
parent 200bf7e711
commit 48b55af695
10 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hosts/kitty/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }: { config, ... }:
{ {
fileSystems = { fileSystems = with config.services.mycelium.ips; {
"/persist/storage" = { "/persist/storage" = {
device = "/dev/disk/by-uuid/edd3e293-1aff-4fc0-96fa-4e17d6cccfca"; device = "/dev/disk/by-uuid/edd3e293-1aff-4fc0-96fa-4e17d6cccfca";
fsType = "btrfs"; fsType = "btrfs";
@ -12,7 +12,7 @@
# Network mounts # Network mounts
"/home/${config.sysusers.main}/Network/Midas" = { "/home/${config.sysusers.main}/Network/Midas" = {
device = "11.0.0.1:/storage"; device = "[${midas}]:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ options = [
"x-systemd.automount" "x-systemd.automount"
@ -21,7 +21,7 @@
]; ];
}; };
"/home/${config.sysusers.main}/Network/Prophet" = { "/home/${config.sysusers.main}/Network/Prophet" = {
device = "mx.nixfox.ca:/storage"; device = "[${prophet}]:/storage";;
fsType = "nfs4"; fsType = "nfs4";
options = [ options = [
"noauto" "noauto"

6
hosts/midas/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ ... }: { config, ... }:
{ {
fileSystems = { fileSystems = with config.services.mycelium.ips; {
"/persist" = { "/persist" = {
device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
fsType = "btrfs"; fsType = "btrfs";
@ -11,7 +11,7 @@
]; ];
}; };
"/kitty" = { "/kitty" = {
device = "11.0.0.2:/storage/bun"; device = "[${kitty}]:/storage/bun";
fsType = "nfs4"; fsType = "nfs4";
options = [ options = [
"noauto" "noauto"

8
hosts/tower/filesystems/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }: { config, ... }:
{ {
fileSystems = { fileSystems = with config.services.mycelium.ips; {
# Games and such # Games and such
"/mnt/Linux1" = { "/mnt/Linux1" = {
device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4"; device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4";
@ -40,7 +40,7 @@
# Network mounts # Network mounts
"/home/${config.sysusers.main}/Network/Midas" = { "/home/${config.sysusers.main}/Network/Midas" = {
device = "11.0.0.1:/storage"; device = "[${midas}]:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ options = [
"noauto" "noauto"
@ -49,7 +49,7 @@
]; ];
}; };
"/home/${config.sysusers.main}/Network/Kitty" = { "/home/${config.sysusers.main}/Network/Kitty" = {
device = "11.0.0.2:/storage/bun"; device = "[${kitty}]:/storage/bun";
fsType = "nfs4"; fsType = "nfs4";
options = [ options = [
"noauto" "noauto"
@ -58,7 +58,7 @@
]; ];
}; };
"/home/${config.sysusers.main}/Network/Prophet" = { "/home/${config.sysusers.main}/Network/Prophet" = {
device = "mx.nixfox.ca:/storage"; device = "[${prophet}]:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ options = [
"noauto" "noauto"

20
modules/home/programs/terminal/ssh/default.nix
View file

@ -4,22 +4,12 @@
enable = true; enable = true;
addKeysToAgent = "yes"; addKeysToAgent = "yes";
compression = true; compression = true;
matchBlocks = with lib.hm.dag; { matchBlocks = {
# Personal servers # Personal servers
nixfox = { tower.hostname = "577:84d1:b682:9ac3:b987:b78e:33d9:2060";
match = ''canonical host "*.nixfox.ca"''; midas.hostname = "538:e163:87ba:f847:3646:18b6:6b01:d8f8";
user = config.home.username; kitty.hostname = "2607:fea8:431d:cba5:37b6:92f8:5be:7c56";
}; prophet.hostname = "42f:2737:2aed:4dee:cbe4:3c73:1918:ad9b";
midas = {
hostname = "sv.nixfox.ca";
};
kitty = {
hostname = "sv.nixfox.ca";
port = 2222;
};
prophet = {
hostname = "mx.nixfox.ca";
};
# Misc # Misc
seneca = { seneca = {

2
modules/system/devices/networking/mycelium/default.nix
View file

@ -1,5 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ ./ips ];
services.mycelium = { services.mycelium = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;

13
modules/system/devices/networking/mycelium/ips/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ config, lib, ... }:
{
options.services.mycelium.ips = lib.mkOption {
type = lib.types.attrs;
};
config.services.mycelium.ips = {
tower = "577:84d1:b682:9ac3:b987:b78e:33d9:2060";
midas = "538:e163:87ba:f847:3646:18b6:6b01:d8f8";
kitty = "2607:fea8:431d:cba5:37b6:92f8:5be:7c56";
prophet = "42f:2737:2aed:4dee:cbe4:3c73:1918:ad9b";
};
}

1
modules/system/services/general/ssh/fail2ban/default.nix
View file

@ -4,7 +4,6 @@
enable = true; enable = true;
maxretry = 5; maxretry = 5;
bantime = "10m"; bantime = "10m";
ignoreIP = [ "11.0.0.0/8" ];
}; };
environment.persistence."/persist".directories = [ "/var/lib/fail2ban" ]; environment.persistence."/persist".directories = [ "/var/lib/fail2ban" ];

4
modules/system/services/server/nfs/default.nix
View file

@ -4,6 +4,8 @@
config = lib.mkIf config.services.nfs.server.enable { config = lib.mkIf config.services.nfs.server.enable {
services.nfs.server.exports = "/storage *(rw)"; services.nfs.server.exports = "/storage *(rw)";
networking.firewall.extraInputRules = "ip saddr { 10.0.0.0/8, 11.0.0.0/8, ${config.secrets.ips.bun} } tcp dport 2049 accept"; networking.firewall.extraInputRules = with config.services.mycelium.ips; ''
ip6 saddr { ${tower}, ${midas}, ${kitty}, ${prophet} } tcp dport 2049 accept
'';
}; };
} }

5
modules/system/services/server/nginx/rtmp/default.nix
View file

@ -23,7 +23,10 @@
} }
''; '';
}; };
networking.firewall.extraInputRules = "ip saddr { 11.0.0.0/8, ${config.secrets.ips.luna}, ${config.secrets.ips.corn} } tcp dport 1935 accept"; networking.firewall.extraInputRules = with config.services.mycelium.ips; ''
ip6 saddr ${tower} tcp dport 1935 accept
ip saddr { ${config.secrets.ips.luna}, ${config.secrets.ips.corn} } tcp dport 1935 accept
'';
systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www/landing-page/streams/hls/" ]; systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www/landing-page/streams/hls/" ];
}; };
} }

4
modules/system/services/server/owncast/default.nix
View file

@ -7,7 +7,9 @@
port = 8060; port = 8060;
rtmp-port = 1945; rtmp-port = 1945;
}; };
networking.firewall.extraInputRules = "ip saddr 11.0.0.0/8 tcp dport 1945 accept"; networking.firewall.extraInputRules = ''
ip6 saddr ${tower} tcp dport 1935 accept
'';
environment.persistence."/persist".directories = [ "/var/lib/owncast" ]; environment.persistence."/persist".directories = [ "/var/lib/owncast" ];
}; };
} }