From 65d9fc0235e6826fd96dc4985f576ede143ac654 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 22 May 2019 11:56:07 +0200
Subject: Add/remove packages

---
 modules/development/base.nix       | 4 +---
 modules/development/javascript.nix | 2 ++
 modules/programs/shell.nix         | 3 +--
 modules/satoshipay.nix             | 4 ++++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/development/base.nix b/modules/development/base.nix
index 5c474ac..0d7520b 100644
--- a/modules/development/base.nix
+++ b/modules/development/base.nix
@@ -1,15 +1,13 @@
 { config, pkgs, ... }:
 
 { environment.systemPackages = with pkgs; [
-    mercurial
     gitAndTools.gitFull
     gitAndTools.git-extras
-    gitAndTools.hub
     git-lfs
 
+    checkbashisms
     editorconfig-core-c
     go
-    gocode
 
     wrk
 
diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix
index 23a464e..3e4a892 100644
--- a/modules/development/javascript.nix
+++ b/modules/development/javascript.nix
@@ -17,6 +17,8 @@ in
     npmPackages.javascript-typescript-langserver
     npmPackages.eslint_d
     npmPackages.yarn
+    npmPackages.prettier
+    npmPackages.pnpm
 
   ] ++ (
     if stdenv.isDarwin
diff --git a/modules/programs/shell.nix b/modules/programs/shell.nix
index ab55e0c..cf36a11 100644
--- a/modules/programs/shell.nix
+++ b/modules/programs/shell.nix
@@ -12,8 +12,8 @@
   environment.systemPackages = with pkgs; [
     pv
     fd
+    unstable.sd
     entr
-    exa
     file
     htop
     lsof
@@ -23,7 +23,6 @@
     mtr
     tree
     zip
-    unzip
     telnet
   ] ++ (
   if !stdenv.isDarwin
diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix
index 011c563..513f426 100644
--- a/modules/satoshipay.nix
+++ b/modules/satoshipay.nix
@@ -17,10 +17,14 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
+    awscli
+    caddy
     openssl
     google-chrome
     docker_compose
     mongodb-tools
+    pgadmin
+    pgcli
     s3cmd
     sops
     unstable.google-cloud-sdk
-- 
cgit 1.4.1