schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:603411fa64eabe351279ea210aec2e2d03977105
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
...
compare: schmittlauch:1b3a130561e8f46fb47512018e2097dcc4a4976f
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

3 commits
603411fa64 ... 1b3a130561

Author SHA1 Message Date
Trolli Schmittlauch
1b3a130561 thinknix: do not use powersave CPU governor 
powersave turns out to be rather slow on today's software stacks
 2025-05-20 23:56:37 +02:00
Trolli Schmittlauch
62e5c673c5 thinknix: disable broken tpm 
tpm tpm0: A TPM error (714) occurred
attempting to create NULL primary
tpm tpm0: null key creation failed with
714
 2025-05-20 23:54:35 +02:00
Trolli Schmittlauch
5a8b5a29a2 darwin: build adjustments for 25.05 2025-05-20 23:35:11 +02:00
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
darwin/configuration.nix
View file

@ -4,7 +4,6 @@
imports = [ ../common/nix-settings.nix ]; imports = [ ../common/nix-settings.nix ];
nix = { nix = {
enable = true; enable = true;
package = pkgs.nixVersions.nix_2_25;
settings = { settings = {
trusted-users = [ trusted-users = [
"os" "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: # List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
environment.systemPackages = [ pkgs.vim ]; environment.systemPackages = [ pkgs.vim ];
@ -38,6 +34,7 @@
# system-wide SSH configuration, used by nix-daemon for remote builders # system-wide SSH configuration, used by nix-daemon for remote builders
# show hidden files # show hidden files
system.primaryUser = "os";
system.defaults.NSGlobalDomain.AppleShowAllFiles = true; system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
# Used for backwards compatibility, please read the changelog before changing. # Used for backwards compatibility, please read the changelog before changing.

7
home/modules/packages.nix
View file

@ -17,16 +17,19 @@ let
inkscape inkscape
darktable darktable
exiftool exiftool
gimp3
] ]
++ (with gimp3Plugins; [ ++ (with gimp3Plugins; [
#fourier # broken #fourier # broken
#lqrPlugin # broken #lqrPlugin # broken
]) ])
++ lib.optionals pkgs.stdenv.isLinux [ ++ lib.optionals pkgs.stdenv.isLinux [
gimp3
hugin hugin
#luminanceHDR # FIXME, build failure #luminanceHDR # FIXME, build failure
xournalpp xournalpp
]
++ lib.optionals pkgs.stdenv.isLinux [
gimp
]; ];
multimediaApps = multimediaApps =
@ -142,7 +145,6 @@ let
desktopCommon = [ desktopCommon = [
keepassxc keepassxc
tigervnc
]; ];
desktopLinux = [ desktopLinux = [
@ -171,6 +173,7 @@ let
mediaSupport = true; mediaSupport = true;
pulseaudioSupport = pkgs.stdenv.isLinux; pulseaudioSupport = pkgs.stdenv.isLinux;
}) })
tigervnc
pdfpc pdfpc
nheko nheko
gpxsee gpxsee

3
hosts/thinknix/default.nix
View file

@ -33,4 +33,7 @@
# servers. You should change this only after NixOS release notes say you # servers. You should change this only after NixOS release notes say you
# should. # should.
system.stateVersion = "18.09"; # Did you read the comment? 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;
} }

1
hosts/thinknix/hardware-configuration.nix
View file

@ -21,7 +21,6 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
nix.settings.max-jobs = lib.mkDefault 4; nix.settings.max-jobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
# modesetting is always better than intel (legacy) # modesetting is always better than intel (legacy)
services.xserver.videoDrivers = [ "modesetting" ]; services.xserver.videoDrivers = [ "modesetting" ];