From 5d47f5d33d29b4ef95d3788bcb581f0ebf41e9ba Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 28 May 2020 16:06:05 +0200 Subject: [PATCH] ma omo.r: enable home-manager zsh config --- makefu/1systems/omo/config.nix | 13 ++++++++++--- makefu/1systems/omo/hw/omo.nix | 19 ++++++++++--------- makefu/1systems/omo/source.nix | 1 + 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 - { environment.systemPackages = with pkgs;[ tmux picocom ];} + + + + + + + + # + { environment.systemPackages = [ pkgs.esniper ]; } - # # # @@ -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; }