biolimo/chocolatebar: small networking reshuffling

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

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;

View file

@ -5,7 +5,9 @@
lib, lib,
... ...
}: { }: {
config = { networking.hostName = "biolimo";
networking.networkmanager.wifi.backend = "wpa_supplicant";
age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-biolimo.age"; age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-biolimo.age";
pub-solar.wireguard-client = { pub-solar.wireguard-client = {
@ -15,5 +17,4 @@
]; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
}; };
};
} }

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

View file

@ -20,7 +20,6 @@ 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
@ -42,5 +41,4 @@ in {
networking.firewall.allowedUDPPorts = [ 34197 ]; networking.firewall.allowedUDPPorts = [ 34197 ];
networking.firewall.allowedTCPPorts = [ 34197 ]; networking.firewall.allowedTCPPorts = [ 34197 ];
};
} }

View file

@ -5,7 +5,8 @@
lib, lib,
... ...
}: { }: {
config = { networking.hostName = "chocolatebar";
age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-chocolatebar.age"; age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-chocolatebar.age";
pub-solar.wireguard-client = { pub-solar.wireguard-client = {
@ -15,5 +16,4 @@
]; ];
wireguardPrivateKeyFile = "/run/agenix/wg-private-key"; wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
}; };
};
} }