37 files changed, 12 insertions, 12 deletions
diff --git a/modules/berlin.nix b/modules/configuration/berlin.nix
index 246510c..246510c 100644
--- a/modules/berlin.nix
+++ b/modules/configuration/berlin.nix
diff --git a/modules/british-english.nix b/modules/configuration/british-english.nix
index 3ff9367..3ff9367 100644
--- a/modules/british-english.nix
+++ b/modules/configuration/british-english.nix
diff --git a/modules/nix.nix b/modules/configuration/nix.nix
index 504942e..504942e 100644
--- a/modules/nix.nix
+++ b/modules/configuration/nix.nix
diff --git a/modules/user.nix b/modules/configuration/user.nix
index 1b2b674..1b2b674 100644
--- a/modules/user.nix
+++ b/modules/configuration/user.nix
diff --git a/modules/dev.nix b/modules/development/base.nix
index abe5f96..abe5f96 100644
--- a/modules/dev.nix
+++ b/modules/development/base.nix
diff --git a/modules/javascript.nix b/modules/development/javascript.nix
index cc5b89e..cc5b89e 100644
--- a/modules/javascript.nix
+++ b/modules/development/javascript.nix
diff --git a/modules/lisp.nix b/modules/development/lisp.nix
index ffaa711..ffaa711 100644
--- a/modules/lisp.nix
+++ b/modules/development/lisp.nix
diff --git a/modules/adb.nix b/modules/hardware/adb.nix
index 8b511f5..8b511f5 100644
--- a/modules/adb.nix
+++ b/modules/hardware/adb.nix
diff --git a/modules/audio.nix b/modules/hardware/audio.nix
index f504657..f504657 100644
--- a/modules/audio.nix
+++ b/modules/hardware/audio.nix
diff --git a/modules/bare-metal.nix b/modules/hardware/bare-metal.nix
index b5e0fc7..b5e0fc7 100644
--- a/modules/bare-metal.nix
+++ b/modules/hardware/bare-metal.nix
diff --git a/modules/colemak.nix b/modules/hardware/colemak.nix
index 3b1c058..3b1c058 100644
--- a/modules/colemak.nix
+++ b/modules/hardware/colemak.nix
diff --git a/modules/connman.nix b/modules/hardware/connman.nix
index 0361f9c..0361f9c 100644
--- a/modules/connman.nix
+++ b/modules/hardware/connman.nix
diff --git a/modules/grub2.nix b/modules/hardware/grub2.nix
index 70e86e7..70e86e7 100644
--- a/modules/grub2.nix
+++ b/modules/hardware/grub2.nix
diff --git a/modules/hidpi.nix b/modules/hardware/hidpi.nix
index 1f4644c..1f4644c 100644
--- a/modules/hidpi.nix
+++ b/modules/hardware/hidpi.nix
diff --git a/modules/intel-gpu.nix b/modules/hardware/intel-gpu.nix
index b44ddad..b44ddad 100644
--- a/modules/intel-gpu.nix
+++ b/modules/hardware/intel-gpu.nix
diff --git a/modules/laptop.nix b/modules/hardware/laptop.nix
index c50c28e..55dcbd1 100644
--- a/modules/laptop.nix
+++ b/modules/hardware/laptop.nix
@@ -72,6 +72,6 @@
   systemd.services.nix-gc.unitConfig.ConditionACPower = true;
 
   imports = [
-    ./user-interface.nix
+    ../user-interface.nix
   ];
 }
diff --git a/modules/network-manager.nix b/modules/hardware/network-manager.nix
index b85b8f4..b85b8f4 100644
--- a/modules/network-manager.nix
+++ b/modules/hardware/network-manager.nix
diff --git a/modules/nitrokey.nix b/modules/hardware/nitrokey.nix
index ac85e35..ac85e35 100644
--- a/modules/nitrokey.nix
+++ b/modules/hardware/nitrokey.nix
diff --git a/modules/printing.nix b/modules/hardware/printing.nix
index 3172f33..beba72e 100644
--- a/modules/printing.nix
+++ b/modules/hardware/printing.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 { services.printing.enable = true;
 
   imports = [
-    ./zeroconf.nix
+    ../services/zeroconf.nix
   ];
 }
