Install unprefixed coreutils on Mac for the sake of dired

This commit is contained in:
2024-09-15 20:39:41 -07:00
parent 0f64c9a2d0
commit c3fb58e245
3 changed files with 22 additions and 31 deletions

View File

@@ -12,9 +12,7 @@
# Enable integration with generic Linux OSs
targets.genericLinux.enable = pkgs.stdenv.isLinux;
home.packages = with pkgs; let
isOnMac = stdenv.hostPlatform.isDarwin;
basePackages = [
home.packages = with pkgs; [
# Better cat
bat
# Better find
@@ -30,12 +28,6 @@
fira-code-nerdfont
roboto-mono
];
macPackages = basePackages ++ [
# Emacs on Mac wants prefixed versions of GNU coreutils
coreutils-prefixed
];
in
if isOnMac then macPackages else basePackages;
imports = [
./modules/fish

View File

@@ -1,16 +1,18 @@
{ config, lib, pkgs, ... }:
with config.lib.file;
let dotdir = "${config.home.homeDirectory}/.dotfiles";
isOnMac = pkgs.stdenv.hostPlatform.isDarwin;
in
{
programs.emacs.enable = true;
programs.emacs.package = pkgs.emacs;
programs.emacs.extraPackages = epkgs: [ epkgs.vterm ];
home.packages = with pkgs; [
# Required by nativeComp but not a dependency for some reason
zstd
];
home.packages = with pkgs; let
basePackages = [ zstd ];
macPackages = basePackages ++ [ coreutils ];
in
if isOnMac then macPackages else basePackages;
xdg.configFile = {
"emacs".source = mkOutOfStoreSymlink "${dotdir}/thoom-emacs";

View File

@@ -18,6 +18,3 @@
(exec-path-from-shell-initialize))
(elpaca-wait)
(when ON-MAC
(setq insert-directory-program "gls"))