Merge branch 'master' of https://git.alanpearce.eu/nixos-configuration
Alan Pearce alan@alanpearce.eu
Fri, 19 Oct 2018 10:41:18 +0200
5 files changed, 3 insertions(+), 12 deletions(-)
M modules/development/base.nix → modules/development/base.nix
@@ -7,11 +7,9 @@ gitAndTools.git-extras gitAndTools.hub editorconfig-core-c - multimarkdown go gocode - surf ldns httping wrk
M modules/programs/accounting.nix → modules/programs/accounting.nix
@@ -1,7 +1,6 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - aqbanking ledger bean-add beancount
M modules/programs/infrastructure.nix → modules/programs/infrastructure.nix
@@ -1,7 +1,6 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - ansible hugo nixops
M modules/programs/shell.nix → modules/programs/shell.nix
@@ -5,9 +5,6 @@ enable = true; promptInit = ""; }; programs.bash.enableCompletion = true; - programs.xonsh = { - enable = true; - }; environment.systemPackages = with pkgs; [ vim @@ -19,12 +16,9 @@ file htop lsof iftop - iotop nmap - netperf moreutils mtr - psmisc tree zip unzip
M packages/emacs.nix → 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 '';