summaryrefslogtreecommitdiffstats
path: root/mb/1systems/p1nk
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2019-07-16 19:06:14 +0200
committerjeschli <jeschli@gmail.com>2019-07-16 19:06:14 +0200
commitcd4f0290ed091cdae9b5d8526f4387b54e2c42dc (patch)
tree1db65f278382130f52da18aaafbc31d7d8e52376 /mb/1systems/p1nk
parentecb6c5fe8784de4aeceef437368cb501e1d659ce (diff)
parent3f0435e89cbdccf8ad8ab351cc3eab349c427e60 (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'mb/1systems/p1nk')
-rw-r--r--mb/1systems/p1nk/configuration.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/mb/1systems/p1nk/configuration.nix b/mb/1systems/p1nk/configuration.nix
index 905630e78..19efc75b0 100644
--- a/mb/1systems/p1nk/configuration.nix
+++ b/mb/1systems/p1nk/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.p1nk;
@@ -118,13 +119,13 @@ in {
unstable.ponyc
unstable.sublime3
youtube-dl
- vim
virt-viewer
virtmanager
vulnix
wcalc
wget
xz
+ zbackup
];
environment.shellAliases = {
@@ -159,6 +160,7 @@ in {
};
};
windowManager.ratpoison.enable = true;
+ windowManager.pekwm.enable = true;
};
services.openssh.enable = true;