wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #32 from fsr/qemu

Browse source 
Migrate quitte to QEMU
This commit is contained in:
Tassilo Tanneberger 2023-04-23 19:44:14 +02:00 committed by GitHub
parent a58b35e382 8e1543bb14
commit 09e6f730f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hosts/quitte/configuration.nix
View file

@ -9,11 +9,11 @@
# 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.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; #boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
boot.kernelParams = [ "video=VGA-1:1024x768@30" ]; #boot.kernelParams = [ "video=VGA-1:1024x768@30" ];
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.supportedFilesystems = [ "zfs" ]; #boot.supportedFilesystems = [ "zfs" ];
boot.zfs.devNodes = "/dev/"; #boot.zfs.devNodes = "/dev/";
networking.hostName = "quitte"; # Define your hostname. networking.hostName = "quitte"; # Define your hostname.

46
hosts/quitte/hardware-configuration.nix
View file

@ -6,55 +6,26 @@
{ {
imports = imports =
[ [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "megaraid_sas" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ {
device = "rpool/nixos/root"; device = "/dev/disk/by-uuid/599838c5-49cd-4769-aff1-2236300c097f";
fsType = "zfs"; fsType = "xfs";
options = [ "zfsutil" ];
};
fileSystems."/home" =
{
device = "rpool/nixos/home";
fsType = "zfs";
options = [ "zfsutil" ];
};
fileSystems."/var/lib" =
{
device = "rpool/nixos/var/lib";
fsType = "zfs";
options = [ "zfsutil" ];
};
fileSystems."/var/log" =
{
device = "rpool/nixos/var/log";
fsType = "zfs";
options = [ "zfsutil" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ {
device = "/dev/disk/by-uuid/7FE6-F583"; device = "/dev/disk/by-uuid/3F75-65A3";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/nix" =
{
device = "rpool/nixos/nix";
fsType = "zfs";
options = [ "zfsutil" ];
};
swapDevices = [ ]; swapDevices = [ ];
# 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
@ -62,10 +33,9 @@
# 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
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno8303.useDHCP = lib.mkDefault true; # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
# networking.interfaces.eno8403.useDHCP = lib.mkDefault true;
# networking.interfaces.enp65s0f0np0.useDHCP = lib.mkDefault true;
# networking.interfaces.enp65s0f1np1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

4
hosts/quitte/network.nix
View file

@ -13,7 +13,7 @@ in
hostId = "a71c81fc"; hostId = "a71c81fc";
enableIPv6 = true; enableIPv6 = true;
useDHCP = true; useDHCP = true;
interfaces.enp65s0f0np0.useDHCP = true; interfaces.ens18.useDHCP = true;
useNetworkd = true; useNetworkd = true;
firewall.allowedUDPPorts = [ wireguard_port ]; firewall.allowedUDPPorts = [ wireguard_port ];
@ -37,7 +37,7 @@ in
# Interfaces on the machine # Interfaces on the machine
networks."10-ether-bond" = { networks."10-ether-bond" = {
matchConfig.Name = "enp65s0f0np0"; matchConfig.Name = "ens18";
address = [ "141.30.30.169/25" ]; address = [ "141.30.30.169/25" ];
routes = [ routes = [

2
modules/sogo.nix
View file

@ -22,7 +22,7 @@ in
type = ldap; type = ldap;
CNFieldName = cn; CNFieldName = cn;
UIDFieldName = uid; UIDFieldName = uid;
baseDN = "ou = users, dc=ifsr, dc=de"; baseDN = "ou=users, dc=ifsr, dc=de";
bindDN = "uid=search, ou=users, dc=ifsr, dc=de"; bindDN = "uid=search, ou=users, dc=ifsr, dc=de";
bindPassword = LDAP_SEARCH; bindPassword = LDAP_SEARCH;
hostname = "ldap://localhost"; hostname = "ldap://localhost";