From 3b54ad983d86686ede1c94910f2deb31b24699c1 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sat, 6 Dec 2025 14:03:29 +0000
Subject: [PATCH 1/3] actual: Revert version override as we are now on 25.11

---
 services/qenya/actual.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/services/qenya/actual.nix b/services/qenya/actual.nix
index 35ce443..aeec9ff 100644
--- a/services/qenya/actual.nix
+++ b/services/qenya/actual.nix
@@ -18,10 +18,6 @@ in
 
     services.actual = {
       enable = true;
-      # nixos 25.05 is on actual-server 25.6.1 which contains an annoying bug
-      # nixpkgs maintainers declined to backport a newer version, so get this from unstable for now
-      # ref. https://github.com/NixOS/nixpkgs/issues/423541
-      package = (import inputs.nixpkgs-unstable-small { system = "x86_64-linux"; }).actual-server;
       settings.port = 5006;
     };
   };

From 297d0083d85d72daa73e653dfbd7ae32e76275d9 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sat, 6 Dec 2025 14:54:41 +0000
Subject: [PATCH 2/3] headscale: Disable new dns.override_local_dns option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some reason this was enabled by default in 0.26.0 even though it
breaks existing configurations. ¯\_(ツ)_/¯
https://github.com/juanfont/headscale/pull/2438
---
 services/qenya/headscale.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/qenya/headscale.nix b/services/qenya/headscale.nix
index 84833fa..c4609f9 100644
--- a/services/qenya/headscale.nix
+++ b/services/qenya/headscale.nix
@@ -29,6 +29,7 @@ in
         dns = {
           magic_dns = true;
           base_domain = "birdsong.network";
+          override_local_dns = false;
         };
 
         # disable built-in ACME client

From fd99cbd41fd652d39d0fcc45ff551099ddde2dfc Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sat, 6 Dec 2025 14:55:32 +0000
Subject: [PATCH 3/3] treewide: Update option keys for GNOME/GDM

---
 common/base-graphical/gnome.nix | 4 ++--
 home/qenya/dconf/default.nix    | 2 +-
 home/qenya/packages.nix         | 2 +-
 hosts/kilgharrah/plasma.nix     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/base-graphical/gnome.nix b/common/base-graphical/gnome.nix
index 1d077de..819ea1c 100644
--- a/common/base-graphical/gnome.nix
+++ b/common/base-graphical/gnome.nix
@@ -6,8 +6,8 @@ let
 in
 {
   config = mkIf cfg.enable {
-    services.xserver.displayManager.gdm.enable = true;
-    services.xserver.desktopManager.gnome.enable = true;
+    services.displayManager.gdm.enable = true;
+    services.desktopManager.gnome.enable = true;
     # TODO: agree on this with randomcat as it affects her too, since for some reason this is system-wide
     # environment.gnome.excludePackages = with pkgs.gnome; [
     #   pkgs.gnome-tour
diff --git a/home/qenya/dconf/default.nix b/home/qenya/dconf/default.nix
index 0fe64e5..466ff5b 100644
--- a/home/qenya/dconf/default.nix
+++ b/home/qenya/dconf/default.nix
@@ -3,7 +3,7 @@
 # dconf is the configuration manager for GNOME.
 
 let
-  isGnome = osConfig.services.xserver.desktopManager.gnome.enable;
+  isGnome = osConfig.services.desktopManager.gnome.enable;
 in
 {
   dconf.enable = isGnome;
diff --git a/home/qenya/packages.nix b/home/qenya/packages.nix
index 2d91cc9..acc7183 100644
--- a/home/qenya/packages.nix
+++ b/home/qenya/packages.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) optionals;
   isGraphical = osConfig.services.xserver.enable;
-  isGnome = osConfig.services.xserver.desktopManager.gnome.enable;
+  isGnome = osConfig.services.desktopManager.gnome.enable;
   isPlasma = osConfig.services.desktopManager.plasma6.enable;
 in
 {
diff --git a/hosts/kilgharrah/plasma.nix b/hosts/kilgharrah/plasma.nix
index dba5270..9913dad 100644
--- a/hosts/kilgharrah/plasma.nix
+++ b/hosts/kilgharrah/plasma.nix
@@ -4,8 +4,8 @@ let
   inherit (lib) mkForce;
 in
 {
-  services.xserver.displayManager.gdm.enable = mkForce false;
-  services.xserver.desktopManager.gnome.enable = mkForce false;
+  services.displayManager.gdm.enable = mkForce false;
+  services.desktopManager.gnome.enable = mkForce false;
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;