5 files changed, 3 insertions, 12 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/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
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
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
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
     '';