summaryrefslogtreecommitdiffstats
path: root/mb/1systems/orange
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-08-02 17:04:39 +0200
committertv <tv@krebsco.de>2019-08-02 17:04:39 +0200
commit7c522820bd7858580567ab7d436f586ee5a139ce (patch)
tree92a448d08f4e34a5bfec172daed334ddd0c97049 /mb/1systems/orange
parentb92610eacb6c88fe28f46a91ee8697cb542ab6aa (diff)
parent2885fbd942163d733586cd966c76ccf9159ae208 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'mb/1systems/orange')
-rw-r--r--mb/1systems/orange/configuration.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/mb/1systems/orange/configuration.nix b/mb/1systems/orange/configuration.nix
index 3e90f89a2..b43bd8a0f 100644
--- a/mb/1systems/orange/configuration.nix
+++ b/mb/1systems/orange/configuration.nix
@@ -5,6 +5,7 @@ in {
[ # Include the results of the hardware scan.
./hardware-configuration.nix
<stockholm/mb>
+ <stockholm/mb/2configs/nvim.nix>
];
krebs.build.host = config.krebs.hosts.orange;
@@ -124,15 +125,19 @@ in {
unstable.ponyc
unstable.sublime3
unstable.youtube-dl
- vim
virt-viewer
virtmanager
vulnix
wcalc
wget
xz
+ zbackup
];
+ environment.variables = {
+ EDITOR = ["nvim"];
+ };
+
environment.shellAliases = {
ll = "ls -alh";
ls = "ls --color=tty";