BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos-virtualbox-2025-01-06-22-20-04

Browse Source
This commit is contained in:
Alexander Szczepanski
2025-01-06 22:20:04 +01:00
parent 13714539c9
commit 2400313d72
9 changed files with 216 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
configs/filesystem.nix Normal file
View File

@ -0,0 +1,65 @@
{
fileSystems = {
"/" = {
fsType = "btrfs";
options = [
"subvol=root"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
};
"/home" = {
fsType = "btrfs";
options = [
"subvol=home"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
};
"/nix" = {
fsType = "btrfs";
options = [
"subvol=nix"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
};
"/persist" = {
fsType = "btrfs";
options = [
"subvol=persist"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
neededForBoot = true;
};
"/var/log" = {
fsType = "btrfs";
options = [
"subvol=log"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
neededForBoot = true;
};
"/boot" = {
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
};
};

12
flake.nix
View File

@ -137,12 +137,22 @@
./machine/nixos-vm/configuration.nix ./machine/nixos-vm/configuration.nix
]; ];
}; };
nixos-virtualbox = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
inputs.sops-nix.nixosModules.sops
impermanence.nixosModules.impermanence
./machine/nixos-virtualbox/configuration.nix
];
};
}; };
darwinConfigurations."MacBook" = nix-darwin.lib.darwinSystem { darwinConfigurations."MacBook" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = [ modules = [
./machine/macbook/configuration.nix ./machine/macbook/configuration.nix
# home-manager.darwinModules.home-manager # home-manager.darwinModules.home-manager
# { # {
# home-manager.useGlobalPkgs = true; # home-manager.useGlobalPkgs = true;

45
machine/desktop/hardware-configuration.nix
View File

@ -7,75 +7,32 @@
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
../../configs/filesystem.nix
]; ];
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad"; device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad";
fsType = "btrfs";
options = [
"subvol=root"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
}; };
"/home" = { "/home" = {
device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad"; device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad";
fsType = "btrfs";
options = [
"subvol=home"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
}; };
"/nix" = { "/nix" = {
device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad"; device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad";
fsType = "btrfs";
options = [
"subvol=nix"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
}; };
"/persist" = { "/persist" = {
device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad"; device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad";
fsType = "btrfs";
options = [
"subvol=persist"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
neededForBoot = true;
}; };
"/var/log" = { "/var/log" = {
device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad"; device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad";
fsType = "btrfs";
options = [
"subvol=log"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
];
neededForBoot = true;
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/4339-5A4C"; device = "/dev/disk/by-uuid/4339-5A4C";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
}; };
}; };

5
machine/framework/hardware-configuration.nix
View File

@ -29,11 +29,6 @@
"noatime" "noatime"
]; ];
}; };
# "/" = {
# device = "none";
# fsType = "tmpfs";
# options = ["defaults" "size=16G" "mode=755"];
# };
"/home" = { "/home" = {
device = "/dev/disk/by-uuid/20780bfe-5714-4c2f-bf53-7296b76cfbdc"; device = "/dev/disk/by-uuid/20780bfe-5714-4c2f-bf53-7296b76cfbdc";
fsType = "btrfs"; fsType = "btrfs";

17
machine/mini/hardware-configuration.nix
View File

@ -1,10 +1,5 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ {
config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {
@ -12,10 +7,14 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; boot = {
boot.initrd.kernelModules = ["dm-snapshot"]; initrd = {
boot.kernelModules = ["kvm-intel"]; availableKernelModules = ["ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
boot.extraModulePackages = []; kernelModules = ["dm-snapshot"];
};
kernelModules = ["kvm-intel"];
};
fileSystems = { fileSystems = {
"/" = { "/" = {

68
machine/nixos-virtualbox/configuration.nix
View File

@ -17,7 +17,6 @@
validateSopsFiles = true; validateSopsFiles = true;
age = { age = {
sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"]; sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
keyFile = "/var/lib/sops-nix/key.txt";
generateKey = true; generateKey = true;
}; };
}; };
@ -27,7 +26,43 @@
boot = { boot = {
initrd = { initrd = {
enable = true; enable = true;
supportedFilesystems = ["btrfs"]; postResumeCommands = lib.mkAfter ''
mkdir -p /mnt
# We first mount the btrfs root to /mnt
# so we can manipulate btrfs subvolumes.
mount -o subvol=/ /dev/sda2 /mnt
# While we're tempted to just delete /root and create
# a new snapshot from /root-blank, /root is already
# populated at this point with a number of subvolumes,
# which makes `btrfs subvolume delete` fail.
# So, we remove them first.
#
# /root contains subvolumes:
# - /root/var/lib/portables
# - /root/var/lib/machines
#
# I suspect these are related to systemd-nspawn, but
# since I don't use it I'm not 100% sure.
# Anyhow, deleting these subvolumes hasn't resulted
# in any issues so far, except for fairly
# benign-looking errors from systemd-tmpfiles.
btrfs subvolume list -o /mnt/root |
cut -f9 -d' ' |
while read subvolume; do
echo "deleting /$subvolume subvolume..."
btrfs subvolume delete "/mnt/$subvolume"
done &&
echo "deleting /root subvolume..." &&
btrfs subvolume delete /mnt/root
echo "restoring blank /root subvolume..."
btrfs subvolume snapshot /mnt/root-blank /mnt/root
# Once we're done rolling back to a blank snapshot,
# we can unmount /mnt and continue on the boot process.
umount /mnt
'';
}; };
}; };
@ -36,14 +71,31 @@
hostName = "nixos-virtualbox"; # Define your hostname. hostName = "nixos-virtualbox"; # Define your hostname.
}; };
nix.settings = {
system-features = [
"nixos-test"
"benchmark"
"big-parallel"
"gccarch-znver3"
];
trusted-substituters = ["https://ai.cachix.org"];
trusted-public-keys = ["ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="];
};
# nixpkgs.localSystem = {
# gcc.arch = "znver3";
# gcc.tune = "znver3";
# system = "x86_64-linux";
# };
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
# services = { services = {
# k3s = { # k3s = {
# enable = true; # enable = true;
# role = "server"; # role = "server";
# }; # };
# }; };
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }

76
machine/nixos-virtualbox/hardware-configuration.nix
View File

@ -1,56 +1,48 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ {
config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {
imports = [];
boot.initrd.availableKernelModules = ["ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod"]; boot.initrd.availableKernelModules = ["ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems."/" = { fileSystems = {
device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964"; "/" = {
fsType = "btrfs"; device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964";
options = ["subvol=root" "compress=zstd" "noatime"]; fsType = "btrfs";
}; options = ["subvol=root" "compress=zstd" "noatime"];
};
fileSystems."/home" = { "/home" = {
device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964"; device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=home" "compress=zstd" "noatime"]; options = ["subvol=home" "compress=zstd" "noatime"];
}; };
fileSystems."/nix" = { "/nix" = {
device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964"; device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=nix" "compress=zstd" "noatime"]; options = ["subvol=nix" "compress=zstd" "noatime"];
}; };
fileSystems."/persist" = { "/persist" = {
device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964"; device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=persist" "compress=zstd" "noatime"]; options = ["subvol=persist" "compress=zstd" "noatime"];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/var/log" = { "/var/log" = {
device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964"; device = "/dev/disk/by-uuid/3719ec05-eb90-455f-98c0-0313c0bcb964";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=log" "compress=zstd" "noatime"]; options = ["subvol=log" "compress=zstd" "noatime"];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/6F47-35E9"; device = "/dev/disk/by-uuid/6F47-35E9";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = ["fmask=0022" "dmask=0022"];
};
}; };
swapDevices = []; swapDevices = [];
@ -62,6 +54,6 @@
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s3.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s3.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; # nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
virtualisation.virtualbox.guest.enable = true; virtualisation.virtualbox.guest.enable = true;
} }

