Compare commits

..

No commits in common. "fd99cbd41fd652d39d0fcc45ff551099ddde2dfc" and "33fae52e472ef5c4b8cf36a498796199d333aa01" have entirely different histories.

6 changed files with 10 additions and 7 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -18,6 +18,10 @@ 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;
};
};

View file

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