fix base role on darwin
2 files changed, 17 insertions(+), 9 deletions(-)
M system/settings/programs/base.nix → system/settings/programs/base.nix
@@ -1,4 +1,8 @@ -{ pkgs, ... }: +{ + pkgs, + lib, + ... +}: { environment.systemPackages = with pkgs;@@ -12,13 +16,15 @@ ++ (lib.optionals (stdenv.isLinux) [ psmisc ]); - programs.htop = { - enable = true; - settings = { - header_margin = 0; - tree_view = true; - hide_userland_threads = true; - hide_kernel_threads = true; + programs = lib.optionalAttrs pkgs.stdenv.isLinux { + htop = { + enable = true; + settings = { + header_margin = 0; + tree_view = true; + hide_userland_threads = true; + hide_kernel_threads = true; + }; }; };
M system/settings/programs/shell.nix → system/settings/programs/shell.nix
@@ -13,5 +13,7 @@ interactiveShellInit = '' set --universal fish_greeting "" ''; }; - users.defaultUserShell = config.programs.fish.package; + users = lib.optionalAttrs pkgs.stdenv.isLinux { + defaultUserShell = config.programs.fish.package; + }; }