Compare commits

..

3 Commits

Author SHA1 Message Date
Øystein Tveit
cbec247a87 rebase 2024-11-24 03:21:26 +01:00
h7x4
78028846a9 WIP: gitea: init gpg signing key 2024-11-23 23:51:53 +01:00
h7x4
07777edafb secrets/bekkalokk: add signing subkey 2024-11-23 22:26:15 +01:00
5 changed files with 3 additions and 64 deletions

View File

@@ -1,20 +1,8 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
services.smartd = { services.smartd.enable = lib.mkDefault true;
enable = lib.mkDefault true;
notifications = {
mail = {
enable = true;
sender = "root@pvv.ntnu.no";
recipient = "root@pvv.ntnu.no";
};
wall.enable = false;
};
};
environment.systemPackages = lib.optionals config.services.smartd.enable (with pkgs; [ environment.systemPackages = lib.optionals config.services.smartd.enable (with pkgs; [
smartmontools smartmontools
]); ]);
systemd.services.smartd.unitConfig.ConditionVirtualization = "no";
} }

View File

@@ -49,7 +49,7 @@
"ildkule" "ildkule"
]; ];
in { in {
inputs = nixlib.mapAttrs (_: src: src.outPath) inputs; inherit inputs;
nixosConfigurations = let nixosConfigurations = let
unstablePkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; unstablePkgs = nixpkgs-unstable.legacyPackages.x86_64-linux;
@@ -115,12 +115,6 @@
#ildkule-unstable = unstableNixosConfig "ildkule" { }; #ildkule-unstable = unstableNixosConfig "ildkule" { };
shark = stableNixosConfig "shark" { }; shark = stableNixosConfig "shark" { };
ustetind = stableNixosConfig "ustetind" {
modules = [
"${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix"
];
};
brzeczyszczykiewicz = stableNixosConfig "brzeczyszczykiewicz" { brzeczyszczykiewicz = stableNixosConfig "brzeczyszczykiewicz" {
modules = [ modules = [
inputs.grzegorz-clients.nixosModules.grzegorz-webui inputs.grzegorz-clients.nixosModules.grzegorz-webui

View File

@@ -1,28 +0,0 @@
{ config, fp, pkgs, lib, values, ... }:
{
imports = [
(fp /base)
(fp /misc/metrics-exporters.nix)
];
networking.hostName = "ustetind";
networking.useHostResolvConf = lib.mkForce false;
# systemd.network.enable = lib.mkForce false;
# networking.useDHCP = lib.mkForce true;
# networking.address = with values.hosts.georg; [ (ipv4 + "/25") (ipv6 + "/64") ];
systemd.network.networks."30-lxc-veth" = values.defaultNetworkConfig // {
matchConfig = {
Type = "ether";
Kind = "veth";
Name = [
"eth*"
];
};
address = with values.hosts.ustetind; [ (ipv4 + "/25") (ipv6 + "/64") ];
};
system.stateVersion = "24.11";
}

View File

@@ -1,11 +0,0 @@
{ pkgs, ... }:
{
users.users.frero = {
isNormalUser = true;
extraGroups = [ "wheel" "drift" "nix-builder-users" ];
shell = pkgs.zsh;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII09JbtSUMurvmHpJ7TmUQctXpNVhjFYhoJ3+1ZITmMx"
];
};
}

View File

@@ -60,10 +60,6 @@ in rec {
ipv4 = pvv-ipv4 204; ipv4 = pvv-ipv4 204;
ipv6 = pvv-ipv6 "1:4f"; # Wtf øystein og daniel why ipv6 = pvv-ipv6 "1:4f"; # Wtf øystein og daniel why
}; };
ustetind = {
ipv4 = pvv-ipv4 234;
ipv6 = pvv-ipv6 234;
};
}; };
defaultNetworkConfig = { defaultNetworkConfig = {