From 7ee1392e6e487b5b9a13602ca727605cb94f687d Mon Sep 17 00:00:00 2001 From: niten Date: Mon, 22 Aug 2022 11:30:18 -0700 Subject: [PATCH] Various changes. --- config/hardware/legatus.nix | 39 ++++++++-------- config/hardware/nutboy3.nix | 32 +++++++------ config/hardware/wormhole0.nix | 7 +++ config/host-config/lambda.nix | 71 +---------------------------- config/host-config/legatus.nix | 14 +++--- config/host-config/limina.nix | 20 ++++++++ config/host-config/nostromo.nix | 2 + config/host-config/nutboy3.nix | 16 ++++++- config/profile-config/common-ui.nix | 4 +- config/service/backplane.nix | 46 +++++++++---------- config/service/mail-server.nix | 44 +++++++++++------- config/service/wallfly-presence.nix | 2 +- config/users.nix | 6 ++- flake.lock | 62 ++++++++++++------------- flake.nix | 2 +- 15 files changed, 180 insertions(+), 187 deletions(-) diff --git a/config/hardware/legatus.nix b/config/hardware/legatus.nix index d630371..bbd7c5f 100644 --- a/config/hardware/legatus.nix +++ b/config/hardware/legatus.nix @@ -3,10 +3,7 @@ with lib; { boot = { initrd = { - availableKernelModules = [ - "ahci" - "usbhid" - ]; + availableKernelModules = [ "ahci" "usbhid" ]; kernelModules = [ "dm-snapshot" ]; }; kernelModules = [ ]; @@ -20,6 +17,8 @@ with lib; { supportedFilesystems = [ "btrfs" ]; }; + system.stateVersion = "22.05"; + fileSystems = { "/" = { device = "root-tmpfs"; @@ -28,43 +27,46 @@ with lib; { }; "/boot" = { - device = "/dev/disk/by-label/boot"; + device = "/dev/disk/by-label/legatus-boot"; fsType = "ext4"; options = [ "noexec" "noatime" "nodiratime" ]; }; "/nix" = { - device = "/dev/disk/by-label/system"; + device = "/dev/disk/by-label/legatus-data"; fsType = "btrfs"; options = [ "subvol=@nix" "compress=zstd" "noatime" "nodiratime" ]; }; "/var/log" = { - device = "/dev/disk/by-label/system"; + device = "/dev/disk/by-label/legatus-data"; fsType = "btrfs"; - options = [ "subvol=@logs" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + options = + [ "subvol=@log" "compress=zstd" "noatime" "nodiratime" "noexec" ]; neededForBoot = true; }; "/state" = { - device = "/dev/disk/by-label/system"; + device = "/dev/disk/by-label/legatus-data"; fsType = "btrfs"; - options = [ "subvol=@state" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + options = + [ "subvol=@state" "compress=zstd" "noatime" "nodiratime" "noexec" ]; }; - "/var/lib/acme" = { - device = "/dev/disk/by-label/system"; - fsType = "btrfs"; - options = [ "subvol=@acme" "compress=zstd" "noatime" "nodiratime" "noexec" ]; - }; + # "/var/lib/acme" = { + # device = "/dev/disk/by-label/system"; + # fsType = "btrfs"; + # options = + # [ "subvol=@acme" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + # }; }; - swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; + swapDevices = [{ device = "/dev/disk/by-label/legatus-swap"; }]; networking = { macvlans = { extif0 = { - interface = "eno2"; + interface = "eno1"; mode = "bridge"; }; }; @@ -73,8 +75,7 @@ with lib; { interfaces = { extif0 = { - macAddress = - pkgs.lib.network.generate-mac-address "legatus" "extif0"; + macAddress = pkgs.lib.network.generate-mac-address "legatus" "extif0"; }; }; }; diff --git a/config/hardware/nutboy3.nix b/config/hardware/nutboy3.nix index c8d4060..e7a6daf 100644 --- a/config/hardware/nutboy3.nix +++ b/config/hardware/nutboy3.nix @@ -3,14 +3,8 @@ with lib; { boot = { initrd = { - availableKernelModules = [ - "ehci_pci" - "ahci" - "isci" - "usbhid" - "usb_storage" - "sd_mod" - ]; + availableKernelModules = + [ "ehci_pci" "ahci" "isci" "usbhid" "usb_storage" "sd_mod" ]; kernelModules = [ "dm-snapshot" ]; }; kernelModules = [ "kvm-intel" ]; @@ -24,6 +18,8 @@ with lib; { supportedFilesystems = [ "btrfs" ]; }; + system.stateVersion = "21.11"; + fileSystems = { "/" = { device = "root-tmpfs"; @@ -46,26 +42,35 @@ with lib; { "/var/log" = { device = "/dev/disk/by-label/data"; fsType = "btrfs"; - options = [ "subvol=@logs" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + options = + [ "subvol=@logs" "compress=zstd" "noatime" "nodiratime" "noexec" ]; neededForBoot = true; }; "/state" = { device = "/dev/disk/by-label/data"; fsType = "btrfs"; - options = [ "subvol=@state" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + options = + [ "subvol=@state" "compress=zstd" "noatime" "nodiratime" "noexec" ]; }; "/var/lib/acme" = { device = "/dev/disk/by-label/data"; fsType = "btrfs"; - options = [ "subvol=@acme" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + options = + [ "subvol=@acme" "compress=zstd" "noatime" "nodiratime" "noexec" ]; }; "/var/lib/prometheus" = { device = "/dev/disk/by-label/data"; fsType = "btrfs"; - options = [ "subvol=@prometheus" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + options = [ + "subvol=@prometheus" + "compress=zstd" + "noatime" + "nodiratime" + "noexec" + ]; }; }; @@ -84,7 +89,8 @@ with lib; { interfaces = { extif0 = { macAddress = - pkgs.lib.network.generate-mac-address config.instance.hostname "extif0"; + pkgs.lib.network.generate-mac-address config.instance.hostname + "extif0"; }; }; }; diff --git a/config/hardware/wormhole0.nix b/config/hardware/wormhole0.nix index 3f30905..e4d8136 100644 --- a/config/hardware/wormhole0.nix +++ b/config/hardware/wormhole0.nix @@ -59,6 +59,13 @@ with lib; { options = [ "subvol=@state" "compress=zstd" "noatime" "nodiratime" "noexec" ]; }; + + "/var/lib" = { + device = "/dev/disk/by-label/wormhole0-data"; + fsType = "btrfs"; + options = + [ "subvol=@var" "compress=zstd" "noatime" "nodiratime" "noexec" ]; + }; }; swapDevices = [{ device = "/dev/disk/by-label/wormhole0-swap"; }]; diff --git a/config/host-config/lambda.nix b/config/host-config/lambda.nix index 73f7c2c..5b352f5 100644 --- a/config/host-config/lambda.nix +++ b/config/host-config/lambda.nix @@ -1,20 +1,14 @@ { config, lib, pkgs, ... }: let - shinobi-port = "7080"; - shinobi-od-port = "7082"; state-dir = "/state"; # This must be a string! - home-assistant-port = 8123; - - parent-config = config; - generate-mac = pkgs.lib.network.generate-mac-address; in { boot = { loader.grub.copyKernels = true; - kernelModules = [ "rpcsec_gss_krb5" ]; + #kernelModules = [ "rpcsec_gss_krb5" ]; }; networking = { @@ -74,7 +68,6 @@ in { mode = "0444"; }; nixos.source = "/etc/nixos-live"; - "host-config.nix".source = "/state/host/host-config.nix"; adjtime.source = "/state/host/adjtime"; NIXOS.source = "/state/host/NIXOS"; }; @@ -83,66 +76,4 @@ in { # Due to rollback, sudo will lecture after every reboot Defaults lecture = never ''; - - # services.nginx = { - # enable = true; - # recommendedOptimisation = true; - # recommendedProxySettings = true; - # recommendedGzipSettings = true; - - # virtualHosts."home.sea.fudo.org" = { - # locations."/" = { - # proxyPass = "http://localhost:${toString home-assistant-port}"; - # proxyWebsockets = true; - # }; - # }; - # }; - - # virtualisation = { - # docker = { - # enable = true; - # enableOnBoot = true; - # autoPrune = { enable = true; }; - # }; - - # oci-containers = { - # backend = "docker"; - # containers = { - # home-assistant = { - # image = "homeassistant/home-assistant:stable"; - # autoStart = true; - # environment.TZ = config.time.timeZone; - # # ports = [ "${toString home-assistant-port}:8123" ]; - # volumes = [ "/state/services/home-assistant:/config" ]; - # extraOptions = [ "--network=host" "--device=/dev/ttyACM0" ]; - # }; - - # # shinobi = { - # # image = "shinobisystems/shinobi:latest"; - # # ports = [ "${shinobi-port}:8080" ]; - # # volumes = [ - # # "/state/shinobi/plugins:/home/Shinobi/plugins" - # # "/state/shinobi/config:/home/Shinobi/config" - # # "/state/shinobi/videos:/home/Shinobi/videos" - # # "/state/shinobi/db-data:/var/lib/mysql" - # # "/etc/localtime:/etc/localtime:ro" - # # ]; - # # }; - - # # shinobi-od = { - # # image = "shinobisystems/shinobi-tensorflow:latest"; - # # volumes = - # # [ "/srv/shinobi/od-config:/home/Shinobi/docker-plugins/tensorflow" ]; - # # ports = [ "${shinobi-od-port}:8082" ]; - # # environment = { - # # PLUGIN_HOST = "panopticon.sea.fudo.org"; - # # PLUGIN_PORT = shinobi-port; - # # PLUGIN_KEY = "30sWllylOxsDcE4vQXEPaXNfe5DiB3"; - # # }; - # # }; - - # # photoprism = { image = "photoprism/photoprism"; }; - # }; - # }; - # }; } diff --git a/config/host-config/legatus.nix b/config/host-config/legatus.nix index a16dc0c..a2716ef 100644 --- a/config/host-config/legatus.nix +++ b/config/host-config/legatus.nix @@ -3,7 +3,7 @@ with lib; let hostname = "legatus"; - host-ipv4 = "91.229.23.204"; + host-ipv4 = "190.2.136.47"; domain-name = config.fudo.hosts.${hostname}.domain; domain = config.fudo.domains.${domain-name}; site-name = config.fudo.hosts.${hostname}.site; @@ -29,7 +29,7 @@ in { }]; }; - security.acme.email = "admin@legatus.fudo.org"; + security.acme.defaults.email = "admin@legatus.fudo.org"; systemd.tmpfiles.rules = [ "L /etc/adjtime - - - - /state/etc/adjtime" ]; @@ -76,11 +76,11 @@ in { secrets.host-secrets.legatus = let files = config.fudo.secrets.files; in { - # postgres-keytab = { - # source-file = files.service-keytabs.procul.postgres; - # target-file = "/srv/postgres/secure/postgres.keytab"; - # user = "root"; - # }; + postgres-keytab = { + source-file = files.service-keytabs.procul.postgres; + target-file = "/srv/postgres/secure/postgres.keytab"; + user = "root"; + }; # gitea-database-password = { # source-file = files.service-passwords.procul.gitea-database; diff --git a/config/host-config/limina.nix b/config/host-config/limina.nix index 1283eca..065dba1 100644 --- a/config/host-config/limina.nix +++ b/config/host-config/limina.nix @@ -49,6 +49,26 @@ in { # externalInterface = "enp1s0"; # internalInterfaces = [ "intif0" "intif1" "intif2" ]; # }; + + nat.forwardPorts = [ + # Minecraft + { + destination = "10.0.0.10:25565"; + proto = "tcp"; + sourcePort = "25565"; + } + { + destination = "10.0.0.10:25565"; + proto = "udp"; + sourcePort = "25565"; + } + # Factorio + { + destination = "10.0.0.10:34197"; + proto = "udp"; + sourcePort = "34197"; + } + ]; }; fudo = { diff --git a/config/host-config/nostromo.nix b/config/host-config/nostromo.nix index 5b8d5bb..7d387eb 100644 --- a/config/host-config/nostromo.nix +++ b/config/host-config/nostromo.nix @@ -138,6 +138,8 @@ in { }; }; + imports = [ ./nostromo/factorio.nix ./nostromo/minecraft.nix ]; + ## Until I can figure out how to use one common host API, forget this # fudo.ipfs = { # enable = true; diff --git a/config/host-config/nutboy3.nix b/config/host-config/nutboy3.nix index 164de52..15e3b46 100644 --- a/config/host-config/nutboy3.nix +++ b/config/host-config/nutboy3.nix @@ -58,7 +58,7 @@ in { environment = { systemPackages = local-packages; }; - security.acme.email = "admin@fudo.org"; + security.acme.defaults.email = "admin@fudo.org"; fudo = { hosts.${hostname}.external-interfaces = [ "extif0" ]; @@ -244,5 +244,19 @@ in { # }; # }; }; + + # services.factorio = { + # enable = true; + # public = false; + # port = 34197; + # lan = false; + # description = "Fudo Factorio Server"; + # bind = host-ipv4; + # admins = [ "niten" ]; + # openFirewall = true; + # autosave-interval = 10; + # loadLatestSave = true; + # package = pkgs.factorio-headless-experimental; + # }; }; } diff --git a/config/profile-config/common-ui.nix b/config/profile-config/common-ui.nix index ef88dd2..48161ee 100644 --- a/config/profile-config/common-ui.nix +++ b/config/profile-config/common-ui.nix @@ -13,6 +13,8 @@ in { tmpOnTmpfs = true; }; + environment.systemPackages = with pkgs; [ adoptopenjdk-jre-openj9-bin-16 ]; + services = { xserver = mkIf enable-gui { enable = true; @@ -85,5 +87,5 @@ in { services.flatpak.enable = enable-gui; - fonts = mkIf enable-gui { fontDir.enable = true; }; + fonts.fontDir.enable = enable-gui; } diff --git a/config/service/backplane.nix b/config/service/backplane.nix index cff0454..7c481a1 100644 --- a/config/service/backplane.nix +++ b/config/service/backplane.nix @@ -19,26 +19,28 @@ let database-name = "backplane_dns"; - make-passwd-file = hostname: let - name = "backplane-host-${hostname}-client-passwd"; - seed = "${name}-${config.instance.build-seed}"; - in pkgs.lib.passwd.stablerandom-passwd-file name seed; + make-passwd-file = hostname: + let + name = "backplane-host-${hostname}-client-passwd"; + seed = "${name}-${config.instance.build-seed}"; + in pkgs.lib.passwd.stablerandom-passwd-file name seed; host-secrets = config.fudo.secrets.host-secrets.${hostname}; - host-password-files = mapAttrs (hostname: hostOpts: - make-passwd-file hostname) config.fudo.hosts; + host-password-files = + mapAttrs (hostname: hostOpts: make-passwd-file hostname) config.fudo.hosts; backplane-user = "backplane_dns"; database-backplane-user = "backplane_dns"; database-powerdns-user = "backplane_powerdns_dns"; - backplane-host-domain = config.fudo.hosts.${domain.backplane.dns-service}.domain; - backplane-server = head config.fudo.domains.${backplane-host-domain}.xmpp-servers; + backplane-host-domain = + config.fudo.hosts.${domain.backplane.dns-service}.domain; + backplane-server = + head config.fudo.domains.${backplane-host-domain}.xmpp-servers; backplane-host-fqdn = "${backplane-server}.${backplane-host-domain}"; backplane-fqdn = "backplane.${backplane-host-domain}"; - in { config = mkIf backplaneEnabled { @@ -101,9 +103,7 @@ in { }; zones.${zone-name} = { - aliases = { - backplane = "${backplane-host-fqdn}."; - }; + aliases = { backplane = "${backplane-host-fqdn}."; }; }; postgresql = mkIf isDatabase { @@ -143,7 +143,8 @@ in { }) config.fudo.hosts; services = { - dns.password-file = host-secrets.ejabberd-backplane-passwd.source-file; + dns.password-file = + host-secrets.ejabberd-backplane-passwd.source-file; }; backplane-hostname = backplane-fqdn; @@ -165,17 +166,14 @@ in { powerdns = mkIf (isNameserver) { enable = true; - domains = let - served-domain = domain.backplane.domain; - in { - ${served-domain}.admin = domain.admin-email; - }; - listen-v4-addresses = let - ipv4-addr = pkgs.lib.network.host-ipv4 config hostname; - in [ ipv4-addr ]; - listen-v6-addresses = let - ipv6-addr = pkgs.lib.network.host-ipv6 config hostname; - in optional (ipv6-addr != null) ipv6-addr; + domains = let served-domain = domain.backplane.domain; + in { ${served-domain}.admin = domain.admin-email; }; + listen-v4-addresses = + let ipv4-addr = pkgs.lib.network.host-ipv4 config hostname; + in [ ipv4-addr ]; + listen-v6-addresses = + let ipv6-addr = pkgs.lib.network.host-ipv6 config hostname; + in optional (ipv6-addr != null) ipv6-addr; database = { host = pkgs.lib.network.host-ipv4 config postgresql-server; database = database-name; diff --git a/config/service/mail-server.nix b/config/service/mail-server.nix index 4dde2c8..2c98d09 100644 --- a/config/service/mail-server.nix +++ b/config/service/mail-server.nix @@ -18,7 +18,7 @@ let isLocalMailserver = domain-name == mailserver-domain-name; - metricsEnabled = mailserver-domain.prometheus-hosts != []; + metricsEnabled = mailserver-domain.prometheus-hosts != [ ]; host-certs = config.fudo.acme.host-domains.${hostname}; @@ -42,25 +42,32 @@ in { trusted-networks = config.instance.local-networks; trustedNetworkString = optionalString (length trusted-networks > 0) (concatStringsSep "\n" - (map (network: "allow ${network};") - trusted-networks)) + "\n\ndeny all;"; + (map (network: "allow ${network};") trusted-networks)) + '' + + + deny all;''; in { enableACME = true; forceSSL = true; - locations = let - monitor-cfg = config.fudo.mail-server.monitoring; + locations = let monitor-cfg = config.fudo.mail-server.monitoring; in { "/metrics/dovecot" = { - proxyPass = "http://127.0.0.1:${toString monitor-cfg.dovecot-listen-port}/metrics"; + proxyPass = "http://127.0.0.1:${ + toString monitor-cfg.dovecot-listen-port + }/metrics"; extraConfig = trustedNetworkString; }; "/metrics/postfix" = { - proxyPass = "http://127.0.0.1:${toString monitor-cfg.postfix-listen-port}/metrics"; + proxyPass = "http://127.0.0.1:${ + toString monitor-cfg.postfix-listen-port + }/metrics"; extraConfig = trustedNetworkString; }; "/metrics/rspamd" = { - proxyPass = "http://127.0.0.1:${toString monitor-cfg.rspamd-listen-port}/metrics"; + proxyPass = "http://127.0.0.1:${ + toString monitor-cfg.rspamd-listen-port + }/metrics"; extraConfig = trustedNetworkString; }; }; @@ -74,14 +81,14 @@ in { admin-email = "admin@${mailserver-domain-name}"; local-copies.dovecot = { user = config.services.dovecot2.user; - dependent-services = [ "dovecot2.services" ]; + dependent-services = [ "dovecot2.service" ]; }; }; "smtp.${mailserver-domain-name}" = { admin-email = "admin@${mailserver-domain-name}"; local-copies.postfix = { user = config.services.postfix.user; - dependent-services = [ "postfix.services" ]; + dependent-services = [ "postfix.service" ]; }; }; }; @@ -101,14 +108,14 @@ in { hosts = genAttrs [ "imap" "smtp" ] (alias: { ipv4-address = server-ipv4; ipv6-address = server-ipv6; - description = "Primary ${toUpper alias} server for ${mailserver-domain-name}."; + description = + "Primary ${toUpper alias} server for ${mailserver-domain-name}."; }); mx = [ "smtp.${mailserver-domain-name}" ]; - aliases = mkIf metricsEnabled { - mail-stats = "${mailserver-host-fqdn}."; - }; + aliases = + mkIf metricsEnabled { mail-stats = "${mailserver-host-fqdn}."; }; srv-records.tcp = { pop3 = srv-record "imap" 110; @@ -145,20 +152,23 @@ in { dkim.signing = true; dovecot = let - cert-copy = host-certs."imap.${mailserver-domain-name}".local-copies.dovecot; + cert-copy = + host-certs."imap.${mailserver-domain-name}".local-copies.dovecot; in { ssl-certificate = cert-copy.full-certificate; ssl-private-key = cert-copy.private-key; }; postfix = let - cert-copy = host-certs."smtp.${mailserver-domain-name}".local-copies.postfix; + cert-copy = + host-certs."smtp.${mailserver-domain-name}".local-copies.postfix; in { ssl-certificate = cert-copy.full-certificate; ssl-private-key = cert-copy.private-key; }; - local-domains = [ mailserver-host-fqdn "smtp.${mailserver-domain-name}" ]; + local-domains = + [ mailserver-host-fqdn "smtp.${mailserver-domain-name}" ]; mail-directory = "${cfg.state-directory}/mail"; state-directory = "${cfg.state-directory}/state"; diff --git a/config/service/wallfly-presence.nix b/config/service/wallfly-presence.nix index c93640b..795fd96 100644 --- a/config/service/wallfly-presence.nix +++ b/config/service/wallfly-presence.nix @@ -59,7 +59,7 @@ in { }) user-cfg)); zones."${domain-name}" = { - aliases.mqtt = "${mqtt-broker}.${domain-name}"; + aliases.mqtt = "${mqtt-broker}.${domain-name}."; }; wallfly = { diff --git a/config/users.nix b/config/users.nix index 8fb7049..577cdb2 100644 --- a/config/users.nix +++ b/config/users.nix @@ -512,9 +512,11 @@ uid = 10116; primary-group = "selby"; common-name = "Jasper"; + # login-hashed-passwd = "$6$ggREeoA2HUmXDDbh$zPEyroAAiSPKseTb.qt4ByLaYBhV08x0hqOz4dnt4wEqcaWtOpBt3UoTpHxyDc2/inMzkRggBwfr.Zm0vI7mp1"; + # ldap-hashed-passwd = "{SSHA}5OCmPaKrkEG3Q4DOWibsPweuBShsMAz2"; login-hashed-passwd = - "$6$ggREeoA2HUmXDDbh$zPEyroAAiSPKseTb.qt4ByLaYBhV08x0hqOz4dnt4wEqcaWtOpBt3UoTpHxyDc2/inMzkRggBwfr.Zm0vI7mp1"; - ldap-hashed-passwd = "{SSHA}5OCmPaKrkEG3Q4DOWibsPweuBShsMAz2"; + "$6$odSNyA1T5bQRIXUd$LsCeR8rjC5pyNxesSR9eGVoa9wy1jwaPDyjOlB9ZQl3fzpRP6biNieXbjRWAfew8FgAImtB5beVCmXIc1085g."; + ldap-hashed-passwd = "{SSHA}mok5LrQtJ4pny2QTaN3sMmOZx6X0eg5R"; email = "jasper@selby.ca"; }; }; diff --git a/flake.lock b/flake.lock index a9f6a75..af11821 100644 --- a/flake.lock +++ b/flake.lock @@ -579,11 +579,11 @@ ] }, "locked": { - "lastModified": 1656710569, - "narHash": "sha256-xplQN3I4sB86TNHC8rS223FXwxGtRSxtsrhXRGYoKwY=", + "lastModified": 1660764393, + "narHash": "sha256-CX5FT8wzgXhy42EdkDzyZpuWATtJ3l3UzlJzuWuzb/I=", "ref": "master", - "rev": "ea7c227e9eb86cb90b6118be88e714dd9836c59e", - "revCount": 96, + "rev": "f0dc6216744338a53d196b07812a54c38cc5b729", + "revCount": 104, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -603,11 +603,11 @@ ] }, "locked": { - "lastModified": 1657421846, - "narHash": "sha256-82y9RNubMYSJPw13IQaj3tTPQuEX2VuMLryxJTDkAyc=", + "lastModified": 1660588007, + "narHash": "sha256-k5berFrNMPPEOHdOCPFSfHuCyvKAkTiFNohPZWE6Sio=", "ref": "master", - "rev": "188ac6891bbd18213ffdab122f484da849c2eb3e", - "revCount": 208, + "rev": "0d1f7cfb5850544cd1bc2b2c877f2c8b461cef25", + "revCount": 209, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -633,8 +633,8 @@ }, "fudo-lib_2": { "locked": { - "lastModified": 1657510985, - "narHash": "sha256-6QKfcmobaEfgsW6s2nU6piOgFg0iSPJAoXzFvCqwF5I=", + "lastModified": 1661186654, + "narHash": "sha256-c7eFfTIWl36og96mHwUY6jQ2aY11sSOafqa3FRoDZtY=", "path": "/state/fudo-lib", "type": "path" }, @@ -660,11 +660,11 @@ }, "fudo-pkgs_2": { "locked": { - "lastModified": 1655577860, - "narHash": "sha256-6OlBGH8TXCuPBakj/hB+o5turzroOysbb+Z1rJYuM3w=", + "lastModified": 1660763786, + "narHash": "sha256-/7cfxh5dgIe6DLcTpSAXhZgN3A57k6oH+19TijH9Ebw=", "ref": "master", - "rev": "445d96e405308f19d0d1021f11b55fd2d6b35e0f", - "revCount": 55, + "rev": "8c2cf13b06e3f3142b5133b4bffa4a7768685b8a", + "revCount": 57, "type": "git", "url": "https://git.fudo.org/fudo-nix/pkgs.git" }, @@ -824,11 +824,11 @@ }, "nixpkgs2111": { "locked": { - "lastModified": 1656782578, - "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=", + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", "type": "github" }, "original": { @@ -839,11 +839,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1657447684, - "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=", + "lastModified": 1661088761, + "narHash": "sha256-5DGKX81wIPAAiLwUmUYECpA3vop94AHHR7WmGXSsQok=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f43d8b088d3771274bcfb69d3c7435b1121ac88", + "rev": "a7855f2235a1876f97473a76151fec2afa02b287", "type": "github" }, "original": { @@ -899,11 +899,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1657296039, - "narHash": "sha256-Ghh39+aS+pw5sTP/ZO8VIKE6sBhMadDaQZtf+3yu4Vc=", + "lastModified": 1661094678, + "narHash": "sha256-RtaVb6SqfrgCi20gdju1ogS3u1ocyLnhsgolazrCwL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71d7a4c037dc4f3e98d5c4a81b941933cf5bf675", + "rev": "23534df34c1c499a6c82ce690df06d8c6e4e759d", "type": "github" }, "original": { @@ -914,16 +914,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1655278232, - "narHash": "sha256-H6s7tnHYiDKFCcLADS4sl1sUq0dDJuRQXCieguk/6SA=", + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b538fcb329a7bc3d153962f17c509ee49166973", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-21.11", "type": "indirect" } }, @@ -1045,11 +1045,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1655855322, - "narHash": "sha256-LuGiBNRnv6te1rrhoxiAECHXEK5GJLHdkdnqRCZiCdI=", + "lastModified": 1661185834, + "narHash": "sha256-VhfI2Jw6PFjTKbLUzIid8YK29j7mPYJ7u9GaSbwwLX4=", "ref": "master", - "rev": "72d36139708f3947c050d6659c4a2eac2c0d3b64", - "revCount": 38, + "rev": "903d1b81d11f7181943b46a6685add810716e2be", + "revCount": 39, "type": "git", "url": "https://git.fudo.org/fudo-public/pricebot.git" }, diff --git a/flake.nix b/flake.nix index aea673f..958c607 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,7 @@ fudo-secrets.nixosModule fudo-lib.nixosModule fudo-entities.nixosModule - pricebot.nixosModule + pricebot.nixosModules.default wallfly.nixosModule ./config