nix
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some corrections for clunk...

This commit is contained in:
Niten 2021-02-27 00:03:49 -06:00
parent 3d4fb6c336
commit 1486aaefee
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/hardware/clunk.nix
View File

@ -30,7 +30,7 @@
"/" = { "/" = {
device = "/dev/disk/by-label/root"; device = "/dev/disk/by-label/root";
fsType = "ext4"; fsType = "btrfs";
}; };
}; };

8
config/hosts/clunk.nix
View File

@ -9,8 +9,12 @@ let
in { in {
fudo.local-network = let fudo.local-network = let
site-name = config.fudo.hosts.${config.instance.hostname}.site; host-config = config.fudo.hosts.${config.instance.hostname};
site-name = host-config.site;
site = config.fudo.sites.${site-name}; site = config.fudo.sites.${site-name};
domain-name = host-config.domain;
domain = config.fudo.domains.${domain-name};
in { in {
# FIXME: think about this -- actual network config? # FIXME: think about this -- actual network config?
enable = true; enable = true;
@ -27,6 +31,8 @@ in {
domain = "rus.selby.ca"; domain = "rus.selby.ca";
network = site.network; network = site.network;
dhcp-dynamic-network = site.dynamic-network; dhcp-dynamic-network = site.dynamic-network;
hosts = domain.hosts;
}; };
networking = { networking = {

29
fudo/sites/russell.nix
View File

@ -16,23 +16,21 @@ in {
config = mkIf (config.fudo.common.site == "russell") { config = mkIf (config.fudo.common.site == "russell") {
time.timeZone = "America/Winnipeg"; time.timeZone = "America/Winnipeg";
services.cron = { services.cron = { mailto = admin; };
mailto = admin;
};
networking = { networking = {
domain = "rus.selby.ca"; domain = "rus.selby.ca";
search = [local-domain "fudo.org" "selby.ca"]; search = [ local-domain "fudo.org" "selby.ca" ];
nameservers = nameservers; nameservers = nameservers;
# Don't set the gateway if we ARE the gateway. # Don't set the gateway if we ARE the gateway.
# This is the most generic way I can think of to do that. local-network is really # This is the most generic way I can think of to do that. local-network is really
# about running all the local servers (DNS, DHCP, and providing gateway). # about running all the local servers (DNS, DHCP, and providing gateway).
defaultGateway = optionalString (config.fudo.local-network.enable != true) gateway; defaultGateway =
optionalString (config.fudo.local-network.enable != true) gateway;
enableIPv6 = true; enableIPv6 = true;
# Necessary to make sure than Kerberos and Avahi both work (the former # Necessary to make sure than Kerberos and Avahi both work (the former
# needs the full reverse-lookup name of the server, the latter wants # needs the full reverse-lookup name of the server, the latter wants
# `hostname` to return just the host itself. # `hostname` to return just the host itself.
@ -51,27 +49,32 @@ in {
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
description = "Guest User"; description = "Guest User";
extraGroups = ["audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input"]; extraGroups =
[ "audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input" ];
}; };
ken = { ken = {
isNormalUser = true; isNormalUser = true;
uid = 10035; uid = 10035;
createHome = true; createHome = true;
description = "Ken Selby"; description = "Ken Selby";
extraGroups = ["audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input"]; extraGroups =
[ "audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input" ];
group = "users"; group = "users";
home = "/home/selby/ken"; home = "/home/selby/ken";
hashedPassword = "$6$EwK9fpbH8$gYVzYY1IYw2/G0wCeUxXrZZqvjWCkCZbBqCOhxowbMuYtC5G0vp.AoYhVKWOJcHJM2c7TdPmAdnhLIe2KYStf."; hashedPassword =
"$6$EwK9fpbH8$gYVzYY1IYw2/G0wCeUxXrZZqvjWCkCZbBqCOhxowbMuYtC5G0vp.AoYhVKWOJcHJM2c7TdPmAdnhLIe2KYStf.";
}; };
xiaoxuan = { xiaoxuan = {
isNormalUser = true; isNormalUser = true;
uid = 10065; uid = 10065;
createHome = true; createHome = true;
description = "Xiaoxuan Jin"; description = "Xiaoxuan Jin";
extraGroups = ["audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input"]; extraGroups =
[ "audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input" ];
group = "users"; group = "users";
home = "/home/xiaoxuan"; home = "/home/xiaoxuan";
hashedPassword = "$6$C8lYHrK7KvdKm/RE$cHZ2hg5gEOEjTV8Zoayik8sz5h.Vh0.ClCgOlQn8l/2Qx/qdxqZ7xCsAZ1GZ.IEyESfhJeJbjLpykXDwPpfVF0"; hashedPassword =
"$6$C8lYHrK7KvdKm/RE$cHZ2hg5gEOEjTV8Zoayik8sz5h.Vh0.ClCgOlQn8l/2Qx/qdxqZ7xCsAZ1GZ.IEyESfhJeJbjLpykXDwPpfVF0";
}; };
}; };
@ -126,9 +129,7 @@ in {
}; };
}; };
aliases = { aliases = { dns-hole = "clunk"; };
dns-hole = "clunk";
};
hosts = { hosts = {
clunk = { clunk = {