Merge remote-tracking branch 'prism/master'

3 files changed, 21 insertions, 12 deletions

diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index cfe0d0a3f..34bd42592 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -11,19 +11,26 @@ in {
       ./hw/omo.nix
       #./hw/tsp.nix
       <stockholm/makefu>
-      { environment.systemPackages = with pkgs;[ tmux picocom ];}
+      <stockholm/makefu/2configs/headless.nix>
       <stockholm/makefu/2configs/support-nixos.nix>
+      <stockholm/makefu/2configs/nur.nix>
+
       <stockholm/makefu/2configs/zsh-user.nix>
+      <stockholm/makefu/2configs/home-manager>
+      <stockholm/makefu/2configs/home-manager/cli.nix>
+      <stockholm/makefu/2configs/editor/neovim>
+
+
       <stockholm/makefu/2configs/backup/state.nix>
       <stockholm/makefu/2configs/exim-retiolum.nix>
       # <stockholm/makefu/2configs/smart-monitor.nix>
       <stockholm/makefu/2configs/mail-client.nix>
       <stockholm/makefu/2configs/mosh.nix>
       <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/tools/dev.nix>
       <stockholm/makefu/2configs/tools/desktop.nix>
       <stockholm/makefu/2configs/tools/mobility.nix>
       { environment.systemPackages = [ pkgs.esniper ]; }
-      # <stockholm/makefu/2configs/disable_v6.nix>
       #<stockholm/makefu/2configs/graphite-standalone.nix>
       #<stockholm/makefu/2configs/share-user-sftp.nix>
 
@@ -108,7 +115,7 @@ in {
     ];
   makefu.full-populate =  true;
   nixpkgs.config.allowUnfree = true;
-  krebs.rtorrent = (builtins.trace (builtins.toJSON config.services.telegraf.extraConfig)) {
+  krebs.rtorrent = {
     downloadDir = lib.mkForce "/media/cryptX/torrent";
     extraConfig = ''
       upload_rate = 500
diff --git a/makefu/1systems/omo/hw/omo.nix b/makefu/1systems/omo/hw/omo.nix
index 87af2a314..586ad98c4 100644
--- a/makefu/1systems/omo/hw/omo.nix
+++ b/makefu/1systems/omo/hw/omo.nix
@@ -80,18 +80,19 @@ in {
   boot = {
     initrd.luks = {
       devices = let
-        usbkey = name: device: {
-          inherit name device keyFile;
+        usbkey = device: {
+          inherit device keyFile;
           keyFileSize = 4096;
           allowDiscards = true;
         };
-      in [
-        (usbkey "luksroot" rootPartition)
-        (usbkey "crypt0" cryptDisk0)
-        (usbkey "crypt1" cryptDisk1)
-        (usbkey "crypt2" cryptDisk2)
-        (usbkey "crypt3" cryptDisk3)
-      ];
+      in
+      {
+        luksroot = usbkey rootPartition;
+        crypt0 = usbkey  cryptDisk0;
+        crypt1 = usbkey  cryptDisk1;
+        crypt2 = usbkey  cryptDisk2;
+        crypt3 = usbkey  cryptDisk3;
+      };
     };
     loader.grub.device = lib.mkForce rootDisk;
 
diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix
index 05c17377f..b56e855fc 100644
--- a/makefu/1systems/omo/source.nix
+++ b/makefu/1systems/omo/source.nix
@@ -2,4 +2,5 @@
   name="omo";
   torrent = true;
   unstable = true;
+  home-manager = true;
 }