Cleanups

configs/desktop-packages-full.nix

@@ -37,7 +37,7 @@
     veracrypt
     via
     vlc
-    xorg.libX11
+    libx11
 
     # jetbrains
     # jetbrains-toolbox

configs/desktop-packages-light.nix

@@ -1,7 +1,7 @@
 # Core desktop packages for lightweight desktop systems.
 
 { pkgs, inputs, ... }:
-let system = pkgs.system; in
+let system = pkgs.stdenv.hostPlatform.system; in
 
 {
   environment.systemPackages = with pkgs; [
@@ -75,10 +75,10 @@ let system = pkgs.system; in
     vim
     wirelesstools
     xclip
-    xfce.thunar
-    xfce.thunar-volman
-    xfce.tumbler
-    xfce.xfce4-power-manager
+    thunar
+    thunar-volman
+    tumbler
+    xfce4-power-manager
     xss-lock
     yubikey-agent
     yubikey-manager

configuration.nix

@@ -42,7 +42,7 @@
   # networking.hostName = "imladris"; # Define your hostname.
   networking.networkmanager.enable = true;
   services.resolved.enable = true;
-  services.resolved.fallbackDns = [
+  services.resolved.settings.Resolve.FallbackDNS = [
     "1.1.1.1"
     "8.8.8.8"
   ];

hw/orion/default.nix

@@ -19,6 +19,6 @@
 
     # DNS: MCNS for internal zones, public resolvers as fallback.
     networking.nameservers = [ "192.168.88.181" "100.95.252.120" "1.1.1.1" "8.8.8.8" ];
-    services.resolved.domains = [ "~mcp.metacircular.net" ];
+    services.resolved.settings.Resolve.Domains = [ "~mcp.metacircular.net" ];
   };
 }

hw/rift/default.nix

@@ -24,6 +24,6 @@
 
     # DNS: MCNS for internal zones, public resolvers as fallback.
     networking.nameservers = [ "192.168.88.181" "1.1.1.1" "8.8.8.8" ];
-    services.resolved.domains = [ "~mcp.metacircular.net" ];
+    services.resolved.settings.Resolve.Domains = [ "~mcp.metacircular.net" ];
   };
 }

hw/straylight/default.nix

@@ -1,6 +1,6 @@
 { inputs, pkgs, lib, ... }:
 let
-  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
   # Pin to b9828; nixpkgs-unstable lags too far behind for the features we need.
   # To update: nix-prefetch-url --unpack https://github.com/ggml-org/llama.cpp/archive/refs/tags/bNNNN.tar.gz
   # then: nix run nixpkgs#prefetch-npm-deps -- <unpacked>/tools/ui/package-lock.json
@@ -141,7 +141,7 @@ in
       "1.1.1.1"
       "8.8.8.8"
     ];
-    services.resolved.domains = [
+    services.resolved.settings.Resolve.Domains = [
       "~mcp.metacircular.net"
     ];
   };

hw/vade/default.nix

@@ -55,7 +55,7 @@
     "1.1.1.1"           # Cloudflare (fallback)
     "8.8.8.8"           # Google (fallback)
   ];
-  services.resolved.domains = [
+  services.resolved.settings.Resolve.Domains = [
     "~mcp.metacircular.net"
   ];