4 files changed, 30 insertions, 10 deletions
diff --git a/machines/xnet/default.nix b/machines/xnet/default.nix
index 455be0b..9d224cf 100644
--- a/machines/xnet/default.nix
+++ b/machines/xnet/default.nix
@@ -42,6 +42,8 @@ in
     i18n.defaultLocale = mkDefault "en_US.UTF-8";
     time.timeZone = mkDefault "America/Toronto";
 
+    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
     nix = {
       settings = {
         auto-optimise-store = true;
diff --git a/machines/xnet/desktop/default.nix b/machines/xnet/desktop/default.nix
index 04a1250..995381f 100644
--- a/machines/xnet/desktop/default.nix
+++ b/machines/xnet/desktop/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   cfg = config.xnet.desktop;
-  inherit (lib) mkDefault mkOption mkIf types;
+  inherit (lib) mkDefault mkOption mkForce mkIf types;
   inherit (builtins) listToAttrs;
 in
 {
@@ -18,8 +18,17 @@ in
     services.pipewire = {
       enable = true;
       pulse.enable = true;
-      alsa = {
-        enable = true;
+      alsa.enable = true;
+    };
+
+    systemd.user.services.waybar = {
+      enable = true;
+      after = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.waybar}/bin/waybar";
+        Type = "simple";
       };
     };
 
@@ -36,6 +45,7 @@ in
         imv
         mako
         mpv
+        niri
         playerctl
         pop-icon-theme
         pwvucontrol
@@ -81,6 +91,10 @@ in
       ];
     };
 
+    environment.etc."xdg/user-dirs.defaults".text = ''
+      DOWNLOAD=/tmp/downloads
+    '';
+
     environment.systemPackages = [ pkgs.man-pages pkgs.man-pages-posix ];
 
     programs = {
diff --git a/machines/xnet/net/default.nix b/machines/xnet/net/default.nix
index 8258ea6..7242855 100644
--- a/machines/xnet/net/default.nix
+++ b/machines/xnet/net/default.nix
@@ -100,6 +100,9 @@ in
 
             # Network is up when xnet physical interface gets carrier
             linkConfig.RequiredForOnline = "carrier";
+
+            # Allow resolved to resolve mDNS
+            networkConfig.MulticastDNS = true;
           };
 
           networks."${toString networks.${net}.vlan}-${net}" = {
diff --git a/machines/xnet/net/dns.nix b/machines/xnet/net/dns.nix
index 186e43c..0632fa9 100644
--- a/machines/xnet/net/dns.nix
+++ b/machines/xnet/net/dns.nix
@@ -20,18 +20,19 @@ let
 in
 {
 
-  networking.nameservers = mkDefault [
-    "9.9.9.9#dns.quad9.net"
-    "149.112.112.112#dns.quad9.net"
-    "2620:fe::fe#dns.quad9.net"
-    "2620:fe::9#dns.quad9.net"
-  ];
+  networking.nameservers = mkDefault quad9;
 
   services.resolved = {
     enable = true;
-    llmnr = "true";
+    llmnr = "false";
     dnssec = "false";
     dnsovertls = mkDefault "opportunistic";
     fallbackDns = quad9 ++ cloudflare;
+    extraConfig = ''
+      MulticastDNS=yes
+    '';
   };
+
+  # Allow mDNS resolution
+  networking.firewall.allowedTCPPorts = [ 5353 ];
 }