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

Updated flake.lock

Browse Source
This commit is contained in:
niten
2022-01-05 12:09:56 -08:00
parent f5a6b93395
commit 101a6afcd8
9 changed files with 157 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/default.nix
+1
View File
@@ -15,6 +15,7 @@
./user-config.nix
./wireless-networks.nix
./service/chute.nix
./service/dns.nix
./service/fudo-auth.nix
./service/jabber.nix
config/hardware/zbox.nix
+3
View File
@@ -77,6 +77,9 @@
enableRedistributableFirmware = true;
enableAllFirmware = true;
# Required with Wayland?
nvidia.modesetting.enable = true;
};
networking = {
config/host-config/nutboy3.nix
+2 -116
View File
@@ -24,6 +24,7 @@ let
in {
imports = [
./nutboy3/cashew.nix
./nutboy3/forum_selby_ca.nix
];
@@ -96,6 +97,7 @@ in {
services = {
jabber = {
enable = true;
domain = "jabber.fudo.org";
hostname = "jabber.fudo.org";
ldap.servers = [ "nutboy3.fudo.org" ];
state-directory = "/state/ejabberd";
@@ -185,121 +187,5 @@ in {
# };
# };
};
containers.cashew = let
local-packages = with pkgs; [
bind
emacs-nox
mtr
vim
];
in {
autoStart = true;
bindMounts = {
"/state" = {
hostPath = "/state/cashew";
isReadOnly = false;
};
"/etc/bind" = {
hostPath = "/state/cashew/bind";
isReadOnly = false;
};
"/var/log" = {
hostPath = "/state/cashew/logs";
isReadOnly = false;
};
"/home" = {
hostPath = "/state/cashew/home";
isReadOnly = false;
};
"/etc/dns-root-data" = {
hostPath = "${pkgs.dns-root-data}/";
isReadOnly = true;
};
};
interfaces = [ "eno2" ];
config = { ... }: {
nixpkgs.pkgs = pkgs;
environment.systemPackages = local-packages;
users = {
users = {
niten = config.users.users.niten;
reaper = config.users.users.reaper // {
openssh.authorizedKeys.keys = [
"ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBADtR1gMK7JnIOht8yZNPROr+0VHgt5eWrGFPscVPk1crVuEvIv1MF544Qk1IHi+2OA2xUvI1BTgmXp3TLvCjEn4lQF4Uc5hcUGENS6TNMPByHx69rAeXVMtmjW0sL4Tbhqd0iNh85STdtzXNZUY31+A6ugrJSnvnSt5wv9ZpMz0SFIE1Q=="
];
};
root.openssh.authorizedKeys.keys = [
"ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBADtR1gMK7JnIOht8yZNPROr+0VHgt5eWrGFPscVPk1crVuEvIv1MF544Qk1IHi+2OA2xUvI1BTgmXp3TLvCjEn4lQF4Uc5hcUGENS6TNMPByHx69rAeXVMtmjW0sL4Tbhqd0iNh85STdtzXNZUY31+A6ugrJSnvnSt5wv9ZpMz0SFIE1Q=="
];
};
groups = {
wheel.members = [
"niten"
"reaper"
];
dns = {
members = [
"niten"
"reaper"
"named"
];
};
};
};
networking = {
defaultGateway = {
address = "208.81.4.81";
interface = "eno2";
};
interfaces.eno2 = {
ipv4.addresses = [
{
address = "208.81.4.82";
prefixLength = 29;
}
{
address = "208.81.1.141";
prefixLength = 32;
}
];
};
firewall.enable = false;
};
services = {
bind = {
enable = true;
configFile = "/etc/bind/named.conf";
};
openssh = {
enable = true;
startWhenNeeded = true;
useDns = true;
permitRootLogin = "prohibit-password";
hostKeys = [
{
path = "/state/ssh/ssh_host_ed25519_key";
type = "ed25519";
}
{
path = "/state/ssh/ssh_host_rsa_key";
type = "rsa";
bits = 4096;
}
];
};
};
};
};
};
}
config/host-config/procul.nix
+8 -9
View File
@@ -84,16 +84,15 @@ in {
};
};
chute = {
services.chute = let
secret-files = config.fudo.secrets.files.service-secrets.procul;
in {
enable = true;
stages = {
staging = {
package = pkgs.chuteUnstable;
credential-file = host-secrets.chute-staging-credentials.target-file;
currencies = {
btc.stop-percentile = 98;
};
};
jabber-user = "niten@jabber.fudo.org";
staging = {
secret-file = secret-files."chute-staging.secret";
passphrase-file = secret-files."chute-staging.passphrase";
key-file = secret-files."chute-staging.key";
};
};
};
config/host-config/system3.nix
+4 -1
View File
@@ -6,7 +6,10 @@ in {
environment.systemPackages = with pkgs; [ opencv-java ];
networking.interfaces.intif0.useDHCP = true;
networking = {
interfaces.intif0.useDHCP = true;
firewall.enable = false;
};
systemd.tmpfiles.rules = [
"L /root/.gnupg - - - - ${state-dir}/user/root/gnupg"
config/service/jabber.nix
+7 -1
View File
@@ -28,6 +28,11 @@ in {
default = "jabber.fudo.org";
};
domain = mkOption {
type = str;
description = "Jabber domain.";
};
ldap = {
user = mkOption {
type = str;
@@ -70,7 +75,8 @@ in {
};
sites = {
${cfg.hostname} = {
${cfg.domain} = {
hostname = cfg.hostname;
site-config = {
auth_method = "ldap";
ldap_servers = cfg.ldap.servers;
config/site-config/seattle.nix
+6 -6
View File
@@ -44,17 +44,17 @@ in {
"/net/documents" = {
device = "nostromo.sea.fudo.org:/export/documents";
fsType = "nfs4";
options = [ "comment=systemd.automount" "sec=krb5p" ];
options = [ "comment=systemd.automount" "sec=krb5p" "nfsvers=4" ];
};
"/net/downloads" = {
device = "nostromo.sea.fudo.org:/export/downloads";
fsType = "nfs4";
options = [ "comment=systemd.automount" "sec=krb5i" ];
options = [ "comment=systemd.automount" "sec=krb5i" "nfsvers=4" ];
};
"/net/projects" = {
device = "nostromo.sea.fudo.org:/export/projects";
fsType = "nfs4";
options = [ "comment=systemd.automount" "sec=krb5p" ];
options = [ "comment=systemd.automount" "sec=krb5p" "nfsvers=4" ];
};
};
@@ -68,21 +68,21 @@ in {
# mounts = [
# {
# what = "sea-store.sea.fudo.org:/export/documents";
# what = "nostromo.sea.fudo.org:/export/documents";
# where = "/net/documents";
# type = "nfs4";
# options = "sec=krb5p";
# description = "sea-store documents on encrypted filesysem.";
# }
# {
# what = "sea-store.sea.fudo.org:/export/downloads";
# what = "nostromo.sea.fudo.org:/export/downloads";
# where = "/net/downloads";
# type = "nfs4";
# options = "sec=krb5i";
# description = "sea-store downloads on encrypted filesysem.";
# }
# {
# what = "sea-store.sea.fudo.org:/export/projects";
# what = "nostromo.sea.fudo.org:/export/projects";
# where = "/net/projects";
# type = "nfs4";
# options = "sec=krb5p";
config/users.nix
+4 -3
View File
@@ -107,9 +107,9 @@
uid = 10035;
primary-group = "selby";
common-name = "Ken Selby";
ldap-hashed-passwd = "{SSHA}YvtkEpqsReXcMdrzlui/ZmhIUKN42YO1";
ldap-hashed-passwd = "{SSHA}ohRfhWED/qq5NIH8pqgHMQlbpPWVkH/m";
login-hashed-passwd =
"$6$EwK9fpbH8$gYVzYY1IYw2/G0wCeUxXrZZqvjWCkCZbBqCOhxowbMuYtC5G0vp.AoYhVKWOJcHJM2c7TdPmAdnhLIe2KYStf.";
"$6$f/0esIm0sxh36VCa$XJ1xFAquJTRW02W1GKqNDT0H.ufjx0yK2tiywhkW.QBi7P0AvShCDPVCFN59pQvYH7C5Q4ixX9VWLnufIU/9B1";
email-aliases = [ "kselby@selby.ca" ];
};
@@ -329,7 +329,8 @@
uid = 10086;
primary-group = "selby";
common-name = "Helen Selby";
ldap-hashed-passwd = "{SSHA}uckUXX09MjYq9++sF3f9b2IY8a9UBIxm";
ldap-hashed-passwd = "{SSHA}G/qhBqHiCRSi+LdwyUesMH7StM5J6wZI";
# ldap-hashed-passwd = "{SSHA}uckUXX09MjYq9++sF3f9b2IY8a9UBIxm";
};
vee = {