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

@ -132,7 +132,7 @@
users = digga.lib.rakeLeaves ./users; users = digga.lib.rakeLeaves ./users;
}; };
suites = with profiles; rec { suites = with profiles; rec {
base = [ base-user users.root users.barkeeper ]; base = [base-user users.root users.barkeeper];
pioneer-momo-koeln = base; pioneer-momo-koeln = base;
}; };

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,14 +1,16 @@
{ config, lib, pkgs, ... }:
{ {
imports = config,
[ lib,
# Include the results of the hardware scan. pkgs,
./hardware-configuration.nix ...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
./caddy.nix ./caddy.nix
./keycloak.nix ./keycloak.nix
]; ];
pub-solar.core.lite = true; pub-solar.core.lite = true;
@ -17,13 +19,15 @@
networking = { networking = {
useDHCP = false; useDHCP = false;
interfaces.enp1s0.ipv4.addresses = [{ interfaces.enp1s0.ipv4.addresses = [
address = "80.244.242.4"; {
prefixLength = 29; address = "80.244.242.4";
}]; 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"];
}; };
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.

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
]; ];
} }