Install unprefixed coreutils on Mac for the sake of dired
This commit is contained in:
10
nix/home.nix
10
nix/home.nix
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -18,6 +18,3 @@
|
||||
(exec-path-from-shell-initialize))
|
||||
|
||||
(elpaca-wait)
|
||||
|
||||
(when ON-MAC
|
||||
(setq insert-directory-program "gls"))
|
||||
|
||||
Reference in New Issue
Block a user