From a12b8ace7ef41aa0b51ae56557d5de1594991592 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sat, 11 Nov 2023 09:35:08 -0800
Subject: [PATCH] DNS, update font nomenclature

---
 nixos/common/fonts.nix          |  2 +-
 nixos/common/locale.nix         |  2 +-
 nixos/roles/graphical/dns.nix   | 17 +++++++++++++++++
 nixos/roles/graphical/fonts.nix |  9 +++++++--
 nixos/roles/graphical/gpg.nix   |  2 +-
 systems/goliath.nix             |  1 +
 6 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 nixos/roles/graphical/dns.nix

diff --git a/nixos/common/fonts.nix b/nixos/common/fonts.nix
index 122a3f3b..c449121d 100644
--- a/nixos/common/fonts.nix
+++ b/nixos/common/fonts.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   fonts = {
-    fonts = with pkgs; [
+    packages = with pkgs; [
       font-awesome
       twitter-color-emoji
       iosevka-bin
diff --git a/nixos/common/locale.nix b/nixos/common/locale.nix
index b556feb7..90d02122 100644
--- a/nixos/common/locale.nix
+++ b/nixos/common/locale.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  fonts.fonts = [
+  fonts.packages = [
     pkgs.tamzen
   ];
   i18n = {
diff --git a/nixos/roles/graphical/dns.nix b/nixos/roles/graphical/dns.nix
new file mode 100644
index 00000000..17d27271
--- /dev/null
+++ b/nixos/roles/graphical/dns.nix
@@ -0,0 +1,17 @@
+_: {
+  networking = {
+    nameservers = [
+      "194.242.2.2" # For now, Mullvad DNS.
+    ];
+  };
+  services.resolved = {
+    enable = true;
+    fallbackDns = [
+      "1.1.1.1"
+    ];
+    dnssec = "false";
+    extraConfig = ''
+      DNSOverTLS=yes
+    '';
+  };
+}
diff --git a/nixos/roles/graphical/fonts.nix b/nixos/roles/graphical/fonts.nix
index 8e9439d2..d4be138c 100644
--- a/nixos/roles/graphical/fonts.nix
+++ b/nixos/roles/graphical/fonts.nix
@@ -1,6 +1,11 @@
-_: {
+{pkgs, ...}: {
   fonts = {
-    enableDefaultFonts = true;
+    packages = with pkgs; [
+      font-awesome
+      twitter-color-emoji
+      iosevka-bin
+    ];
+    enableDefaultPackages = true;
     fontDir.enable = true;
     fontconfig = {
       enable = true;
diff --git a/nixos/roles/graphical/gpg.nix b/nixos/roles/graphical/gpg.nix
index 1628af12..6be42f20 100644
--- a/nixos/roles/graphical/gpg.nix
+++ b/nixos/roles/graphical/gpg.nix
@@ -5,6 +5,6 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-    pinentryFlavor = "gtk2";
+    pinentryFlavor = "qt";
   };
 }
diff --git a/systems/goliath.nix b/systems/goliath.nix
index a77fa92e..864534ee 100644
--- a/systems/goliath.nix
+++ b/systems/goliath.nix
@@ -19,6 +19,7 @@ _: let
       ])
       ++ (with tree.kat; [
         gui
+        kde
       ]);
 
     environment.systemPackages = with pkgs; [