b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

biolimo/chocolatebar: small networking reshuffling

Browse source
This commit is contained in:
Benjamin Bädorf 2024-01-29 23:03:27 +01:00
parent 6783226919
commit b029aea63a
No known key found for this signature in database
GPG key ID: 1B7BF5B77A521346
5 changed files with 39 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hosts/biolimo/configuration.nix
View file

@ -20,9 +20,6 @@ in {
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;
networking.hostName = "biolimo";
networking.networkmanager.wifi.backend = "wpa_supplicant";
home-manager.users."${psCfg.user.name}" = { home-manager.users."${psCfg.user.name}" = {
xdg.configFile = { xdg.configFile = {
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;

19
hosts/biolimo/networking.nix
View file

@ -5,15 +5,16 @@
lib, lib,
... ...
}: { }: {
config = { networking.hostName = "biolimo";
age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-biolimo.age"; networking.networkmanager.wifi.backend = "wpa_supplicant";
pub-solar.wireguard-client = { age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-biolimo.age";
ownIPs = [
"10.0.1.6/32" pub-solar.wireguard-client = {
"fd00:b12f:acab:1312:acab:6::/96" ownIPs = [
]; "10.0.1.6/32"
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; "fd00:b12f:acab:1312:acab:6::/96"
}; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
}; };
} }

2
hosts/chocolatebar/configuration.nix
View file

@ -28,8 +28,6 @@ in {
pub-solar.terminal-life.full = true; pub-solar.terminal-life.full = true;
networking.hostName = "chocolatebar";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
drone-docker-runner drone-docker-runner
stdenv.cc.cc.lib stdenv.cc.cc.lib

42
hosts/chocolatebar/factorio/default.nix
View file

@ -20,27 +20,25 @@ with lib; let
''; '';
}; };
in { in {
config = { services.factorio = {
services.factorio = { enable = true;
enable = true; port = 34197; # The default, but make it explicit
port = 34197; # The default, but make it explicit lan = true;
lan = true; game-password = "pls-dont-grief";
game-password = "pls-dont-grief"; admins = [
admins = [ "doubtwriter"
"doubtwriter" "kattykat"
"kattykat" ];
]; openFirewall = true;
openFirewall = true; autosave-interval = 3;
autosave-interval = 3; game-name = "Babes plays v2";
game-name = "Babes plays v2"; requireUserVerification = false;
requireUserVerification = false; bind = "::";
bind = "::"; mods = [
mods = [ far-reach
far-reach ];
];
};
networking.firewall.allowedUDPPorts = [ 34197 ];
networking.firewall.allowedTCPPorts = [ 34197 ];
}; };
networking.firewall.allowedUDPPorts = [ 34197 ];
networking.firewall.allowedTCPPorts = [ 34197 ];
} }

18
hosts/chocolatebar/networking.nix
View file

@ -5,15 +5,15 @@
lib, lib,
... ...
}: { }: {
config = { networking.hostName = "chocolatebar";
age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-chocolatebar.age";
pub-solar.wireguard-client = { age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-chocolatebar.age";
ownIPs = [
"10.0.1.5/32" pub-solar.wireguard-client = {
"fd00:b12f:acab:1312:acab:5::/96" ownIPs = [
]; "10.0.1.5/32"
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; "fd00:b12f:acab:1312:acab:5::/96"
}; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
}; };
} }