mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-05-02 12:43:17 +02:00
Compare commits
1 Commits
bicep-revi
...
38c62cb5e7
| Author | SHA1 | Date | |
|---|---|---|---|
| 38c62cb5e7 |
@@ -147,11 +147,6 @@
|
|||||||
stableNixosConfig = name: extraArgs:
|
stableNixosConfig = name: extraArgs:
|
||||||
nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
|
nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
|
||||||
in {
|
in {
|
||||||
bakke = stableNixosConfig "bakke" {
|
|
||||||
modules = [
|
|
||||||
inputs.disko.nixosModules.disko
|
|
||||||
];
|
|
||||||
};
|
|
||||||
bicep = stableNixosConfig "bicep" {
|
bicep = stableNixosConfig "bicep" {
|
||||||
modules = [
|
modules = [
|
||||||
inputs.matrix-next.nixosModules.default
|
inputs.matrix-next.nixosModules.default
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
{ config, pkgs, values, ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./hardware-configuration.nix
|
|
||||||
../../base
|
|
||||||
./filesystems.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.hostId = "99609ffc";
|
|
||||||
systemd.network.networks."30-enp2s0" = values.defaultNetworkConfig // {
|
|
||||||
matchConfig.Name = "enp2s0";
|
|
||||||
address = with values.hosts.bakke; [ (ipv4 + "/25") (ipv6 + "/64") ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Don't change (even during upgrades) unless you know what you are doing.
|
|
||||||
# See https://search.nixos.org/options?show=system.stateVersion
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
}
|
|
||||||
@@ -1,56 +1,32 @@
|
|||||||
{ fp, pkgs, values, lib, ... }:
|
{ fp, pkgs, values, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
(fp /base)
|
(fp /base)
|
||||||
#./services/nginx
|
./services/nginx
|
||||||
|
|
||||||
#./services/calendar-bot.nix
|
./services/calendar-bot.nix
|
||||||
#./services/git-mirrors
|
#./services/git-mirrors
|
||||||
#./services/minecraft-heatmap.nix
|
./services/minecraft-heatmap.nix
|
||||||
#./services/mysql
|
./services/mysql
|
||||||
#./services/postgresql
|
./services/postgresql
|
||||||
|
|
||||||
#./services/matrix
|
./services/matrix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader = {
|
#systemd.network.networks."30-enp6s0f0" = values.defaultNetworkConfig // {
|
||||||
systemd-boot.enable = false; # no uefi support on this device
|
systemd.network.networks."30-ens18" = values.defaultNetworkConfig // {
|
||||||
grub.device = "/dev/disk/by-id/scsi-3600508b1001ca9cf1c96afea40d5451d";
|
#matchConfig.Name = "enp6s0f0";
|
||||||
grub.enable = true;
|
matchConfig.Name = "ens18";
|
||||||
};
|
address = with values.hosts.bicep; [ (ipv4 + "/25") (ipv6 + "/64") ]
|
||||||
|
++ (with values.services.turn; [ (ipv4 + "/25") (ipv6 + "/64") ]);
|
||||||
boot = {
|
|
||||||
zfs = {
|
|
||||||
extraPools = [ "bicepdata" ];
|
|
||||||
requestEncryptionCredentials = false;
|
|
||||||
};
|
|
||||||
supportedFilesystems.zfs = true;
|
|
||||||
|
|
||||||
kernelPackages = pkgs.linuxPackages;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.zfs.autoScrub = {
|
|
||||||
enable = true;
|
|
||||||
interval = "Wed *-*-8..14 00:00:00";
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.hostId = "3b4bf6a5";
|
|
||||||
systemd.network.networks."30-ens10f3" = values.defaultNetworkConfig // {
|
|
||||||
matchConfig.Name = "ens10f3";
|
|
||||||
# IPs belong to guest1.pvv.ntnu.no
|
|
||||||
address = [ "129.241.210.248/25" "2001:700:300:1900::248/63" ];
|
|
||||||
};
|
};
|
||||||
systemd.network.wait-online = {
|
systemd.network.wait-online = {
|
||||||
anyInterface = true;
|
anyInterface = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# local overrides
|
services.qemuGuest.enable = true;
|
||||||
services.smartd.enable = lib.mkForce false;
|
|
||||||
system.autoUpgrade.enable = lib.mkForce false;
|
|
||||||
#services.userborn.enable = lib.mkForce false;
|
|
||||||
#services.userdbd.enable = lib.mkForce false;
|
|
||||||
|
|
||||||
# Don't change (even during upgrades) unless you know what you are doing.
|
# Don't change (even during upgrades) unless you know what you are doing.
|
||||||
# See https://search.nixos.org/options?show=system.stateVersion
|
# See https://search.nixos.org/options?show=system.stateVersion
|
||||||
|
|||||||
@@ -5,26 +5,39 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "hpsa" "ohci_pci" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ahci" "sd_mod" "sr_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/ec4ab82a-f31e-4f02-a988-99c18160d04a";
|
{ device = "/dev/disk/by-uuid/20e06202-7a09-47cc-8ef6-5e7afe19453a";
|
||||||
fsType = "btrfs";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [
|
# temp data disk, only 128gb not enough until we can add another disk to the system.
|
||||||
{
|
fileSystems."/data" =
|
||||||
device = "/var/lib/swapfile";
|
{ device = "/dev/disk/by-uuid/c81af266-0781-4084-b8eb-c2587cbcf1ba";
|
||||||
size = 8 * 1024;
|
fsType = "ext4";
|
||||||
}
|
};
|
||||||
];
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/198B-E363";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
# 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
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.ens18.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -270,10 +270,4 @@ in {
|
|||||||
|
|
||||||
interfaces.ens18.network = "pvv";
|
interfaces.ens18.network = "pvv";
|
||||||
};
|
};
|
||||||
nodes.bakke = {
|
|
||||||
guestType = "openstack";
|
|
||||||
parent = config.nodes.stackit.id;
|
|
||||||
|
|
||||||
interfaces.enp2s0.network = "pvv";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,10 +32,6 @@ in rec {
|
|||||||
gateway = pvv-ipv4 129;
|
gateway = pvv-ipv4 129;
|
||||||
gateway6 = pvv-ipv6 1;
|
gateway6 = pvv-ipv6 1;
|
||||||
|
|
||||||
bakke = {
|
|
||||||
ipv4 = pvv-ipv4 173;
|
|
||||||
ipv6 = pvv-ipv6 173;
|
|
||||||
};
|
|
||||||
bekkalokk = {
|
bekkalokk = {
|
||||||
ipv4 = pvv-ipv4 168;
|
ipv4 = pvv-ipv4 168;
|
||||||
ipv6 = pvv-ipv6 168;
|
ipv6 = pvv-ipv6 168;
|
||||||
|
|||||||
Reference in New Issue
Block a user