Merge remote-tracking branch 'mb/master'

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;