2024-10-21

2 files changed, 11 insertions, 15 deletions

diff --git a/modules/common/networking.nix b/modules/common/networking.nix
index 2867825..1f0f97a 100644
--- a/modules/common/networking.nix
+++ b/modules/common/networking.nix
@@ -108,6 +108,13 @@ in
       })
     ];
 
+    services.resolved = {
+      llmnr = "false";
+      dnsovertls = "opportunistic";
+      fallbackDns = dns.const.quad9.default;
+      domains = [ my.domain.shire ];
+    };
+
     environment = {
       shellAliases = listToAttrs (
         map ({ name, value }: nameValuePair name "${pkgs.iproute2}/bin/${value}") [
diff --git a/modules/common/systemd.nix b/modules/common/systemd.nix
index e058ad8..f832518 100644
--- a/modules/common/systemd.nix
+++ b/modules/common/systemd.nix
@@ -1,10 +1,7 @@
 {
   config,
-  pkgs,
-  lib,
   ...
 }:
-with lib;
 {
   ark = {
     files = [ "/etc/machine-id" ];
@@ -22,17 +19,9 @@ with lib;
     };
   };
 
-  services = {
-    resolved = {
-      llmnr = "false";
-      dnsovertls = "opportunistic";
-      fallbackDns = dns.const.quad9.default;
-    };
-
-    journald.extraConfig = ''
-      SystemMaxUse=5G
-    '';
-  };
+  services.journald.extraConfig = ''
+    SystemMaxUse=5G
+  '';
 
   systemd =
     let
@@ -50,7 +39,7 @@ with lib;
 
   environment.variables = {
     SYSTEMD_PAGERSECURE = "1";
-    SYSTEMD_PAGER = "${pkgs.less}/bin/less";
+    SYSTEMD_PAGER = "less";
     SYSTEMD_LESS = "FRSXMK";
   };
 }