derped/nixos
1
0
Fork 0
Code Releases Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

24
machines/Lilim/configuration.nix
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 = [];

60
machines/Ophanim/configuration.nix
View file

@ -1,30 +1,42 @@
{ config, lib }:
with lib;
{
confPath = ./Ophanim.nix;
pkgs = [
"base"
"emacs"
"server"
imports = [
../../options/machine.nix
./Ophanim.nix
];
services = [
../../services/gitea.nix
../../services/hydra.nix
../../services/mailserver.nix
../../services/mariaDB.nix
../../services/nextcloud.nix
../../services/nginx.nix
../../services/openssh.nix
];
conf = {
config.machine = {
hostName = "Ophanim";
allowUnfree = true;
networking = {
hostName = "Ophanim";
firewall = {
allowPing = false;
allowedUDPPorts = [ 22 80 443 ];
allowedTCPPorts = [ 80 443 ]; # 5222 5269 ];
allowedUDPPortRanges = [];
allowedTCPPortRanges = [];
};
conffiles = [
"etcfiles"
"etcvars"
"fonts"
"zsh"
];
pkgs = [
"base"
"emacs"
"server"
];
services = [
"gitea"
"hydra"
"mailserver"
"mariaDB"
"nextcloud"
"nginx"
"openssh"
];
firewall = {
allowPing = false;
allowedUDPPorts = [ 22 80 443 ];
allowedTCPPorts = [ 80 443 ]; # 5222 5269 ];
allowedUDPPortRanges = [];
allowedTCPPortRanges = [];
};
};
}