greg/nix-config
1
0
Fork 0
mirror of https://github.com/gburd/nix-config.git synced 2024-07-01 23:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse source
This commit is contained in:
Gregory Burd 2023-09-22 13:25:33 -04:00
parent a378c23746
commit c782210c72
Signed by: greg
GPG key ID: AEFACC3FC495AF89
3 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
NOTES
View file

@ -26,7 +26,7 @@ export device=/dev/nvme0n1
export hostname=floki
wipefs/shread/scrub ${device}
printf "label: gpt\n,550M,U\n,,L\n" | sfdisk ${device}
mkfs.fat -L boot -F 32 ${device}
mkfs.fat -L ESP -F 32 ${device}
cryptsetup --verify-passphrase -v luksFormat --label "${hostname}_crypt" "${device}p2"
cryptsetup open "${device}p2" "${hostname}_crypt"
mkfs.btrfs -L ${hostname} /dev/mapper/"${hostname}_crypt"
@ -92,3 +92,23 @@ clear; sudo nixos-rebuild dry-activate --flake .#${hostname}
services.pcscd.enable = true;
https://mt-caret.github.io/blog/posts/2020-06-29-optin-state.html
------------------------------------------
building the system configuration...
warning: Git tree '/home/gburd/ws/nix-config' is dirty
trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05
trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05
trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05
would stop the following units: ModemManager.service, NetworkManager-wait-online.service, NetworkManager.service, accounts-daemon.service, alsa-store.service, audit.service, avahi-daemon.service, avahi-daemon.socket, bluetooth.service, bolt.service, colord.service, cpufreq.service, kmod-static-nodes.service, logrotate-checkconf.service, mount-pstore.service, network-local-commands.service, network-setup.service, nscd.service, power-profiles-daemon.service, resolvconf.service, rtkit-daemon.service, systemd-machined.service, systemd-modules-load.service, systemd-oomd.service, systemd-oomd.socket, systemd-sysctl.service, systemd-timesyncd.service, systemd-udevd-control.socket, systemd-udevd-kernel.socket, systemd-udevd.service, systemd-update-done.service, udisks2.service, upower.service, wpa_supplicant.service
would NOT stop the following changed units: display-manager.service, getty@tty1.service, systemd-backlight@backlight:intel_backlight.service, systemd-backlight@leds:tpacpi::kbd_backlight.service, systemd-fsck@dev-disk-by\x2duuid-3D04\x2d3716.service, systemd-journal-flush.service, systemd-logind.service, systemd-random-seed.service, systemd-remount-fs.service, systemd-update-utmp.service, systemd-user-sessions.service, user-runtime-dir@1000.service, user@1000.service
would activate the configuration...
sops-install-secrets: Imported /persist/etc/ssh/ssh_host_ed25519_key as age key with fingerprint age1z2x0g05q2erpux006vwhul70d8akj9avrj67s9p27fm4ce32ly8qt8nllz
warning: password file ‘/run/secrets-for-users/gburd-password’ does not exist
would restart systemd
would reload the following units: dbus.service, firewall.service, persist.mount, reload-systemd-vconsole-setup.service
would restart the following units: nix-daemon.service, polkit.service, sshd.service, systemd-journald.service
would start the following units: ModemManager.service, NetworkManager-wait-online.service, NetworkManager.service, accounts-daemon.service, audit.service, avahi-daemon.socket, bluetooth.service, bolt.service, colord.service, cpufreq.service, kmod-static-nodes.service, logrotate-checkconf.service, mount-pstore.service, network-local-commands.service, network-setup.service, nscd.service, power-profiles-daemon.service, resolvconf.service, rtkit-daemon.service, systemd-machined.service, systemd-modules-load.service, systemd-oomd.socket, systemd-sysctl.service, systemd-timesyncd.service, systemd-udevd-control.socket, systemd-udevd-kernel.socket, systemd-update-done.service, udisks2.service, upower.service, wpa_supplicant.service
[nix-shell:~/ws/nix-config]$ clear; sudo nixos-rebuild dry-activate --flake .#floki

19
hosts/common/optional/btrfs.nix
View file

@ -1,16 +1,11 @@
{ lib, config, ... }:
{
boot.initrd = {
supportedFilesystems = [ "btrfs" ];
}
fileSystems."/" =
{ device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" ];
};
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/470152b6-16cc-4dcf-b1e9-c684c1589e33";
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
fsType = "btrfs";
@ -21,6 +16,7 @@
{ device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
fsType = "btrfs";
options = [ "subvol=persist" "noatime" "compression=zstd" ];
neededForBoot = true;
};
fileSystems."/var/logs" =
@ -30,17 +26,4 @@
neededForBoot = true;
};
fileSystems."/swap" =
{ device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
fsType = "btrfs";
options = [ "subvol=swap" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/3D04-3716";
fsType = "vfat";
};
swapDevices = [ ];
}

19
hosts/floki/hardware-configuration.nix
View file

@ -19,12 +19,23 @@
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/470152b6-16cc-4dcf-b1e9-c684c1589e33";
fileSystems = {
"/boot" = {
device = "/dev/disk/by-label/ESP";
fileSystems."/swap" =
{ device = "/dev/disk/by-uuid/bf75af76-49b0-41fa-a4e5-9a52a6a0a667";
fsType = "btrfs";
options = [ "subvol=swap" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/3D04-3716";
fsType = "vfat";
};
};
# fileSystems = {
# "/boot" = {
# device = "/dev/disk/by-label/ESP";
# fsType = "vfat";
# };
# };
swapDevices = [{
device = "/swap/swapfile";