feat: Morbo moved to VM
This commit is contained in:
parent
4354883c63
commit
e0fd172e34
9 changed files with 30 additions and 38 deletions
|
@ -13,22 +13,22 @@
|
|||
systemd.mounts = [
|
||||
{
|
||||
type = "glusterfs";
|
||||
what = "morbo:/p3600";
|
||||
what = "planex:/p3600";
|
||||
where = "/mnt/gp3600";
|
||||
}
|
||||
{
|
||||
type = "glusterfs";
|
||||
what = "morbo:/docker";
|
||||
what = "planex:/docker";
|
||||
where = "/mnt/gdocker";
|
||||
}
|
||||
{
|
||||
type = "glusterfs";
|
||||
what = "morbo:/media";
|
||||
what = "planex:/media";
|
||||
where = "/mnt/gmedia";
|
||||
}
|
||||
{
|
||||
type = "glusterfs";
|
||||
what = "morbo:/backups";
|
||||
what = "planex:/backups";
|
||||
where = "/mnt/gbackups";
|
||||
}
|
||||
];
|
||||
|
|
13
common/nixos/baremetal.nix
Normal file
13
common/nixos/baremetal.nix
Normal file
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
outputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./common.nix
|
||||
./smart.nix
|
||||
];
|
||||
}
|
|
@ -10,7 +10,6 @@
|
|||
./packages.nix
|
||||
./users.nix
|
||||
./locale.nix
|
||||
./smart.nix
|
||||
# ./prometheus.nix
|
||||
];
|
||||
#
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../common/nixos/common.nix
|
||||
../../common/nixos/baremetal.nix
|
||||
../../common/networking/zerotier.nix
|
||||
../../common/editors/emacs.nix
|
||||
../../common/gui/games.nix
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../common/nixos/common.nix
|
||||
../../common/nixos/baremetal.nix
|
||||
../../common/nixos/docker.nix
|
||||
../../common/networking/gluster/client.nix
|
||||
../../common/networking/zerotier.nix
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./zfs.nix
|
||||
../../common/nixos/common.nix
|
||||
../../common/nixos/baremetal.nix
|
||||
../../common/networking/gluster
|
||||
../../common/networking/zerotier.nix
|
||||
../../common/editors/emacs.nix
|
||||
|
|
|
@ -10,19 +10,17 @@
|
|||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./zfs.nix
|
||||
../../common/nixos/common.nix
|
||||
../../common/networking/gluster/client.nix
|
||||
../../common/networking/zerotier.nix
|
||||
../../common/networking/gluster
|
||||
../../common/editors/emacs.nix
|
||||
../../common/nixos/docker.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.systemd-boot.configurationLimit = 10;
|
||||
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
boot.loader.grub.useOSProber = true;
|
||||
networking.hostName = "morbo";
|
||||
|
||||
# Enable networking
|
||||
|
|
|
@ -6,38 +6,20 @@
|
|||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod"];
|
||||
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
boot.kernelParams = ["rcu_nocbs=0-15" "processor.max_cstate=5"]; # Ryzen lockup patches"
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/e31230ab-566c-478f-a078-d2db637696b6";
|
||||
device = "/dev/disk/by-uuid/b8f1e3d1-b2d7-4100-a1af-01b1f63f8e5a";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/042D-AF32";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/var/lib/swapfile";
|
||||
size = 8 * 1024;
|
||||
randomEncryption.enable = true;
|
||||
}
|
||||
];
|
||||
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
memoryPercent = 40;
|
||||
priority = 10;
|
||||
};
|
||||
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
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./zfs.nix
|
||||
../../common/nixos/common.nix
|
||||
../../common/nixos/baremetal.nix
|
||||
../../common/networking/zerotier.nix
|
||||
../../common/networking/gluster
|
||||
../../common/editors/emacs.nix
|
||||
|
|
Loading…
Add table
Reference in a new issue