diff --git a/modules/synaptics.nix b/modules/hardware/synaptics.nix
index 9f075cc..9f075cc 100644
--- a/modules/synaptics.nix
+++ b/modules/hardware/synaptics.nix
diff --git a/modules/systemd-boot.nix b/modules/hardware/systemd-boot.nix
index 80e79fd..80e79fd 100644
--- a/modules/systemd-boot.nix
+++ b/modules/hardware/systemd-boot.nix
diff --git a/modules/thinkpad.nix b/modules/hardware/thinkpad.nix
index 38133d7..1e97f06 100644
--- a/modules/thinkpad.nix
+++ b/modules/hardware/thinkpad.nix
@@ -31,5 +31,6 @@
 
   imports = [
     ./bare-metal.nix
+    ./laptop.nix
   ];
 }
diff --git a/modules/trackball.nix b/modules/hardware/trackball.nix
index 9aa5abc..9aa5abc 100644
--- a/modules/trackball.nix
+++ b/modules/hardware/trackball.nix
diff --git a/modules/t470s.nix b/modules/machines/t470s.nix
index 394df77..21614f0 100644
--- a/modules/t470s.nix
+++ b/modules/machines/t470s.nix
@@ -18,7 +18,8 @@
   ];
 
   imports = [
-    ./intel-gpu.nix
-    ./thinkpad.nix
+    ../hardware/intel-gpu.nix
+    ../hardware/hidpi.nix
+    ../hardware/thinkpad.nix
   ];
 }
diff --git a/modules/x250.nix b/modules/machines/x250.nix
index e163ec4..c527f4d 100644
--- a/modules/x250.nix
+++ b/modules/machines/x250.nix
@@ -1,9 +1,6 @@
 { config, pkgs, ... }:
 
-{ imports = [
-    ./synaptics.nix
-  ];
-  boot.extraModulePackages = with config.boot.kernelPackages; [
+{ boot.extraModulePackages = with config.boot.kernelPackages; [
     acpi_call
   ];
 
@@ -33,7 +30,8 @@
   '';
 
   imports = [
-    ./intel-gpu.nix
-    ./thinkpad.nix
+    ../hardware/synaptics.nix
+    ../hardware/intel-gpu.nix
+    ../hardware/thinkpad.nix
   ];
 }
diff --git a/modules/accounting.nix b/modules/programs/accounting.nix
index 5882436..5882436 100644
--- a/modules/accounting.nix
+++ b/modules/programs/accounting.nix
diff --git a/modules/dotfiles.nix b/modules/programs/dotfiles.nix
index eed2223..eed2223 100644
--- a/modules/dotfiles.nix
+++ b/modules/programs/dotfiles.nix
diff --git a/modules/gnome.nix b/modules/programs/gnome.nix
index bd78545..bd78545 100644
--- a/modules/gnome.nix
+++ b/modules/programs/gnome.nix
diff --git a/modules/i3.nix b/modules/programs/i3.nix
index 3bba3bb..3bba3bb 100644
--- a/modules/i3.nix
+++ b/modules/programs/i3.nix
diff --git a/modules/infrastructure.nix b/modules/programs/infrastructure.nix
index b41816e..b41816e 100644
--- a/modules/infrastructure.nix
+++ b/modules/programs/infrastructure.nix
diff --git a/modules/passwords.nix b/modules/programs/passwords.nix
index 8c9d7cf..8c9d7cf 100644
--- a/modules/passwords.nix
+++ b/modules/programs/passwords.nix
diff --git a/modules/shell.nix b/modules/programs/shell.nix
index 3ea43ad..3ea43ad 100644
--- a/modules/shell.nix
+++ b/modules/programs/shell.nix
diff --git a/modules/window-manager.nix b/modules/programs/window-manager.nix
index c159374..c159374 100644
--- a/modules/window-manager.nix
+++ b/modules/programs/window-manager.nix
diff --git a/modules/syncthing.nix b/modules/services/syncthing.nix
index 5a3e1d6..5a3e1d6 100644
--- a/modules/syncthing.nix
+++ b/modules/services/syncthing.nix
diff --git a/modules/xserver.nix b/modules/services/xserver.nix
index 2cef678..2cef678 100644
--- a/modules/xserver.nix
+++ b/modules/services/xserver.nix
diff --git a/modules/zeroconf.nix b/modules/services/zeroconf.nix
index aa4b47e..aa4b47e 100644
--- a/modules/zeroconf.nix
+++ b/modules/services/zeroconf.nix
diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index 09cb2bc..67989a9 100644
--- a/modules/user-interface.nix
+++ b/modules/user-interface.nix
@@ -78,6 +78,6 @@ in
   };
 
   imports = [
-    ./xserver.nix
+    ./services/xserver.nix
   ];
 }