march sprint

6 files changed, 82 insertions, 13 deletions

diff --git a/flake.lock b/flake.lock
index 87bcbbb..ea444a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,28 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": [],
+        "home-manager": "home-manager",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703089996,
+        "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "564595d0ad4be7277e07fa63b5a991b3c645655d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "ref": "0.15.0",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -21,6 +44,27 @@
         "type": "github"
       }
     },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1682203081,
+        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -59,11 +103,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740126099,
-        "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=",
+        "lastModified": 1741513245,
+        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "32fb99ba93fea2798be0e997ea331dd78167f814",
+        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
         "type": "github"
       },
       "original": {
@@ -75,6 +119,7 @@
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
         "disko": "disko",
         "naersk": "naersk",
         "nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index 456d147..3cda153 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,10 @@
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
+    agenix.url = "github:ryantm/agenix/0.15.0";
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix.inputs.darwin.follows = "";
+
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     # Rust projects
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 ];
 }