From 28f98b0ac1defee7bf5e66191fad21b260975d07 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 13 Oct 2018 21:24:45 +0200
Subject: Emacs: Enable overriding package

---
 packages/emacs.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/emacs.nix b/packages/emacs.nix
index 3dae49a1..dc99878c 100644
--- a/packages/emacs.nix
+++ b/packages/emacs.nix
@@ -1,9 +1,10 @@
 {
-  pkgs ? import <nixpkgs>
+  pkgs ? import <nixpkgs> {},
+  emacs ? pkgs.emacs
 }:
 
 let
-  myEmacs = pkgs.lib.overrideDerivation (pkgs.emacs) (attrs: {
+  myEmacs = pkgs.lib.overrideDerivation (emacs) (attrs: {
     postInstall = attrs.postInstall + ''
       rm $out/share/applications/emacs.desktop
     '';
-- 
cgit 1.4.1


From 7777eb3da4de01eda010d3b9a65f59c03969379f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 13 Oct 2018 21:25:03 +0200
Subject: Accounting: remove unused package

---
 modules/programs/accounting.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/programs/accounting.nix b/modules/programs/accounting.nix
index 7c17c14a..e98c3e7e 100644
--- a/modules/programs/accounting.nix
+++ b/modules/programs/accounting.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 
 { environment.systemPackages = with pkgs; [
-    aqbanking
     ledger
     bean-add
     beancount
-- 
cgit 1.4.1


From 38249638e6208c615a3ff8bc8e3b1d27c242a409 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 13 Oct 2018 21:25:51 +0200
Subject: Remove more unused programs

---
 modules/development/base.nix | 2 --
 modules/programs/shell.nix   | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/modules/development/base.nix b/modules/development/base.nix
index a353db62..12145a55 100644
--- a/modules/development/base.nix
+++ b/modules/development/base.nix
@@ -7,11 +7,9 @@
     gitAndTools.hub
 
     editorconfig-core-c
-    multimarkdown
     go
     gocode
 
-    surf
     ldns
     httping
     wrk
diff --git a/modules/programs/shell.nix b/modules/programs/shell.nix
index 33ee27da..b7bbd8fb 100644
--- a/modules/programs/shell.nix
+++ b/modules/programs/shell.nix
@@ -5,9 +5,6 @@
     promptInit = "";
   };
   programs.bash.enableCompletion = true;
-  programs.xonsh = {
-    enable = true;
-  };
 
   environment.systemPackages = with pkgs; [
     vim
@@ -19,12 +16,9 @@
     htop
     lsof
     iftop
-    iotop
     nmap
-    netperf
     moreutils
     mtr
-    psmisc
     tree
     zip
     unzip
-- 
cgit 1.4.1


From 64afe906dc73e7cb6f88ab9d52dd1203d06eb5c8 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 16 Oct 2018 21:56:48 +0200
Subject: infrastructure: Remove ansible

---
 modules/programs/infrastructure.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/programs/infrastructure.nix b/modules/programs/infrastructure.nix
index b41816e2..5e68bc8a 100644
--- a/modules/programs/infrastructure.nix
+++ b/modules/programs/infrastructure.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 
 { environment.systemPackages = with pkgs; [
-    ansible
     hugo
 
     nixops
-- 
cgit 1.4.1