From 19742e7790d31e5c0c36fd0d08b07fb958009464 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Thu, 5 Mar 2020 15:02:23 +0000
Subject: [PATCH] Add programs to home-manager

Support commonly used programs like fd, exa, bat, etc.

For now, I'm unsure how to manage the programs in my emacs/default.nix with my
home.nix. I'll wait until I have a stronger opinion to handle this.
---
 README.md                               |  6 ------
 configs/shared/.config/nixpkgs/home.nix | 22 ++++++++++++++++++----
 emacs/default.nix                       | 10 ----------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index fe3ee5779..3f1b44812 100644
--- a/README.md
+++ b/README.md
@@ -95,16 +95,10 @@ Missing the following dependencies:
 
 - `stow`
 - `neovim`
-- `bat`
-- `exa`
 - `fasd`
 - `opam`
 - `ghcup`
-- `ripgrep`
-- `fzf`
-- `fd`
 - `hub`
-- `pass`
 
 ```bash
 $ cd ~/Dropbox/dotfiles
diff --git a/configs/shared/.config/nixpkgs/home.nix b/configs/shared/.config/nixpkgs/home.nix
index 63bdf047b..f37454165 100644
--- a/configs/shared/.config/nixpkgs/home.nix
+++ b/configs/shared/.config/nixpkgs/home.nix
@@ -1,10 +1,24 @@
 { config, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [
-  ];
-
-  home.stateVersion = "19.09";
+  home = {
+    packages = with pkgs; [
+      bat
+      exa
+      ripgrep
+      fd
+      pass
+      tokei
+      nmap
+      tldr
+      diskus
+      jq
+      pup
+    ];
+    sessionVariables = {
+    };
+    stateVersion = "19.09";
+  };
 
   ##############################################################################
   # Programs
diff --git a/emacs/default.nix b/emacs/default.nix
index 3daeecd07..b3d570fb7 100644
--- a/emacs/default.nix
+++ b/emacs/default.nix
@@ -7,17 +7,7 @@ let
   # language-specific tooling, I'm intending to use shell.nix alongside lorri
   # and direnv.
   emacsBinPath = pkgs.lib.strings.makeBinPath (with pkgs; [
-    lorri
-    direnv
     tdesktop # native telegram client
-    diskus
-    bat
-    exa
-    fd
-    fzf
-    tldr
-    tokei
-    nmap
     ripgrep
     gitAndTools.hub
     kubectl