Merge 'reorg' into 'main'

This patch moves in the reorganizational work done on the reorg branch,
mainly:

* Move host-specific modules into hosts/<host>/<module>
* Break up HM config

See the reorg branch for the individual commits.

1 files changed, 2 insertions, 17 deletions

diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 1393627..b813155 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,19 +1,4 @@
 {
-  # These components are
-  general = {
-    on-demand-minecraft = import ./on-demand-minecraft;
-    cloudflare-proxy = import ./cloudflare-proxy;
-    disable-screen = import ./disable-screen;
-    hellohtml = import ./hellohtml;
-  };
-
-  personal = {
-    duksebot = import ./duksebot;
-    graphics = import ./graphics;
-    "linus.onl" = import ./linus.onl;
-    "notifications.linus.onl" = import ./nofitications.linus.onl;
-    "git.linus.onl" = import ./git.linus.onl;
-    "hellohtml.linus.onl" = import ./hellohtml.linus.onl;
-    forsvarsarper = import ./forsvarsarper;
-  };
+  on-demand-minecraft = import ./on-demand-minecraft;
+  hellohtml = import ./hellohtml;
 }