add new host
This commit is contained in:
parent
6d001a11f4
commit
d5509e6ea1
|
@ -37,12 +37,14 @@
|
||||||
devices = {
|
devices = {
|
||||||
vinzenz-lpt2 = "x86_64-linux";
|
vinzenz-lpt2 = "x86_64-linux";
|
||||||
vinzenz-pc2 = "x86_64-linux";
|
vinzenz-pc2 = "x86_64-linux";
|
||||||
|
ronja-pc = "x86_64-linux";
|
||||||
hetzner-vpn2 = "aarch64-linux";
|
hetzner-vpn2 = "aarch64-linux";
|
||||||
forgejo-runner-1 = "aarch64-linux";
|
forgejo-runner-1 = "aarch64-linux";
|
||||||
};
|
};
|
||||||
homeDevices = [
|
homeDevices = [
|
||||||
"vinzenz-lpt2"
|
"vinzenz-lpt2"
|
||||||
"vinzenz-pc2"
|
"vinzenz-pc2"
|
||||||
|
"ronja-pc"
|
||||||
];
|
];
|
||||||
forDevice = f: nixpkgs.lib.mapAttrs f devices;
|
forDevice = f: nixpkgs.lib.mapAttrs f devices;
|
||||||
in
|
in
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
ms-dotnettools.csharp
|
ms-dotnettools.csharp
|
||||||
ms-vscode-remote.remote-ssh
|
ms-vscode-remote.remote-ssh
|
||||||
RoweWilsonFrederiskHolme.wikitext
|
RoweWilsonFrederiskHolme.wikitext
|
||||||
|
davidanson.vscode-markdownlint
|
||||||
];
|
];
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"files.autoSave" = "afterDelay";
|
"files.autoSave" = "afterDelay";
|
||||||
|
|
|
@ -20,26 +20,26 @@
|
||||||
recommendedOptimisation = true;
|
recommendedOptimisation = true;
|
||||||
|
|
||||||
virtualHosts =
|
virtualHosts =
|
||||||
let
|
#let
|
||||||
servicesDomain = "services.zerforschen.plus";
|
# servicesDomain = "services.zerforschen.plus";
|
||||||
mkServiceConfig = host: port: {
|
# mkServiceConfig = host: port: {
|
||||||
addSSL = true;
|
# addSSL = true;
|
||||||
enableACME = true;
|
# enableACME = true;
|
||||||
locations."/" = {
|
# locations."/" = {
|
||||||
proxyPass = "http://${host}:${toString port}/";
|
# proxyPass = "http://${host}:${toString port}/";
|
||||||
extraConfig = ''
|
# extraConfig = ''
|
||||||
# bind to tailscale ip
|
# # bind to tailscale ip
|
||||||
proxy_bind 100.88.118.60;
|
# proxy_bind 100.88.118.60;
|
||||||
# pam auth
|
# # pam auth
|
||||||
limit_except OPTIONS {
|
# limit_except OPTIONS {
|
||||||
auth_pam "Password Required";
|
# auth_pam "Password Required";
|
||||||
auth_pam_service_name "nginx";
|
# auth_pam_service_name "nginx";
|
||||||
}
|
# }
|
||||||
'';
|
# '';
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
pc2 = "vinzenz-pc2.donkey-pentatonic.ts.net";
|
# pc2 = "vinzenz-pc2.donkey-pentatonic.ts.net";
|
||||||
in
|
#in
|
||||||
{
|
{
|
||||||
#"vscode.${servicesDomain}" = lib.mkMerge [
|
#"vscode.${servicesDomain}" = lib.mkMerge [
|
||||||
# (mkServiceConfig pc2 8542)
|
# (mkServiceConfig pc2 8542)
|
||||||
|
|
25
hosts/ronja-pc/configuration.nix
Normal file
25
hosts/ronja-pc/configuration.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
# Configure keymap in X11
|
||||||
|
services.xserver.xkb = {
|
||||||
|
layout = "de";
|
||||||
|
variant = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Configure console keymap
|
||||||
|
console.keyMap = "de";
|
||||||
|
|
||||||
|
# List packages installed in system profile. To search, run:
|
||||||
|
# $ nix search wget
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
|
# wget
|
||||||
|
];
|
||||||
|
|
||||||
|
# Open ports in the firewall.
|
||||||
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
|
}
|
31
hosts/ronja-pc/hardware.nix
Normal file
31
hosts/ronja-pc/hardware.nix
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
{lib, ...}: {
|
||||||
|
boot = {
|
||||||
|
kernelModules = ["kvm-intel"];
|
||||||
|
extraModulePackages = [];
|
||||||
|
initrd = {
|
||||||
|
availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
|
||||||
|
kernelModules = [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems = {
|
||||||
|
"/" = {
|
||||||
|
device = "/dev/disk/by-uuid/27eccf93-a79f-4fcb-8588-ec55d913508f";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = ["subvol=@"];
|
||||||
|
};
|
||||||
|
|
||||||
|
"/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/85D4-43FC";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = ["fmask=0077" "dmask=0077"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{device = "/dev/disk/by-uuid/bf9d19fb-499b-4bfb-b67d-131fa5bf8259";}
|
||||||
|
];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = true;
|
||||||
|
}
|
10
hosts/ronja-pc/imports.nix
Normal file
10
hosts/ronja-pc/imports.nix
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../../modules/gnome.nix
|
||||||
|
../../modules/gaming.nix
|
||||||
|
../../modules/desktop-environment.nix
|
||||||
|
../../modules/desktop-hardware.nix
|
||||||
|
|
||||||
|
../../home/ronja
|
||||||
|
];
|
||||||
|
}
|
|
@ -3,7 +3,6 @@
|
||||||
imports = [ ./zerforschen-plus.nix ];
|
imports = [ ./zerforschen-plus.nix ];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
nix.settings.extra-platforms = [
|
nix.settings.extra-platforms = [
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
"i686-linux"
|
"i686-linux"
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
./vscode-server.nix
|
./vscode-server.nix
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
nix.settings.extra-platforms = [
|
nix.settings.extra-platforms = [
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
"i686-linux"
|
"i686-linux"
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
|
Loading…
Reference in a new issue