From 18f26eb09a3b38a2b6e34d9a86b0d6e820b90599 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Mon, 2 May 2022 17:02:36 -0400
Subject: [PATCH] Fix path issues and use gnu coreutils on darwin

---
 darwin-modules/base.nix | 16 ++++++++++++++--
 flake.nix               |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/darwin-modules/base.nix b/darwin-modules/base.nix
index 37ac035..8ce0415 100644
--- a/darwin-modules/base.nix
+++ b/darwin-modules/base.nix
@@ -3,9 +3,10 @@
 {
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
-  environment.systemPackages =
+  environment.systemPackages = with pkgs;
     [
-      pkgs.vim
+      openssh
+      coreutils-full
     ];
 
   # Use a custom configuration.nix location.
@@ -18,6 +19,17 @@
   # Create /etc/bashrc that loads the nix-darwin environment.
   programs.zsh.enable = true; # default shell on catalina
   programs.fish.enable = true;
+  # Give nix packages higher priority than system packages in fish
+  programs.fish.shellInit = ''
+    for p in /run/current-system/sw/bin
+      if not contains $p $fish_user_paths
+        set -g fish_user_paths $p $fish_user_paths
+      end
+    end
+  '';
+
+  # Make nix managed fonts work on macos
+  fonts.fontDir.enable = true;
 
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
diff --git a/flake.nix b/flake.nix
index 3dd5bed..f4d9af0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -151,6 +151,7 @@
           modules = baseModules ++ [
             ./darwin-modules/base.nix
             home-manager.darwinModules.home-manager
+            ./modules/fonts.nix
             ./home.nix
             ./darwin-modules/gpg.nix
             ./applications/devel-core.nix