Wireless Network Connectivity Working

This commit is contained in:
2024-01-01 13:57:35 -05:00
parent 750b4087de
commit 621f60599f
4 changed files with 24 additions and 14 deletions

View File

@@ -1,7 +1,12 @@
keys: keys:
- &hippocampus age1crymppz88etsdjpckmtdhr397x5xg5wv8jt6tcj23gt2snq73pzs04fuve - &hippocampus age1crymppz88etsdjpckmtdhr397x5xg5wv8jt6tcj23gt2snq73pzs04fuve
- &desktop age1p3958zac2e5t35dpdeysqxtc9q76zd6dyswg9y7uqt3688yphp9q6r2hdp
creation_rules: creation_rules:
- path_regex: machines/hippocampus/secrets/[^/]+\.(yaml|json|env|ini)$ - path_regex: machines/hippocampus/secrets/[^/]+\.(yaml|json|env|ini)$
key_groups: key_groups:
- age: - age:
- *hippocampus - *hippocampus
- path_regex: machines/universedesktop/secrets/[^/]+\.(yaml|json|env|ini)$
key_groups:
- age:
- *desktop

View File

@@ -57,6 +57,7 @@
nixpkgs.overlays = [ me-emacs-overlay ]; nixpkgs.overlays = [ me-emacs-overlay ];
}) })
./machines/universedesktop/configuration.nix ./machines/universedesktop/configuration.nix
sops-nix.nixosModules.sops
]; ];
}; };
darwinConfigurations."Universe-Air" = nix-darwin.lib.darwinSystem { darwinConfigurations."Universe-Air" = nix-darwin.lib.darwinSystem {

View File

@@ -13,6 +13,9 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
# Secrets specified via:
./secrets.nix
./programs/art.nix ./programs/art.nix
./programs/audio.nix ./programs/audio.nix
./programs/cad.nix ./programs/cad.nix
@@ -43,21 +46,14 @@
## Bridged Network Config ## Bridged Network Config
networking.hostName = "universedesktop"; networking.hostName = "universedesktop";
networking.useDHCP = false;
networking.bridges = { sops.secrets.wireless = { };
"br0" = { networking.wireless.environmentFile = config.sops.secrets.wireless.path;
interfaces = [ "enp9s0" ];
}; networking.wireless.enable = true;
networking.wireless.networks = {
"@SSID_HOME@".psk = "@PSK_HOME@";
}; };
networking.interfaces.br0.ipv4.addresses = [
{
address = "192.168.1.21";
prefixLength = 24;
}
];
networking.defaultGateway = "192.168.1.1";
networking.nameservers = [ "192.168.1.1" ];
networking.interfaces.tap0.virtual = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;

View File

@@ -0,0 +1,8 @@
{config, pkgs, ...}: let
in {
sops = {
age.keyFile = "/root/.config/sops/age/keys.txt";
defaultSopsFile = "/etc/nixos/machines/universedesktop/secrets/secrets.yaml";
validateSopsFiles = false;
};
}