Compare commits

...

3 commits

Author SHA1 Message Date
fd99cbd41f treewide: Update option keys for GNOME/GDM 2025-12-06 14:55:32 +00:00
297d0083d8 headscale: Disable new dns.override_local_dns option
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
2025-12-06 14:54:41 +00:00
3b54ad983d actual: Revert version override as we are now on 25.11 2025-12-06 14:03:29 +00:00
6 changed files with 7 additions and 10 deletions

View file

@ -6,8 +6,8 @@ let
in in
{ {
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.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 # 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; [ # environment.gnome.excludePackages = with pkgs.gnome; [
# pkgs.gnome-tour # pkgs.gnome-tour

View file

@ -3,7 +3,7 @@
# dconf is the configuration manager for GNOME. # dconf is the configuration manager for GNOME.
let let
isGnome = osConfig.services.xserver.desktopManager.gnome.enable; isGnome = osConfig.services.desktopManager.gnome.enable;
in in
{ {
dconf.enable = isGnome; dconf.enable = isGnome;

View file

@ -3,7 +3,7 @@
let let
inherit (lib) optionals; inherit (lib) optionals;
isGraphical = osConfig.services.xserver.enable; isGraphical = osConfig.services.xserver.enable;
isGnome = osConfig.services.xserver.desktopManager.gnome.enable; isGnome = osConfig.services.desktopManager.gnome.enable;
isPlasma = osConfig.services.desktopManager.plasma6.enable; isPlasma = osConfig.services.desktopManager.plasma6.enable;
in in
{ {

View file

@ -4,8 +4,8 @@ let
inherit (lib) mkForce; inherit (lib) mkForce;
in in
{ {
services.xserver.displayManager.gdm.enable = mkForce false; services.displayManager.gdm.enable = mkForce false;
services.xserver.desktopManager.gnome.enable = mkForce false; services.desktopManager.gnome.enable = mkForce false;
services.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;

View file

@ -18,10 +18,6 @@ in
services.actual = { services.actual = {
enable = true; 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; settings.port = 5006;
}; };
}; };

View file

@ -29,6 +29,7 @@ in
dns = { dns = {
magic_dns = true; magic_dns = true;
base_domain = "birdsong.network"; base_domain = "birdsong.network";
override_local_dns = false;
}; };
# disable built-in ACME client # disable built-in ACME client