From a11655b2ca439a5049b5623154ef62e50da1b870 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Tue, 22 Aug 2023 19:59:05 -0400
Subject: fixes

---
 machines/dragon.nix | 7 ++++++-
 modules/router.nix  | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/machines/dragon.nix b/machines/dragon.nix
index 55be481..7c2a4bd 100644
--- a/machines/dragon.nix
+++ b/machines/dragon.nix
@@ -131,13 +131,18 @@ in {
       "noatime,discard"
     ];
   };
-  fileSystems."/storage" = {
+  fileSystems."/mnt/storage-old" = {
     device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3";
     fsType = "btrfs";
     options = [
       "subvol=storage,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKHV0LS-part3,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3,noatime,discard"
     ];
   };
+  fileSystems."/storage" = {
+    device = "/dev/disk/by-label/storage-ssd";
+    fsType = "btrfs";
+    options = ["discard=async"];
+  };
   fileSystems."/home" = {
     device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3";
     fsType = "btrfs";
diff --git a/modules/router.nix b/modules/router.nix
index 313e4a2..a5ab637 100644
--- a/modules/router.nix
+++ b/modules/router.nix
@@ -321,8 +321,6 @@ in {
       enable = true;
       configFile = "/opt/secret/he-ddclient.conf";
     };
-    # FIXME: Workaround for ddclient.conf not being available to ddclient.
-    systemd.services.ddclient.serviceConfig.DynamicUser = lib.mkForce false;
 
     systemd.timers.update-dynamic-dns = {
       wantedBy = ["multi-user.target"];
-- 
cgit v1.2.3