ma omo.r: enable home-manager zsh config

This commit is contained in:
makefu 2020-05-28 16:06:05 +02:00
parent 9afe25fd7b
commit 5d47f5d33d
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 21 additions and 12 deletions

View File

@ -11,19 +11,26 @@ in {
./hw/omo.nix ./hw/omo.nix
#./hw/tsp.nix #./hw/tsp.nix
<stockholm/makefu> <stockholm/makefu>
{ environment.systemPackages = with pkgs;[ tmux picocom ];} <stockholm/makefu/2configs/headless.nix>
<stockholm/makefu/2configs/support-nixos.nix> <stockholm/makefu/2configs/support-nixos.nix>
<stockholm/makefu/2configs/nur.nix>
<stockholm/makefu/2configs/zsh-user.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/backup/state.nix>
<stockholm/makefu/2configs/exim-retiolum.nix> <stockholm/makefu/2configs/exim-retiolum.nix>
# <stockholm/makefu/2configs/smart-monitor.nix> # <stockholm/makefu/2configs/smart-monitor.nix>
<stockholm/makefu/2configs/mail-client.nix> <stockholm/makefu/2configs/mail-client.nix>
<stockholm/makefu/2configs/mosh.nix> <stockholm/makefu/2configs/mosh.nix>
<stockholm/makefu/2configs/tools/core.nix> <stockholm/makefu/2configs/tools/core.nix>
<stockholm/makefu/2configs/tools/dev.nix>
<stockholm/makefu/2configs/tools/desktop.nix> <stockholm/makefu/2configs/tools/desktop.nix>
<stockholm/makefu/2configs/tools/mobility.nix> <stockholm/makefu/2configs/tools/mobility.nix>
{ environment.systemPackages = [ pkgs.esniper ]; } { environment.systemPackages = [ pkgs.esniper ]; }
# <stockholm/makefu/2configs/disable_v6.nix>
#<stockholm/makefu/2configs/graphite-standalone.nix> #<stockholm/makefu/2configs/graphite-standalone.nix>
#<stockholm/makefu/2configs/share-user-sftp.nix> #<stockholm/makefu/2configs/share-user-sftp.nix>
@ -108,7 +115,7 @@ in {
]; ];
makefu.full-populate = true; makefu.full-populate = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
krebs.rtorrent = (builtins.trace (builtins.toJSON config.services.telegraf.extraConfig)) { krebs.rtorrent = {
downloadDir = lib.mkForce "/media/cryptX/torrent"; downloadDir = lib.mkForce "/media/cryptX/torrent";
extraConfig = '' extraConfig = ''
upload_rate = 500 upload_rate = 500

View File

@ -80,18 +80,19 @@ in {
boot = { boot = {
initrd.luks = { initrd.luks = {
devices = let devices = let
usbkey = name: device: { usbkey = device: {
inherit name device keyFile; inherit device keyFile;
keyFileSize = 4096; keyFileSize = 4096;
allowDiscards = true; allowDiscards = true;
}; };
in [ in
(usbkey "luksroot" rootPartition) {
(usbkey "crypt0" cryptDisk0) luksroot = usbkey rootPartition;
(usbkey "crypt1" cryptDisk1) crypt0 = usbkey cryptDisk0;
(usbkey "crypt2" cryptDisk2) crypt1 = usbkey cryptDisk1;
(usbkey "crypt3" cryptDisk3) crypt2 = usbkey cryptDisk2;
]; crypt3 = usbkey cryptDisk3;
};
}; };
loader.grub.device = lib.mkForce rootDisk; loader.grub.device = lib.mkForce rootDisk;

View File

@ -2,4 +2,5 @@
name="omo"; name="omo";
torrent = true; torrent = true;
unstable = true; unstable = true;
home-manager = true;
} }