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

framework-2024-11-25-00-02-03

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-11-25 00:02:03 +01:00
parent fe9beaa67b
commit a0f0e1a1f8
12 changed files with 103 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
machine/framework/configuration.nix
View File

@ -8,26 +8,13 @@
}: let
be = import ../../configs/borg-exclude.nix;
in {
nixpkgs = {
overlays = [
outputs.overlays.additions
];
config = {
allowUnfree = true;
# packageOverrides = pkgs: {
# intel-vaapi-driver =
# pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
# };
};
};
imports = [
./hardware-configuration.nix
../../configs/browser.nix
../../configs/common.nix
../../configs/docker.nix
../../configs/games.nix
../../configs/virtualisation.nix
../../configs/virtualization.nix
../../configs/plasma.nix
../../configs/user-gui.nix
../../configs/user.nix
@ -70,19 +57,7 @@ in {
# };
boot = {
loader = {
grub = {
enable = true;
efiSupport = true;
device = "nodev";
configurationLimit = 5;
# enableCryptodisk = true;
};
efi = {canTouchEfiVariables = true;};
};
tmp.useTmpfs = false;
supportedFilesystems = ["btrfs"];
kernelPackages = pkgs.linuxPackages_6_11;
initrd = {
@ -93,45 +68,6 @@ in {
preLVM = true;
};
};
postDeviceCommands = pkgs.lib.mkBefore ''
mkdir -p /mnt
# We first mount the btrfs root to /mnt
# so we can manipulate btrfs subvolumes.
mount -o subvol=/ /dev/mapper/lvm-root /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
'';
};
};
@ -225,7 +161,7 @@ in {
borgbackup.jobs.home = rec {
repo = "ssh://u278697-sub9@u278697.your-storagebox.de:23/./borg";
compression = "auto,zstd";
encryption = {
mode = "repokey-blake2";
@ -293,21 +229,8 @@ in {
"/etc/NetworkManager/system-connections"
# "/var/lib/bluetooth"
"/var/lib/docker"
"/var/lib/nixos"
# "/var/lib/samba"
"/var/lib/sddm"
# "/var/lib/systemd/rfkill"
"/var/lib/tailscale"
"/var/lib/tuptime"
"/var/lib/vnstat"
];
files = [
"/etc/machine-id"
"/etc/NIXOS"
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_ed25519_key.pub"
"/etc/ssh/ssh_host_rsa_key"
"/etc/ssh/ssh_host_rsa_key.pub"
];
};
};