Finish modularising config

There are still some things I want to change, but at least there aren't two systems now.

machines/kharbranth/default.nix

@@ -1,25 +1,18 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./hardware.nix
-    ../../profiles/graphical.nix
-  ];
+  imports = [ ./hardware.nix ];
 
   networking.hostId = "e718389d";
 
   time.timeZone = "Europe/Brussels";
 
-  # Machine-specific application settings
+  # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
     graphical = true;
     bluetooth.enable = true;
-    docker.enable = true;
-    eid.enable = true;
     git.email = "charlotte.vanpetegem@ugent.be";
-    sshd.enable = true;
-    vpn.ugent.enable = true;
     zfs = {
       enable = true;
       encrypted = true;
@@ -33,6 +26,5 @@
       ];
       rootDataset = "rpool/local/root";
     };
-    zotero.enable = true;
   };
 }

machines/kholinar/default.nix

@@ -1,42 +1,24 @@
 { pkgs, lib, ... }:
 
 {
-  imports = [
-    ./hardware.nix
-    ../../profiles/graphical.nix
-  ];
-
-  boot.kernelModules = [ "v4l2loopback" ];
-  boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
-  boot.extraModprobeConfig = ''
-    options v4l2loopback video_nr=9 card_label="obs"
-  '';
-
-  home-manager.users.charlotte = { pkgs, ... }: {
-    programs.obs-studio = {
-      enable = true;
-      package = pkgs.wrapOBS {
-        plugins = [ pkgs.obs-studio-plugins.wlrobs ];
-      };
-    };
-  };
+  imports = [ ./hardware.nix ];
 
   networking.hostId = "3cc1a4b2";
 
   time.timeZone = "Europe/Brussels";
 
-  # Machine-specific settings
+  # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
     graphical = true;
+    android.enable = true;
     bluetooth.enable = true;
-    docker.enable = true;
-    eid.enable = true;
+    dropbox.enable = true;
     git.email = "charlotte@vanpetegem.me";
     minecraft.client = true;
-    sshd.enable = true;
+    mumble.enable = true;
+    obs.enable = true;
     steam.enable = true;
-    vpn.ugent.enable = true;
     zeroad.enable = true;
     zfs = {
       enable = true;
@@ -51,6 +33,5 @@
       ];
       rootDataset = "rpool/local/root";
     };
-    zotero.enable = true;
   };
 }

machines/lasting-integrity/default.nix

@@ -10,6 +10,7 @@
 
   networking.hostId = "b352adfe";
 
+  # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
     docker.enable = true;

machines/urithiru/default.nix

@@ -14,6 +14,7 @@
   environment.etc = lib.mapAttrs' (n: v: { name = "pinned-hosts/${n}"; value = { source = v.config.system.build.toplevel.outPath; }; })
     (lib.filterAttrs (n: _: n != "urithiru") nixosConfigurations);
 
+  # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
     accentor.enable = true;