Merge remote-tracking branch 'origin/copy-blueprint'

1 files changed, 4 insertions, 34 deletions

diff --git a/machines/t480/default.nix b/machines/t480/default.nix
index e726670..24b6bc6 100644
--- a/machines/t480/default.nix
+++ b/machines/t480/default.nix
@@ -1,12 +1,10 @@
-{ inputs, depot, ... }:
+{ inputs, flake, perSystem, pkgs, ... }:
 let
   inherit (inputs.nixos-hardware.nixosModules)
     lenovo-thinkpad-t480
     ;
 
-  inherit (depot.users)
-    kle
-    ;
+  inherit (import flake.outputs.nixosModules.users { inherit perSystem pkgs; }) kle;
 in
 {
   imports = [
@@ -23,16 +21,15 @@ in
     };
   };
 
-  users.users.kle = kle.nixos;
+  users.users.kle = kle;
 
   networking = {
     hostName = "t480";
     useDHCP = false;
     dhcpcd.enable = false;
-    nameservers = [ "127.0.0.1" ];
     networkmanager = {
       enable = true;
-      dns = "none";
+      # dns = "none";
       wifi.powersave = true;
     };
   };
@@ -40,32 +37,5 @@ in
   programs.nm-applet.enable = true;
   services.fwupd.enable = true;
 
-  services.unbound = {
-    enable = true;
-    settings.server = {
-      interface = [ "127.0.0.1" ];
-      port = 53;
-      access-control = [ "127.0.0.1 allow" ];
-      harden-glue = true;
-      harden-dnssec-stripped = true;
-      use-caps-for-id = false;
-      prefetch = true;
-      edns-buffer-size = 1232;
-      hide-identity = true;
-      hide-version = true;
-    };
-
-    settings.forward-zone = [
-      {
-        name = ".";
-        forward-tls-upstream = true;
-        forward-addr = [
-          "9.9.9.9#dns.quad9.net"
-          "149.112.112.112#dns.quad9.net"
-        ];
-      }
-    ];
-  };
-
   xnet.persist = [ "/etc/NetworkManager/system-connections" ];
 }