re-enabled docker
This commit is contained in:
parent
28422d460a
commit
e75263b16e
@ -16,10 +16,9 @@
|
||||
]
|
||||
# Include packages based on whether this is a server or workstation.
|
||||
++ lib.optional isServer ./packages/server/default.nix
|
||||
++ lib.optional isWorkstation ./packages/workstation/default.nix;
|
||||
++ lib.optional isWorkstation ./packages/workstation/default.nix
|
||||
# Include docker if this is a server, otherwise include nothing because we don't intend on running docker services on workstations.
|
||||
# ++ lib.optional isServer ./docker/default.nix;
|
||||
# TODO: Enable the line above once we migrated the basic server configuration to the new NixOS setup.
|
||||
++ lib.optional isServer ./docker/default.nix;
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
@ -1,12 +1,17 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
files = builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ];
|
||||
|
||||
# Import all other .nix files as modules
|
||||
moduleFiles = builtins.map (fname: ./. + "/${fname}") (builtins.attrNames files);
|
||||
in
|
||||
{ ... }:
|
||||
{
|
||||
# Import all the package modules
|
||||
imports = moduleFiles;
|
||||
imports = [ ./minecraft.nix ];
|
||||
}
|
||||
# TODO: Import all the package modules, disabled for testing one by one.
|
||||
# { config, pkgs, ... }:
|
||||
|
||||
# let
|
||||
# files = builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ];
|
||||
|
||||
# # Import all other .nix files as modules
|
||||
# moduleFiles = builtins.map (fname: ./. + "/${fname}") (builtins.attrNames files);
|
||||
# in
|
||||
# {
|
||||
# # Import all the package modules
|
||||
# imports = moduleFiles;
|
||||
# }
|
||||
|
@ -8,7 +8,7 @@
|
||||
{
|
||||
imports = [
|
||||
/etc/nixos/hardware-configuration.nix
|
||||
# ./mennos-server/zfs.nix
|
||||
./mennos-server/zfs.nix
|
||||
];
|
||||
networking.hostName = "mennos-server";
|
||||
networking.hostId = "64519940";
|
||||
|
Loading…
x
Reference in New Issue
Block a user