From 5a8b5a29a2ea381cfceb7018242ed7a15e7e29d4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:35:11 +0200 Subject: [PATCH 1/5] darwin: build adjustments for 25.05 --- darwin/configuration.nix | 5 +---- home/modules/packages.nix | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index fc577ec..307836f 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -4,7 +4,6 @@ imports = [ ../common/nix-settings.nix ]; nix = { enable = true; - package = pkgs.nixVersions.nix_2_25; settings = { trusted-users = [ "os" @@ -21,9 +20,6 @@ }; }; - # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; - # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; @@ -38,6 +34,7 @@ # system-wide SSH configuration, used by nix-daemon for remote builders # show hidden files + system.primaryUser = "os"; system.defaults.NSGlobalDomain.AppleShowAllFiles = true; # Used for backwards compatibility, please read the changelog before changing. diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1544646..fbb757d 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -17,16 +17,19 @@ let inkscape darktable exiftool - gimp3 ] ++ (with gimp3Plugins; [ #fourier # broken #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ + gimp3 hugin #luminanceHDR # FIXME, build failure xournalpp + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + gimp ]; multimediaApps = @@ -142,7 +145,6 @@ let desktopCommon = [ keepassxc - tigervnc ]; desktopLinux = [ @@ -171,6 +173,7 @@ let mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) + tigervnc pdfpc nheko gpxsee From 62e5c673c500e3fbf14e0d84a3730025d8624dc4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:54:35 +0200 Subject: [PATCH 2/5] thinknix: disable broken tpm tpm tpm0: A TPM error (714) occurred attempting to create NULL primary tpm tpm0: null key creation failed with 714 --- hosts/thinknix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/thinknix/default.nix b/hosts/thinknix/default.nix index 431f3ba..92abe46 100644 --- a/hosts/thinknix/default.nix +++ b/hosts/thinknix/default.nix @@ -33,4 +33,7 @@ # servers. You should change this only after NixOS release notes say you # should. system.stateVersion = "18.09"; # Did you read the comment? + + # since 25.05, this broke and started to slow down system startup. tpm is currently not utilised on this host, so simply disable. + security.tpm2.enable = false; } From 1b3a130561e8f46fb47512018e2097dcc4a4976f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:56:37 +0200 Subject: [PATCH 3/5] thinknix: do not use powersave CPU governor powersave turns out to be rather slow on today's software stacks --- hosts/thinknix/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index e60ac46..74708b5 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -21,7 +21,6 @@ boot.extraModulePackages = [ ]; nix.settings.max-jobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # modesetting is always better than intel (legacy) services.xserver.videoDrivers = [ "modesetting" ]; From f03e5ae52caf38cb8a070177f56fc372c276e829 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:35:11 +0200 Subject: [PATCH 4/5] darwin: build adjustments for 25.05 --- darwin/configuration.nix | 5 +---- home/modules/packages.nix | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index fc577ec..307836f 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -4,7 +4,6 @@ imports = [ ../common/nix-settings.nix ]; nix = { enable = true; - package = pkgs.nixVersions.nix_2_25; settings = { trusted-users = [ "os" @@ -21,9 +20,6 @@ }; }; - # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; - # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; @@ -38,6 +34,7 @@ # system-wide SSH configuration, used by nix-daemon for remote builders # show hidden files + system.primaryUser = "os"; system.defaults.NSGlobalDomain.AppleShowAllFiles = true; # Used for backwards compatibility, please read the changelog before changing. diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1544646..e32b0e1 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -17,16 +17,19 @@ let inkscape darktable exiftool - gimp3 ] ++ (with gimp3Plugins; [ #fourier # broken #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ + gimp3 hugin #luminanceHDR # FIXME, build failure xournalpp + ] + ++ lib.optionals pkgs.stdenv.isDarwin [ + gimp ]; multimediaApps = @@ -142,7 +145,6 @@ let desktopCommon = [ keepassxc - tigervnc ]; desktopLinux = [ @@ -171,6 +173,7 @@ let mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) + tigervnc pdfpc nheko gpxsee From 603411fa64eabe351279ea210aec2e2d03977105 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:56:37 +0200 Subject: [PATCH 5/5] thinknix: do not use powersave CPU governor powersave turns out to be rather slow on today's software stacks --- hosts/thinknix/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index e60ac46..74708b5 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -21,7 +21,6 @@ boot.extraModulePackages = [ ]; nix.settings.max-jobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # modesetting is always better than intel (legacy) services.xserver.videoDrivers = [ "modesetting" ];