chore/update-momo-main-07-23 #237

Merged
teutat3s merged 67 commits from chore/update-momo-main-07-23 into momo/main 2023-07-15 01:08:45 +00:00
5 changed files with 35 additions and 31 deletions
Showing only changes of commit 1d3eadb471 - Show all commits

View file

@ -1,7 +1,4 @@
{ {config, ...}: {
config,
...
}: {
# Changing the Caddyfile should only trigger a reload, not a restart # Changing the Caddyfile should only trigger a reload, not a restart
systemd.services.caddy.reloadTriggers = [ systemd.services.caddy.reloadTriggers = [
config.services.caddy.configFile config.services.caddy.configFile

View file

@ -1,8 +1,10 @@
{ config, lib, pkgs, ... }:
{ {
imports = config,
[ lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
@ -17,10 +19,12 @@
networking = { networking = {
useDHCP = false; useDHCP = false;
interfaces.enp1s0.ipv4.addresses = [{ interfaces.enp1s0.ipv4.addresses = [
{
address = "80.244.242.4"; address = "80.244.242.4";
prefixLength = 29; prefixLength = 29;
}]; }
];
defaultGateway = "80.244.242.1"; defaultGateway = "80.244.242.1";
nameservers = ["95.129.51.51" "80.244.244.244"]; nameservers = ["95.129.51.51" "80.244.244.244"];

View file

@ -1,6 +1,7 @@
{ suites, ... }: {suites, ...}: {
{ imports =
imports = [ [
./pioneer-momo-koeln.nix ./pioneer-momo-koeln.nix
] ++ suites.pioneer-momo-koeln; ]
++ suites.pioneer-momo-koeln;
} }

View file

@ -1,12 +1,14 @@
{ config, pkgs, lib, ... }:
with lib;
with pkgs;
let
psCfg = config.pub-solar;
in
{ {
config,
pkgs,
lib,
...
}:
with lib;
with pkgs; let
psCfg = config.pub-solar;
in {
imports = [ imports = [
./configuration.nix ./configuration.nix
]; ];
} }