move helpers/universal -> modules/universal

machines/desko/default.nix

@@ -1,7 +1,6 @@
 { pkgs, config, lib, ... }:
 {
   imports = [
-    ./../../helpers/universal
     ./fs.nix
   ];
 

machines/lappy/default.nix

@@ -1,7 +1,6 @@
 { pkgs, config, lib, ... }:
 {
   imports = [
-    ./../../helpers/universal
     ./fs.nix
   ];
 

machines/moby/default.nix

@@ -1,11 +1,5 @@
 { pkgs, config, lib, ... }:
 {
-  imports = [
-    ./../../helpers/universal
-    # ./../../helpers/gui/plasma-mobile.nix
-    # ./../../helpers/gui/gnome.nix
-  ];
-
   # XXX colin: phosh doesn't work well with passwordless login
   users.users.colin.initialPassword = "147147";
 

machines/uninsane/default.nix

@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./../../helpers/universal
     ./fs.nix
     ./hardware.nix
     ./net.nix

modules/default.nix

@@ -4,5 +4,6 @@
   imports = [
     ./gui
     ./hardware
+    ./universal
   ];
 }