flake.lock

@@ -24,11 +24,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1742098834,
+        "lastModified": 1741663108,
-        "narHash": "sha256-l98XVpNXW6hr0AsxCeQZbdf6EGT8OpHdkWBi7sdel4s=",
+        "narHash": "sha256-9RaZ3HuOptioE94IQ/nnzC2x5cMaRi6NX8d8ZOqhJ68=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "8457960249bcfd34c22838e20eaa7d8261428688",
+        "rev": "4264de082e92e7d7ba7fa2ad5b5b1a8818b5d048",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742069588,
+        "lastModified": 1741851582,
-        "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
+        "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
+        "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
         "type": "github"
       },
       "original": {

hosts/linux/shared.nix

@@ -68,12 +68,7 @@
     # we'll use geolocation via the Arch Linux API key.
     geoclue2 = {
       enable = true;
-      geoProviderUrl = "https://api.beacondb.net/v1/geolocate";
+      geoProviderUrl = "https://www.googleapis.com/geolocation/v1/geolocate?key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM";
-
-      # Let's be generous :)
-      submitData = true;
-      submissionUrl = "https://api.beacondb.net/v2/geosubmit";
-      submissionNick = "geoclue";
     };
   };
 

hosts/linux/spotlights-macbook-air/configuration.nix

@@ -17,12 +17,6 @@
     efi.canTouchEfiVariables = false;
   };
 
-  # Allow GNOME to dynamically set the
-  # time zone based on current location.
-  #
-  # https://www.reddit.com/r/NixOS/comments/1411gjs/comment/jo4wau3/
-  time.timeZone = lib.mkForce null;
-
   # Asahi Linux support
   hardware.asahi = {
     peripheralFirmwareDirectory = /boot/asahi;
@@ -38,9 +32,6 @@
       enable = true;
       settings.General.EnableNetworkConfiguration = true;
     };
-
-    # Necessary for WireGuard
-    firewall.checkReversePath = false;
   };
 
   nixpkgs.overlays = [
@@ -66,15 +57,19 @@
         '';
       });
 
-      # muvm requires a few custom flags for libkrun.
+      # muvm requires a few things for libkrun.
-      # Additionally, we override the upstream version of
-      # `virglrenderer` to use separate other flags.
-      #
-      # This could also be accomplished with overriding inputs,
-      # but as we control the actual source, this is easier.
       libkrun = prev.callPackage ./libkrun/package.nix { };
 
-      # Derived from https://github.com/NixOS/nixpkgs/pull/347792
+      # https://github.com/NixOS/nixpkgs/pull/347792#issuecomment-2667343848
+      virglrenderer = prev.virglrenderer.overrideAttrs (old: {
+        src = final.fetchurl {
+          url = "https://gitlab.freedesktop.org/asahi/virglrenderer/-/archive/asahi-20241205.2/virglrenderer-asahi-20241205.2.tar.bz2";
+          hash = "sha256-mESFaB//RThS5Uts8dCRExfxT5DQ+QQgTDWBoQppU7U=";
+        };
+        mesonFlags = old.mesonFlags ++ [ (final.lib.mesonOption "drm-renderers" "asahi-experimental") ];
+      });
+
+      # https://github.com/NixOS/nixpkgs/pull/347792
       muvm = prev.callPackage ./muvm/package.nix { };
     })
   ];
@@ -98,16 +93,10 @@
     };
   };
 
-  # Docker
   users.users.spotlight.extraGroups = [ "docker" ];
   virtualisation.docker.enable = true;
 
-  services = {
+  services.syncthing.enable = true;
-    # iOS tethering, etc
-    usbmuxd.enable = true;
-
-    syncthing.enable = true;
-  };
 
   environment.systemPackages = with pkgs; [
     # For usage with FEXRootFSFetcher
@@ -116,7 +105,6 @@
     legcord
     muvm
     vscode
-wireguard-tools
   ];
 
   # :(

hosts/linux/spotlights-macbook-air/libkrun/package.nix

@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, fetchurl
 , fetchFromGitHub
 , rustPlatform
 , cargo
@@ -58,17 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals withGpu [
       libepoxy
       libdrm
-      # We want to override the virglrenderer input.
+      virglrenderer
-      # (Overriding for all of nixpkgs means that QEMU is repeatedly rebuilt.)
-      # https://github.com/NixOS/nixpkgs/pull/347792#issuecomment-2667343848
-      (virglrenderer.overrideAttrs
-        (old: {
-          src = fetchurl {
-            url = "https://gitlab.freedesktop.org/asahi/virglrenderer/-/archive/asahi-20241205.2/virglrenderer-asahi-20241205.2.tar.bz2";
-            hash = "sha256-mESFaB//RThS5Uts8dCRExfxT5DQ+QQgTDWBoQppU7U=";
-          };
-          mesonFlags = old.mesonFlags ++ [ (lib.mesonOption "drm-renderers" "asahi-experimental") ];
-        }))
     ]
     ++ lib.optional withSound pipewire
     ++ lib.optional sevVariant openssl;