Consolidate shellcommon and terminal

home/shellcommon.nix

@@ -1,15 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  home.shellAliases = {
-    e = "nvim";
-    g = "git";
-    lg = "lazygit";
-    l = lib.getExe pkgs.exa;
-  };
-
-  # Until https://github.com/nix-community/home-manager/pull/3529
-  # programs.nushell.extraConfig =
-  #  lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: "alias ${k} = ${v} ") config.home.shellAliases);
-}
-

home/terminal.nix

@@ -1,18 +1,26 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   # Key packages required on nixos and macos
   home.packages = with pkgs; [
     # Unixy tools
-    gnumake
     ripgrep
-    htop
+    fd
+
+    # Useful for Nix development
     nix-output-monitor
     devour-flake
     nil
     nixpkgs-fmt
   ];
 
+  home.shellAliases = {
+    e = "nvim";
+    g = "git";
+    lg = "lazygit";
+    l = lib.getExe pkgs.exa;
+  };
+
   programs = {
     bat.enable = true;
     autojump.enable = false;
@@ -20,5 +28,6 @@
     fzf.enable = true;
     jq.enable = true;
     nix-index.enable = true;
+    htop.enable = true;
   };
 }

nix-darwin/default.nix

@@ -7,7 +7,7 @@
         home-manager.users.${config.people.myself} = { pkgs, ... }: {
           imports = [
             self.homeModules.common-darwin
-            ../home/shellcommon.nix
+            ../home/terminal.nix
             ../home/git.nix
           ];
         };

nixos/default.nix

@@ -15,7 +15,7 @@ in
   flake = {
     nixosModules = {
       myself = mkHomeModule config.people.myself [
-        ../home/shellcommon.nix
+        ../home/terminal.nix
       ];
       default.imports = [
         self.nixosModules.home-manager