Modularized configuration now kind of works. (still need to do some refactoring)

This commit is contained in:
Kevin Baensch 2019-03-20 02:57:59 +01:00
parent a0f361425a
commit 14332b2c7b
24 changed files with 144 additions and 85 deletions

View file

@ -3,10 +3,20 @@
with lib;
{
imports = [ ../../options/machine.nix ];
imports = [
../../options/machine.nix
./Lilim.nix
];
config.machine = {
confPath = ./Lilim.nix;
allowUnfree = true;
hostName = "Lilim";
conffiles = [
"etcfiles"
"etcvars"
"fonts"
"zsh"
];
pkgs = [
"base"
"dict"
@ -20,13 +30,11 @@ with lib;
"xpkgs"
];
services = [
../../services/xserver.nix
../../services/docker.nix
../../services/udev.nix
../../services/cups.nix
"xserver"
"docker"
"udev"
"cups"
];
allowUnfree = true;
hostName = "Lilim";
firewall = {
allowPing = true;
allowedUDPPorts = [];