Move role folder to defaults

host/bachtel.nix

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

host/calanda.nix

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

host/etzel.nix

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

host/montalin/applications/cloud.nix

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

host/montalin/applications/feedreader.nix

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

host/montalin/database.nix

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

host/montalin/default.nix

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

host/stompert.nix

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

modules/default.nix

@@ -1,5 +1,12 @@
 { 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
+  ];
 
 }

role/README.adoc

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