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
|
# Enable integration with generic Linux OSs
|
||||||
targets.genericLinux.enable = pkgs.stdenv.isLinux;
|
targets.genericLinux.enable = pkgs.stdenv.isLinux;
|
||||||
|
|
||||||
home.packages = with pkgs; let
|
home.packages = with pkgs; [
|
||||||
isOnMac = stdenv.hostPlatform.isDarwin;
|
|
||||||
basePackages = [
|
|
||||||
# Better cat
|
# Better cat
|
||||||
bat
|
bat
|
||||||
# Better find
|
# Better find
|
||||||
@@ -30,12 +28,6 @@
|
|||||||
fira-code-nerdfont
|
fira-code-nerdfont
|
||||||
roboto-mono
|
roboto-mono
|
||||||
];
|
];
|
||||||
macPackages = basePackages ++ [
|
|
||||||
# Emacs on Mac wants prefixed versions of GNU coreutils
|
|
||||||
coreutils-prefixed
|
|
||||||
];
|
|
||||||
in
|
|
||||||
if isOnMac then macPackages else basePackages;
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./modules/fish
|
./modules/fish
|
||||||
|
|||||||
@@ -1,16 +1,18 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with config.lib.file;
|
with config.lib.file;
|
||||||
let dotdir = "${config.home.homeDirectory}/.dotfiles";
|
let dotdir = "${config.home.homeDirectory}/.dotfiles";
|
||||||
|
isOnMac = pkgs.stdenv.hostPlatform.isDarwin;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.emacs.enable = true;
|
programs.emacs.enable = true;
|
||||||
programs.emacs.package = pkgs.emacs;
|
programs.emacs.package = pkgs.emacs;
|
||||||
programs.emacs.extraPackages = epkgs: [ epkgs.vterm ];
|
programs.emacs.extraPackages = epkgs: [ epkgs.vterm ];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; let
|
||||||
# Required by nativeComp but not a dependency for some reason
|
basePackages = [ zstd ];
|
||||||
zstd
|
macPackages = basePackages ++ [ coreutils ];
|
||||||
];
|
in
|
||||||
|
if isOnMac then macPackages else basePackages;
|
||||||
|
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"emacs".source = mkOutOfStoreSymlink "${dotdir}/thoom-emacs";
|
"emacs".source = mkOutOfStoreSymlink "${dotdir}/thoom-emacs";
|
||||||
|
|||||||
@@ -18,6 +18,3 @@
|
|||||||
(exec-path-from-shell-initialize))
|
(exec-path-from-shell-initialize))
|
||||||
|
|
||||||
(elpaca-wait)
|
(elpaca-wait)
|
||||||
|
|
||||||
(when ON-MAC
|
|
||||||
(setq insert-directory-program "gls"))
|
|
||||||
|
|||||||
Reference in New Issue
Block a user