summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-10-17 15:59:53 +0200
committerlassulus <lass@aidsballs.de>2015-10-17 15:59:53 +0200
commit62af75a108efa64683532f949110bf412ffecfd9 (patch)
treea7f325d9eb99e7b3c8e4b9a032542fdb19fc2fe7
parent52acc67be99918b787f904431698e3d25c0765a0 (diff)
parentf83b3770dd401004bef0233c3de0eb07686788a5 (diff)
Merge remote-tracking branch 'pnp/master'
-rw-r--r--krebs/3modules/Reaktor.nix5
-rw-r--r--makefu/2configs/base.nix4
-rw-r--r--makefu/2configs/fs/sda-crypto-root-home.nix30
-rw-r--r--tv/1systems/mkdir.nix2
4 files changed, 12 insertions, 29 deletions
diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix
index 82089a660..1ec49b81e 100644
--- a/krebs/3modules/Reaktor.nix
+++ b/krebs/3modules/Reaktor.nix
@@ -126,9 +126,8 @@ let
ExecStart = "${pkgs.Reaktor}/bin/reaktor run /tmp/config.py";
PrivateTmp = "true";
User = "Reaktor";
- Restart = "on-abort";
- StartLimitInterval = "1m";
- StartLimitBurst = "1";
+ Restart = "always";
+ RestartSec= "30" ;
};
};
};
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 91a500393..4e38c27f8 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -51,9 +51,7 @@ with lib;
"d /tmp 1777 root root - -"
];
- environment.extraInit = ''
- EDITOR=vim
- '';
+ environment.variables.EDITOR = mkForce "vim";
environment.systemPackages = with pkgs; [
jq
diff --git a/makefu/2configs/fs/sda-crypto-root-home.nix b/makefu/2configs/fs/sda-crypto-root-home.nix
index 3821c7504..cc2133a49 100644
--- a/makefu/2configs/fs/sda-crypto-root-home.nix
+++ b/makefu/2configs/fs/sda-crypto-root-home.nix
@@ -3,37 +3,23 @@
# ssd #
# sda: bootloader grub2
# sda1: boot ext4 (label nixboot)
-# sda2: cryptoluks -> lvm:
-# / (main-root)
-# /home (main-home)
+# sda2: cryptoluks ->
+# lvm:
+# / (main-root)
+# /home (main-home)
with lib;
{
- boot = {
- loader.grub.enable =true;
- loader.grub.version =2;
- loader.grub.device = "/dev/sda";
- initrd.luks.devices = [ { name = "main"; device = "/dev/sda2"; allowDiscards=true; }];
- initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
- initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
- };
+ imports = [
+ ./sda-crypto-root.nix # configures crypto + boot
+ ];
fileSystems = {
- "/" = {
- device = "/dev/mapper/main-root";
- fsType = "ext4";
- options="defaults,discard";
- };
- # TODO: just import sda-crypto-root, add this device
+ "/".device = lib.mkForce "/dev/mapper/main-root";
"/home" = {
device = "/dev/mapper/main-home";
fsType = "ext4";
options="defaults,discard";
};
- "/boot" = {
- device = "/dev/disk/by-label/nixboot";
- fsType = "ext4";
- options="defaults,discard";
- };
};
}
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 76432ba03..669dcc2f3 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -24,7 +24,7 @@ in
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+ rev = "e57024f821c94caf5684964474073649b8b6356b";
};
dir.secrets = {
host = config.krebs.hosts.wu;