aboutsummaryrefslogtreecommitdiff
path: root/nixos/machine
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/machine')
-rw-r--r--nixos/machine/adm-mpd.nix11
-rw-r--r--nixos/machine/adm-omnia.nix1
-rw-r--r--nixos/machine/dean.nix9
-rw-r--r--nixos/machine/spt-mox.nix40
-rw-r--r--nixos/machine/spt-mox2.nix4
5 files changed, 49 insertions, 16 deletions
diff --git a/nixos/machine/adm-mpd.nix b/nixos/machine/adm-mpd.nix
index aa85445..45855e1 100644
--- a/nixos/machine/adm-mpd.nix
+++ b/nixos/machine/adm-mpd.nix
@@ -27,10 +27,15 @@ with lib;
userControlled.enable = true;
};
- services.pipewire = {
+ #services.pipewire = {
+ #enable = true;
+ #alsa.enable = true;
+ #pulse.enable = true;
+ #};
+ hardware.pulseaudio = {
enable = true;
- alsa.enable = true;
- pulse.enable = true;
+ systemWide = true;
+ zeroconf.publish.enable = true;
};
services.spotifyd = {
diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix
index 48af6fa..71104e9 100644
--- a/nixos/machine/adm-omnia.nix
+++ b/nixos/machine/adm-omnia.nix
@@ -8,7 +8,6 @@ with lib;
cynerd = {
#openvpn.oldpersonal = true;
};
- boot.kernelPackages = pkgs.linuxPackages;
networking = {
# TODO we need vlan filtering to filter out guest and adm network
diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
index f2d5459..aef3c04 100644
--- a/nixos/machine/dean.nix
+++ b/nixos/machine/dean.nix
@@ -11,15 +11,6 @@ with lib;
};
};
- #boot.kernelPatches = [{
- # name = "rwtm";
- # patch = null;
- # extraConfig = ''
- # TURRIS_MOX_RWTM y
- # ARMADA_37XX_RWTM_MBOX y
- # '';
- #}];
-
networking = {
bridges = {
brlan = {
diff --git a/nixos/machine/spt-mox.nix b/nixos/machine/spt-mox.nix
index bb0ac5e..84f610e 100644
--- a/nixos/machine/spt-mox.nix
+++ b/nixos/machine/spt-mox.nix
@@ -5,6 +5,43 @@ with lib;
{
config = {
+
+ boot.initrd.kernelModules = [
+ "armada_37xx_wdt"
+ "mv88e6xxx" "dsa_core" "tag_dsa" "bridge" "hsr"
+ ];
+
+ networking.wirelessAP = {
+ enable = true;
+ environmentFile = "/run/secrets/hostapd.env";
+ interfaces = {
+ #"mlan0" = {
+ #countryCode = "CZ";
+ #ssid = "TurrisRules";
+ #wpa = true;
+ #wpaPassphrase = "@PASS_TURRIS_RULES@";
+ #};
+ "wlp1s0" = {
+ countryCode = "CZ";
+ hwMode = "a";
+ channel = 40;
+ ieee80211ac = true;
+ ht_capab = ["HT40+" "LDPC" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "DSSS_CCK-40"];
+ vht_capab = ["RXLDPC" "SHORT-GI-80" "TX-STBC-2BY1" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7"];
+ ssid = "TurrisRules5";
+ wpa = true;
+ wpaPassphrase = "@PASS_TURRIS_RULES@";
+ bss = {
+ "wlp1s0host" = {
+ ssid = "KocoviGuest";
+ wpa = true;
+ wpaPassphrase = "@PASS_KOCOVI@";
+ };
+ };
+ };
+ };
+ };
+
networking = {
vlans = {
"eth0.2" = {
@@ -15,7 +52,7 @@ with lib;
bridges = {
brlan = {
interfaces = [
- "eth0" "lan1" "lan2" "lan3" "lan4"
+ "eth0" # "lan1" "lan2" "lan3" "lan4"
];
};
brguest = {
@@ -36,6 +73,7 @@ with lib;
nameservers = [ config.cynerd.hosts.spt.omnia "1.1.1.1" "8.8.8.8" ];
dhcpcd.allowInterfaces = [ "brlan" ];
};
+
};
}
diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix
index 65748fb..982cc50 100644
--- a/nixos/machine/spt-mox2.nix
+++ b/nixos/machine/spt-mox2.nix
@@ -61,12 +61,12 @@ with lib;
bridges = {
brlan = {
interfaces = [
- "eth0" #"mlan0" "wlp1s0"
+ "eth0" "wlp1s0" #"mlan0"
];
};
brguest = {
interfaces = [
- "eth0.2" #"mlan0host" "wlp1s0host"
+ "eth0.2" "wlp1s0host" #"mlan0host"
];
};
};