Make the nixos boxes definitions unrelated to each other

This commit is contained in:
Cyryl Płotnicki 2019-04-26 07:21:51 +01:00
parent e1878a02ba
commit 3ae6fd49a3
3 changed files with 10 additions and 11 deletions

View file

@ -3,14 +3,6 @@
fileSystems."/".options = [ "noatime" "nodiratime" "discard" ]; fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
boot = { boot = {
initrd.luks.devices = [
{
name = "root";
device = "/dev/disk/by-uuid/8c76bf01-59b3-4c60-b853-e9cb77f3ca14";
preLVM = true;
allowDiscards = true;
}
];
loader.grub = { loader.grub = {
enable = true; enable = true;
version = 2; version = 2;

View file

@ -1,4 +1,13 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
networking.hostName = "skinnyv"; networking.hostName = "skinnyv";
boot.initrd.luks.devices = [
{
name = "root";
device = "/dev/disk/by-uuid/8c76bf01-59b3-4c60-b853-e9cb77f3ca14";
preLVM = true;
allowDiscards = true;
}];
imports = [ ../common.nix ];
} }

View file

@ -13,8 +13,6 @@ in
./gsconnect.nix ./gsconnect.nix
./gfx.nix ./gfx.nix
./boot.nix ./boot.nix
./boxes/skinnyv.nix # TODO: invert relationship
]; ];
nixpkgs.config = { nixpkgs.config = {
@ -23,7 +21,7 @@ in
unstable = import unstableTarball { unstable = import unstableTarball {
config = config.nixpkgs.config; config = config.nixpkgs.config;
}; };
cyplo = import "/home/cyryl/dev/nixpkgs/" { cyplo = import ./nixpkgs {
config = config.nixpkgs.config; config = config.nixpkgs.config;
}; };
}; };