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

darwin: build adjustments for 25.05

Browse source
This commit is contained in:
Trolli Schmittlauch 2025-05-20 23:35:11 +02:00
parent 2b06c59dd8
commit f03e5ae52c
2 changed files with 6 additions and 6 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.isDarwin [
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