lgmrszd/nix-cfg
1
0
Fork 0
mirror of https://git.lgmrszd.xyz/Lgmrszd/nix-cfg.git synced 2025-12-13 23:28:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

laptop: enable removable boot

Browse source
This commit is contained in:
Lgmrszd 2025-02-23 15:37:57 +04:00
parent 6752f29b5e
commit 3386acbc11
No known key found for this signature in database
GPG key ID: 9396B8BA6FBB14DE
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hosts/laptop/configuration.nix
View file

@ -20,7 +20,7 @@ in
# https://nixos.org/manual/nixos/stable/#sec-installation # https://nixos.org/manual/nixos/stable/#sec-installation
# boot.loader.efi.efiSysMountPoint = "/boot"; # boot.loader.efi.efiSysMountPoint = "/boot";
boot.loader.systemd-boot.enable = false; boot.loader.systemd-boot.enable = false;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = false;
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;
device = "nodev"; device = "nodev";
@ -31,7 +31,8 @@ in
rev = "803c5df0e83aba61668777bb96d90ab8f6847106"; rev = "803c5df0e83aba61668777bb96d90ab8f6847106";
hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0="; hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
}}/src/catppuccin-macchiato-grub-theme/"; }}/src/catppuccin-macchiato-grub-theme/";
efiInstallAsRemovable = false; efiInstallAsRemovable = true;
extraPerEntryConfig = "acpi ($drive1)//dsdt.aml";
# useOSProber = true; # useOSProber = true;
extraEntries = extraEntries =
'' ''
@ -90,7 +91,8 @@ in
# boot.initrd.luks.fido2Support = true; # boot.initrd.luks.fido2Support = true;
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
crypted = { crypted = {
device = "/dev/disk/by-path/pci-0000:02:00.0-nvme-1"; # device = "/dev/disk/by-path/pci-0000:02:00.0-nvme-1";
device = "/dev/disk/by-label/NixCryptRoot";
preLVM = true; preLVM = true;
crypttabExtraOpts = [ "fido2-device=auto" "token-timeout=10s" ]; crypttabExtraOpts = [ "fido2-device=auto" "token-timeout=10s" ];
# fido2.credential = ""; # fido2.credential = "";

8
hosts/laptop/hardware-configuration.nix
View file

@ -13,7 +13,7 @@ in
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "ahci" "nvme" "usbhid" "uas" "usb_storage" ];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -37,8 +37,9 @@ in
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/12CE-A600"; { device = "/dev/disk/by-uuid/E095-34D8";
fsType = "vfat"; fsType = "vfat";
options = [ "noauto" ];
}; };
swapDevices = swapDevices =
@ -50,10 +51,7 @@ in
# 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.enp4s0f1.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }