From e5db869b828447095776f746844a55e0c86fcc6d Mon Sep 17 00:00:00 2001 From: Kabbone Date: Wed, 17 Jul 2024 21:17:50 +0200 Subject: [PATCH] lifebook: smaller fixes --- hosts/configuration_desktop.nix | 2 ++ hosts/lifebook/hardware-configuration.nix | 14 ++++++++++---- modules/themes/wall.jpg | 4 +--- 3 files changed, 13 insertions(+), 7 deletions(-) mode change 100644 => 120000 modules/themes/wall.jpg diff --git a/hosts/configuration_desktop.nix b/hosts/configuration_desktop.nix index 8967750..ea4af88 100644 --- a/hosts/configuration_desktop.nix +++ b/hosts/configuration_desktop.nix @@ -95,6 +95,7 @@ pciutils usbutils wget + file powertop cpufrequtils lm_sensors @@ -117,6 +118,7 @@ btop sbctl ausweisapp + e2fsprogs ]; }; diff --git a/hosts/lifebook/hardware-configuration.nix b/hosts/lifebook/hardware-configuration.nix index 0705a70..c900e88 100644 --- a/hosts/lifebook/hardware-configuration.nix +++ b/hosts/lifebook/hardware-configuration.nix @@ -19,7 +19,7 @@ boot = { initrd = { - availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; kernelModules = [ "i915" "kvm_intel" "vfio_pci" "vfio" "vfio_iommu_type1" ]; systemd.enable = true; luks = { @@ -33,9 +33,9 @@ kernelModules = [ "kvm-intel" ]; kernelParams = [ "luks.options=fido2-device=auto" ]; - extraModprobeConfig = '' - options i915 enable_guc=3 enable_fbc=1 fastboot=1 - ''; +# extraModprobeConfig = '' +# options i915 enable_guc=3 enable_fbc=1 fastboot=1 +# ''; tmp.useTmpfs = false; tmp.cleanOnBoot = true; }; @@ -122,6 +122,12 @@ options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async" ]; }; + fileSystems."/var" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@var,discard=async" ]; + }; + fileSystems."/mnt/snapshots/root" = { device = "/dev/mapper/crypted"; fsType = "btrfs"; diff --git a/modules/themes/wall.jpg b/modules/themes/wall.jpg deleted file mode 100644 index f3d7e5b..0000000 --- a/modules/themes/wall.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a86b5a2db9521724b226fbc3ab5c47db291b99660fe31735297e57a006c3b6dc -size 11973 diff --git a/modules/themes/wall.jpg b/modules/themes/wall.jpg new file mode 120000 index 0000000..84db236 --- /dev/null +++ b/modules/themes/wall.jpg @@ -0,0 +1 @@ +nixos-wallpaper-catppuccin-mocha.svg \ No newline at end of file