summaryrefslogtreecommitdiffstats
path: root/lass/1systems/icarus/config.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-23 21:10:50 +0200
committerlassulus <lassulus@lassul.us>2017-07-23 21:39:31 +0200
commit8d34735c3099648fb3444d218c78fb3fb7612c46 (patch)
tree5d47da9bdb11a35372cc61ae257b726101f84775 /lass/1systems/icarus/config.nix
parent1bf9e1e1eea95ea9efeb72a48e19a6df11881a7f (diff)
lass: cleanup
Diffstat (limited to 'lass/1systems/icarus/config.nix')
-rw-r--r--lass/1systems/icarus/config.nix33
1 files changed, 4 insertions, 29 deletions
diff --git a/lass/1systems/icarus/config.nix b/lass/1systems/icarus/config.nix
index 61837bf38..8afd97977 100644
--- a/lass/1systems/icarus/config.nix
+++ b/lass/1systems/icarus/config.nix
@@ -3,8 +3,11 @@
{
imports = [
<stockholm/lass>
+ <stockholm/lass/2configs/hw/x220.nix>
+ <stockholm/lass/2configs/boot/coreboot.nix>
+
+ <stockholm/lass/2configs/mouse.nix>
<stockholm/lass/2configs/retiolum.nix>
- <stockholm/lass/2configs/hw/tp-x220.nix>
<stockholm/lass/2configs/git.nix>
<stockholm/lass/2configs/exim-retiolum.nix>
<stockholm/lass/2configs/baseX.nix>
@@ -17,40 +20,12 @@
krebs.build.host = config.krebs.hosts.icarus;
- boot = {
- loader.grub.enable = true;
- loader.grub.version = 2;
- loader.grub.device = "/dev/sda";
- loader.grub.efiSupport = true;
-
- initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda3"; } ];
- initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
- initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
- };
fileSystems = {
- "/" = {
- device = "/dev/mapper/pool-root";
- fsType = "btrfs";
- options = ["defaults" "noatime" "ssd" "compress=lzo"];
- };
- "/boot" = {
- device = "/dev/sda2";
- };
"/bku" = {
device = "/dev/mapper/pool-bku";
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
- "/home" = {
- device = "/dev/mapper/pool-home";
- fsType = "btrfs";
- options = ["defaults" "noatime" "ssd" "compress=lzo"];
- };
- "/tmp" = {
- device = "tmpfs";
- fsType = "tmpfs";
- options = ["nosuid" "nodev" "noatime"];
- };
};
services.udev.extraRules = ''