Compare commits

..

No commits in common. "afd2b6a63df0972ac0d10102ae3806f77cd42ad5" and "b72a3eb24c026eb974e18d68893b59f566cde170" have entirely different histories.

4 changed files with 4 additions and 28 deletions

View File

@ -195,6 +195,6 @@
# enable = true; # enable = true;
# channel = "https://nixos.org/channels/nixos-unstable"; # channel = "https://nixos.org/channels/nixos-unstable";
# }; # };
stateVersion = "23.05"; stateVersion = "22.05";
}; };
} }

View File

@ -21,8 +21,7 @@
boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ]; boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.tmp.useTmpfs = false; boot.tmp.useTmpfs = true;
boot.tmp.cleanOnBoot = true;
zramSwap.enable = true; zramSwap.enable = true;
services.btrfs.autoScrub = { services.btrfs.autoScrub = {
@ -83,12 +82,6 @@
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ]; options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
}; };
fileSystems."/swap" =
{ device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs";
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
};
fileSystems."/mnt/snapshots/root" = fileSystems."/mnt/snapshots/root" =
{ device = "/dev/disk/by-label/NIXROOT"; { device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs"; fsType = "btrfs";
@ -113,7 +106,7 @@
}; };
swapDevices = [ { device = "/swap/swapfile"; } ]; swapDevices = [ ];
networking = { networking = {
vswitches = { vswitches = {

View File

@ -1,17 +0,0 @@
{ lib, config, pkgs, ... }:
# NFSv4 fix for 6.5.3 and 6.1.53, remove asap
let
version = config.boot.kernelPackages.kernel.version;
badVersions = [ "6.5.3" "6.1.53" ];
in
lib.mkIf (lib.any (v: v == version) badVersions) {
boot.kernelPatches = [{
name = "nfs4-patch";
patch = pkgs.fetchpatch {
url = "https://patchwork.kernel.org/project/selinux/patch/20230911142358.883728-1-omosnace@redhat.com/raw/";
hash = "sha256-m947t39xr4VqJBZ2mYTFq9Up/NWlwueH8aXFZRQwA7c=";
};
}];
}

View File

@ -103,7 +103,7 @@
size = 16; size = 16;
gtk.enable = true; gtk.enable = true;
}; };
stateVersion = "23.05"; stateVersion = "22.05";
}; };
programs = { programs = {