qenya/nixfiles
1
0
Fork 0
Code Issues 4 Pull requests Actions Activity

Compare commits

base: qenya:4dbe61e97ac24c850219e8a705b979924bd5b43f
Branches Tags
qenya:main
qenya:flakes
qenya:lix
qenya:multihost
..
compare: qenya:d7142d8619e4dd41c1a8bd43c663df76d26b74c3
Branches Tags
qenya:main
qenya:flakes
qenya:lix
qenya:multihost

No commits in common. "4dbe61e97ac24c850219e8a705b979924bd5b43f" and "d7142d8619e4dd41c1a8bd43c663df76d26b74c3" have entirely different histories.
4dbe61e97a ... d7142d8619

2 changed files with 12 additions and 51 deletions
Show stats Expand all files Collapse all files

33
common/base-graphical/desktop.nix
View file

@ -1,8 +1,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
inherit (lib) mkIf mkMerge mkOption types; inherit (lib) mkIf mkOption types;
cfg = config.qenya.base-graphical; cfg = config.qenya.base-graphical;
isGnome = cfg.desktop == "gnome";
isPlasma6 = cfg.desktop == "plasma6";
in in
{ {
options.qenya.base-graphical.desktop = mkOption { options.qenya.base-graphical.desktop = mkOption {
@ -12,24 +15,12 @@ in
description = "Which display manager and desktop manager to use."; description = "Which display manager and desktop manager to use.";
}; };
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable {
(mkIf (cfg.desktop == "gnome") { services.xserver.displayManager.gdm.enable = isGnome;
services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = isGnome;
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 services.displayManager.sddm.enable = isPlasma6;
# environment.gnome.excludePackages = with pkgs.gnome; [ services.displayManager.sddm.wayland.enable = isPlasma6;
# pkgs.gnome-tour services.desktopManager.plasma6.enable = isPlasma6;
# epiphany # GNOME Web };
# geary
# gnome-calendar
# gnome-contacts
# gnome-music
# ];
})
(mkIf (cfg.desktop == "plasma6") {
services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true;
services.desktopManager.plasma6.enable = true;
})
]);
} }

30
hosts/yevaud/default.nix
View file

@ -22,36 +22,6 @@
privateKeyFile = config.age.secrets.wireguard-peer-yevaud.path; privateKeyFile = config.age.secrets.wireguard-peer-yevaud.path;
}; };
services.bind = {
# enable = true;
cacheNetworks = [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];
forwarders = [ ];
listenOn = [ config.birdsong.hosts.yevaud.ipv4 ];
listenOnIpv6 = [ config.birdsong.hosts.yevaud.ipv6 ];
zones = {
"birdsong.internal" = {
master = true;
# TODO: pick better email address for SOA record
file = pkgs.writeText "birdsong.internal.zone" ''
$TTL 60
$ORIGIN birdsong.internal.
birdsong.internal. IN SOA ns.birdsong.internal. accounts.katherina.rocks. ( 2024080401 7200 3600 1209600 3600 )
birdsong.internal. IN NS ns.birdsong.internal.
yevaud.c.birdsong.internal. IN A 10.127.1.1
yevaud.c.birdsong.internal. IN AAAA fd70:81ca:0f8f:1::1
ns.birdsong.internal. IN A 10.127.1.1
ns.birdsong.internal. IN AAAA fd70:81ca:0f8f:1::1
'';
};
};
};
networking.resolvconf.useLocalResolver = false;
networking.firewall.allowedTCPPorts = [ 53 ];
networking.firewall.allowedUDPPorts = [ 53 ];
qenya.services.forgejo = { qenya.services.forgejo = {
enable = true; enable = true;
domain = "git.qenya.tel"; domain = "git.qenya.tel";