re-enabled docker

This commit is contained in:
Menno van Leeuwen 2024-11-15 21:55:18 +01:00
parent 28422d460a
commit e75263b16e
Signed by: vleeuwenmenno
SSH Key Fingerprint: SHA256:OJFmjANpakwD3F2Rsws4GLtbdz1TJ5tkQF0RZmF0TRE
3 changed files with 19 additions and 15 deletions

View File

@ -16,10 +16,9 @@
] ]
# Include packages based on whether this is a server or workstation. # Include packages based on whether this is a server or workstation.
++ lib.optional isServer ./packages/server/default.nix ++ 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. # 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; ++ lib.optional isServer ./docker/default.nix;
# TODO: Enable the line above once we migrated the basic server configuration to the new NixOS setup.
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

View File

@ -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 = [ ./minecraft.nix ];
imports = moduleFiles;
} }
# 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;
# }

View File

@ -8,7 +8,7 @@
{ {
imports = [ imports = [
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
# ./mennos-server/zfs.nix ./mennos-server/zfs.nix
]; ];
networking.hostName = "mennos-server"; networking.hostName = "mennos-server";
networking.hostId = "64519940"; networking.hostId = "64519940";