early feb sprint

4 files changed, 41 insertions, 37 deletions

diff --git a/machines/xnet/default.nix b/machines/xnet/default.nix
index 808bebc..455be0b 100644
--- a/machines/xnet/default.nix
+++ b/machines/xnet/default.nix
@@ -73,6 +73,8 @@ in
       extraConfig = "Defaults lecture = never";
     };
 
+    nixpkgs.config.allowUnfree = true;
+
     programs.ssh = {
       knownHosts = {
         "github.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
diff --git a/machines/xnet/desktop/default.nix b/machines/xnet/desktop/default.nix
index 0063a66..04a1250 100644
--- a/machines/xnet/desktop/default.nix
+++ b/machines/xnet/desktop/default.nix
@@ -65,10 +65,11 @@ in
 
     fonts.packages = with pkgs; [
       departure-mono
+      iosevka
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+      nerd-fonts.symbols-only
       terminus_font
     ];
 
@@ -80,6 +81,8 @@ in
       ];
     };
 
+    environment.systemPackages = [ pkgs.man-pages pkgs.man-pages-posix ];
+
     programs = {
       fish = {
         enable = true;
@@ -120,16 +123,17 @@ in
       yubikey-agent.enable = true;
       pcscd.enable = true;
       udev.packages = with pkgs; [ yubikey-personalization ];
+      udisks2.enable = true;
     };
 
-    services.udisks2.enable = true;
-
     programs.firefox = {
       enable = true;
       preferences = {
         # Enable hardware transcoding
         "media.ffmpeg.vaapi.enabled" = true;
 
+        # Disable controlling media with keyboard
+        "media.hardwaremediakeys.enabled" = false;
         # Enable legacy compact mode
         "browser.compactmode.show" = true;
         "browser.uidensity" = 1;
diff --git a/machines/xnet/net/dns.nix b/machines/xnet/net/dns.nix
index 579d6aa..186e43c 100644
--- a/machines/xnet/net/dns.nix
+++ b/machines/xnet/net/dns.nix
@@ -1,39 +1,37 @@
-{ ... }: {
-  services.resolved.enable = false;
+{ lib, ... }:
+let
+  inherit (lib)
+    mkDefault
+    ;
 
-  services.unbound = {
-    enable = true;
-    settings.server = {
-      interface = [ "127.0.0.1" ];
-      access-control = [
-        "0.0.0.0/0 refuse"
-        "127.0.0.0/8 allow"
-      ];
-
-      private-domain = [ ];
-      private-address = [ ];
+  quad9 = [
+    "9.9.9.9#dns.quad9.net"
+    "149.112.112.112#dns.quad9.net"
+    "2620:fe::fe#dns.quad9.net"
+    "2620:fe::9#dns.quad9.net"
+  ];
 
-      harden-glue = true;
-      harden-dnssec-stripped = true;
-      use-caps-for-id = false;
-      prefetch = true;
-      edns-buffer-size = 1232;
-      hide-identity = true;
-      hide-version = true;
-      tls-system-cert = true;
-    };
+  cloudflare = [
+    "1.1.1.1#one.one.one.one"
+    "1.0.0.1#one.one.one.one"
+    "2606:4700:4700::1111#one.one.one.one"
+    "2606:4700:4700::1001#one.one.one.one"
+  ];
+in
+{
 
-    settings.forward-zone = [{
-      name = ".";
-      forward-tls-upstream = true;
-      forward-addr = [
-        "9.9.9.9#dns.quad9.net"
-        "149.112.112.112#dns.quad9.net"
-      ];
-    }];
-  };
+  networking.nameservers = mkDefault [
+    "9.9.9.9#dns.quad9.net"
+    "149.112.112.112#dns.quad9.net"
+    "2620:fe::fe#dns.quad9.net"
+    "2620:fe::9#dns.quad9.net"
+  ];
 
-  networking = {
-    nameservers = [ "::1" ];
+  services.resolved = {
+    enable = true;
+    llmnr = "true";
+    dnssec = "false";
+    dnsovertls = mkDefault "opportunistic";
+    fallbackDns = quad9 ++ cloudflare;
   };
 }
diff --git a/machines/xnet/persist.nix b/machines/xnet/persist.nix
index 0ace84f..10eb883 100644
--- a/machines/xnet/persist.nix
+++ b/machines/xnet/persist.nix
@@ -50,7 +50,7 @@ in
           mode = if isString entry then "-" else entry.mode;
 
           dent = "d /persist${path} ${mode} ${user} ${group} - -";
-          link = "L ${path} - - - - /persist${path}";
+          link = "L+ ${path} - - - - /persist${path}";
           perm = "Z ${mode} ${user} ${group} - -";
         in
         [ dent link perm ];