summaryrefslogtreecommitdiffstats
path: root/mb/1systems/orange/configuration.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-07-14 13:43:30 +0200
committerlassulus <lassulus@lassul.us>2019-07-14 13:43:30 +0200
commit9b0e78fcb66b0d7accf974ab4ddf8da05612c695 (patch)
treeeb41197546236a1f3c5e4efebf50c4133c8fc58f /mb/1systems/orange/configuration.nix
parent13d8d9f7d340a64cd69957854c628dc4ca0876e6 (diff)
parent976e6d77031b9e9648789d72cf893a6d1192fedb (diff)
Merge remote-tracking branch 'mb/master'
Diffstat (limited to 'mb/1systems/orange/configuration.nix')
-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";