Add glotzbert to host registry, add static IPv6 address

This commit is contained in:
Ehmry - 2020-01-20 15:01:49 +01:00
parent 39cef2da1d
commit 9f2af93778
2 changed files with 19 additions and 23 deletions

View File

@ -5,6 +5,10 @@ rec {
adc = { }; adc = { };
grafana.publicKey = grafana.publicKey =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPFB9fo01jzr2upEBEXiR7sSmeQoq9ll5Cf5/hjq5e4Y"; "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPFB9fo01jzr2upEBEXiR7sSmeQoq9ll5Cf5/hjq5e4Y";
glotzbert.publicKey =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHPrkD07abpTU/66fEjmiMYsUfJCSF62MVFe8BED7wu4";
hydra.publicKey = hydra.publicKey =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhurL/sxsXRglKdLfiWIcK+iqpyhGrGt/MoBODsgvig"; "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhurL/sxsXRglKdLfiWIcK+iqpyhGrGt/MoBODsgvig";
pulsebert.publicKey = pulsebert.publicKey =

View File

@ -1,32 +1,24 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { config, pkgs, ... }:
let {
#x11vnc-service = with pkgs; import ./x11vnc-service.nix { inherit stdenv pkgs; }; imports = [ ./hardware-configuration.nix ../../lib ../../lib/yggdrasil.nix ];
in {
c3d2 = {
isInHq = true;
hq.interface = "enp0s10";
enableHail = true;
};
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
useSandbox = true; useSandbox = true;
buildCores = 2; buildCores = 2;
}; };
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
../../lib
../../lib/yggdrasil.nix
];
c3d2 = {
isInHq = true;
mapHqHosts = true;
enableHail = true;
};
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.memtest86.enable = true;
boot.kernelPackages = pkgs.linuxPackages_4_19; boot.kernelPackages = pkgs.linuxPackages_4_19;
networking.hostName = "glotzbert"; # Define your hostname. networking.hostName = "glotzbert"; # Define your hostname.
@ -48,9 +40,7 @@ in {
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ wget vim x11vnc ];
wget vim x11vnc
];
systemd.user.services.x11vnc = { systemd.user.services.x11vnc = {
description = "X11 VNC server"; description = "X11 VNC server";
@ -58,7 +48,7 @@ in {
partOf = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ];
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${pkgs.x11vnc}/bin/x11vnc -shared -forever -passwd k-ot ${pkgs.x11vnc}/bin/x11vnc -shared -forever -passwd k-ot
''; '';
RestartSec = 3; RestartSec = 3;
Restart = "always"; Restart = "always";
@ -138,7 +128,9 @@ in {
uid = 1000; uid = 1000;
group = "k-ot"; group = "k-ot";
extraGroups = [ "wheel" "networkmanager" "audio" "video" ]; extraGroups = [ "wheel" "networkmanager" "audio" "video" ];
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGJJTSJdpDh82486uPiMhhyhnci4tScp5uUe7156MBC8 astro" ]; openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGJJTSJdpDh82486uPiMhhyhnci4tScp5uUe7156MBC8 astro"
];
}; };
# This value determines the NixOS release with which your system is to be # This value determines the NixOS release with which your system is to be