diff options
| author | Alan Pearce | 2018-10-19 10:41:18 +0200 |
|---|---|---|
| committer | Alan Pearce | 2018-10-19 10:41:18 +0200 |
| commit | e30c6624e41d8b8b55085897a57f9c9c0c6c3edf (patch) | |
| tree | 12fd7f66752f3867f80a95dada72e1dda32304ee | |
| parent | 726b9219e5040acde663a5a800f1228ff92140df (diff) | |
| parent | 64afe906dc73e7cb6f88ab9d52dd1203d06eb5c8 (diff) | |
| download | nixos-configuration-e30c6624e41d8b8b55085897a57f9c9c0c6c3edf.tar.lz nixos-configuration-e30c6624e41d8b8b55085897a57f9c9c0c6c3edf.tar.zst nixos-configuration-e30c6624e41d8b8b55085897a57f9c9c0c6c3edf.zip | |
Merge branch 'master' of https://git.alanpearce.eu/nixos-configuration
| -rw-r--r-- | modules/development/base.nix | 2 | ||||
| -rw-r--r-- | modules/programs/accounting.nix | 1 | ||||
| -rw-r--r-- | modules/programs/infrastructure.nix | 1 | ||||
| -rw-r--r-- | modules/programs/shell.nix | 6 | ||||
| -rw-r--r-- | packages/emacs.nix | 5 |
5 files changed, 3 insertions, 12 deletions
diff --git a/modules/development/base.nix b/modules/development/base.nix index a353db6..12145a5 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 7c17c14..e98c3e7 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 b41816e..5e68bc8 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 33ee27d..b7bbd8f 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 3dae49a..dc99878 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 ''; |