Move role folder to defaults

This commit is contained in:
Fabian Hauser 2020-11-28 22:27:24 +00:00
parent ea23be5e80
commit 78f95b4e11
19 changed files with 17 additions and 16 deletions

View file

@ -4,7 +4,7 @@
{ config, pkgs, ... }: { { config, pkgs, ... }: {
imports = [ ../role/base ../hardware/apu.nix ../hardware/wle900vx.nix ]; imports = [ ../defaults/base ../hardware/apu.nix ../hardware/wle900vx.nix ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5"; device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5";

View file

@ -5,7 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ../hardware/apu.nix ../hardware/wle200nx.nix ../role/base ]; imports = [ ../hardware/apu.nix ../hardware/wle200nx.nix ../defaults/base ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625"; device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625";

View file

@ -9,7 +9,7 @@
../hardware/apu1.nix ../hardware/apu1.nix
../hardware/wle200nx.nix ../hardware/wle200nx.nix
../hardware/wle600vx.nix ../hardware/wle600vx.nix
../role/base ../defaults/base
]; ];
nix.distributedBuilds = true; nix.distributedBuilds = true;

View file

@ -4,7 +4,7 @@ in {
imports = [ imports = [
../../../role/nextcloud ../../../defaults/nextcloud
]; ];
services.nextcloud = { services.nextcloud = {

View file

@ -4,7 +4,7 @@ in {
imports = [ imports = [
../../../role/tt-rss ../../../defaults/tt-rss
]; ];
services.tt-rss = { services.tt-rss = {

View file

@ -2,7 +2,7 @@
{ {
imports = [ ../../role/database ]; imports = [ ../../defaults/database ];
services.postgresql = { services.postgresql = {
ensureDatabases = [ "nextcloud" ]; ensureDatabases = [ "nextcloud" ];
ensureUsers = [{ ensureUsers = [{

View file

@ -9,8 +9,8 @@
../../hardware/nuc.nix ../../hardware/nuc.nix
../../role/base ../../defaults/base
../../role/webserver ../../defaults/webserver
]; ];
# Set your time zone. # Set your time zone.

View file

@ -5,7 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ../hardware/apu.nix ../role/base ]; imports = [ ../hardware/apu.nix ../defaults/base ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/ab5a598b-6609-465f-8ab8-b894b8a5e32a"; device = "/dev/disk/by-uuid/ab5a598b-6609-465f-8ab8-b894b8a5e32a";

View file

@ -1,5 +1,12 @@
{ config, pkgs, ... }: { { config, pkgs, ... }: {
imports = [ ./router ./router-dhcp ./router-dns ./router-wireless-ap ./wwan ./luks-ssh ]; imports = [
./router
./router-dhcp
./router-dns
./router-wireless-ap
./wwan
./luks-ssh
];
} }

View file

@ -1,6 +0,0 @@
= Roles
:toc:
include::base/README.adoc[]