upgrade to NixOS 22.11

- switch nix config to generator
- temporarily disable subsurface due to insecure qtwebkit dependency
- disable tlp (but keep config) to try out power-profile daemon instead
- bump nixos-hardware revision
This commit is contained in:
Trolli Schmittlauch 2022-12-02 20:00:39 +01:00
parent c3746fceeb
commit 143d9fc8d1
3 changed files with 19 additions and 12 deletions

View file

@ -43,7 +43,13 @@ let
gpx-viewer gpx-viewer
gpxsee gpxsee
cawbird cawbird
subsurface #(subsurface.overrideAttrs (oldAttrs: {
# patches = (if (oldAttrs ? "patches") then oldAttrs.patches else []) ++ [
# pkgs.fetchpatch {
# url = "https://github.com/subsurface/subsurface/commit/944165ea06e2f5edb70d64ce9a0bae4ab21017ba.patch";
# hash = "1111111111111111111111111111111111111111111111111111";
# }];
# }))
yate yate
# split and merge PDFs in a GUI # split and merge PDFs in a GUI
pdfarranger pdfarranger

View file

@ -45,7 +45,7 @@ in
# powermanagement # powermanagement
services.tlp = services.tlp =
{ {
enable = true; enable = false;
settings = { settings = {
"SATA_LINKPWR_ON_BAT" = "medium_power"; "SATA_LINKPWR_ON_BAT" = "medium_power";
"SATA_LINKPWR_ON_AC" = "max_performance"; "SATA_LINKPWR_ON_AC" = "max_performance";
@ -245,14 +245,15 @@ in
boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command) boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
# keep build-time deps around for offline-rebuilding # keep build-time deps around for offline-rebuilding
nix.extraOptions = '' nix.settings = {
keep-outputs = true # keep around all inputs necessary for offline-rebuilding the system
keep-derivations = true keep-outputs = true;
trusted-users = spiollinux keep-derivations = true;
experimental-features = nix-command trusted-users = [ "spiollinux" ];
''; experimental-features = [ "nix-command" "flakes" ];
# use all cores for building # use all cores for building
nix.buildCores = 0; cores = 0;
};
# override tmpdir for daemon # override tmpdir for daemon
#systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; #systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";

View file

@ -11,7 +11,7 @@ in
( (
builtins.fetchGit { builtins.fetchGit {
url = "https://github.com/NixOS/nixos-hardware"; url = "https://github.com/NixOS/nixos-hardware";
rev = "d38958a6aa5bdbf3239f26a04689f3d9ae7da0c0"; rev = "7883883d135ce5b7eae5dce4bfa12262b85c1c46";
} + "/lenovo/thinkpad/t440s" } + "/lenovo/thinkpad/t440s"
) )
]; ];
@ -84,7 +84,7 @@ in
{ device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; } { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; }
]; ];
nix.maxJobs = lib.mkDefault 4; nix.settings.max-jobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.trackpoint = { hardware.trackpoint = {