1
machine/thinkpad/hardware-configuration.nix
View File

@ -15,7 +15,6 @@
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = ["dm-snapshot"]; boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/6de51510-623b-4ae4-b0ba-a319057eb6ea"; device = "/dev/disk/by-uuid/6de51510-623b-4ae4-b0ba-a319057eb6ea";

81
machine/vps-arm/hardware-configuration.nix
View File

@ -1,8 +1,4 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ {
config,
lib, lib,
pkgs, pkgs,
modulesPath, modulesPath,
@ -12,57 +8,54 @@
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "virtio_scsi" "sr_mod"]; boot.initrd = {
boot.initrd.kernelModules = ["dm-snapshot"]; availableKernelModules = ["xhci_pci" "virtio_scsi" "sr_mod"];
boot.kernelModules = []; kernelModules = ["dm-snapshot"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs";
options = ["subvol=root"];
}; };
fileSystems."/home" = { fileSystems = {
device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917"; "/" = {
fsType = "btrfs"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
options = ["subvol=home"]; fsType = "btrfs";
}; options = ["subvol=root"];
};
fileSystems."/nix" = { "/home" = {
device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=nix"]; options = ["subvol=home"];
}; };
fileSystems."/persist" = { "/nix" = {
device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=persist"]; options = ["subvol=nix"];
neededForBoot = true; };
};
fileSystems."/var/log" = { "/persist" = {
device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=log"]; options = ["subvol=persist"];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/boot" = { "/var/log" = {
device = "/dev/disk/by-uuid/DE94-E9C1"; device = "/dev/disk/by-uuid/224bc309-572c-4771-b66e-25d5e13c4917";
fsType = "vfat"; fsType = "btrfs";
options = ["fmask=0022" "dmask=0022"]; options = ["subvol=log"];
}; neededForBoot = true;
};
"/boot" = {
device = "/dev/disk/by-uuid/DE94-E9C1";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
};
swapDevices = [ swapDevices = [
{device = "/dev/disk/by-uuid/3c63b075-76ca-403f-bf75-53269b6bf4fa";} {device = "/dev/disk/by-uuid/3c63b075-76ca-403f-bf75-53269b6bf4fa";}
]; ];
# 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.useDHCP = lib.mkDefault true;
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;