Organise modules into folders

39 files changed, 61 insertions, 61 deletions

diff --git a/marvin.nix b/marvin.nix
index c3508fbe..55a97fd7 100644
--- a/marvin.nix
+++ b/marvin.nix
@@ -2,28 +2,29 @@
 
 { imports = [
     ./hardware-configuration.nix
-    ./modules/systemd-boot.nix
-    ./modules/audio.nix
-    ./modules/adb.nix
-    ./modules/syncthing.nix
-    ./modules/nitrokey.nix
-    ./modules/shell.nix
-    ./modules/dotfiles.nix
-    ./modules/berlin.nix
-    ./modules/colemak.nix
-    ./modules/trackball.nix
-    ./modules/british-english.nix
-    ./modules/x250.nix
-    ./modules/user.nix
-    ./modules/dev.nix
-    ./modules/lisp.nix
-    ./modules/javascript.nix
-    ./modules/infrastructure.nix
-    ./modules/accounting.nix
-    ./modules/passwords.nix
-    ./modules/network-manager.nix
-    ./modules/nix.nix 
-    ./modules/i3.nix
+
+    ./modules/configuration/berlin.nix
+    ./modules/configuration/british-english.nix
+    ./modules/configuration/nix.nix
+    ./modules/configuration/user.nix
+    ./modules/development/base.nix
+    ./modules/development/javascript.nix
+    ./modules/development/lisp.nix
+    ./modules/hardware/adb.nix
+    ./modules/hardware/audio.nix
+    ./modules/hardware/colemak.nix
+    ./modules/hardware/network-manager.nix
+    ./modules/hardware/nitrokey.nix
+    ./modules/hardware/systemd-boot.nix
+    ./modules/hardware/trackball.nix
+    ./modules/machines/x250.nix
+    ./modules/programs/accounting.nix
+    ./modules/programs/dotfiles.nix
+    ./modules/programs/i3.nix
+    ./modules/programs/infrastructure.nix
+    ./modules/programs/passwords.nix
+    ./modules/programs/shell.nix
+    ./modules/services/syncthing.nix
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/berlin.nix b/modules/configuration/berlin.nix
index 246510c4..246510c4 100644
--- a/modules/berlin.nix
+++ b/modules/configuration/berlin.nix
diff --git a/modules/british-english.nix b/modules/configuration/british-english.nix
index 3ff93678..3ff93678 100644
--- a/modules/british-english.nix
+++ b/modules/configuration/british-english.nix
diff --git a/modules/nix.nix b/modules/configuration/nix.nix
index 504942ec..504942ec 100644
--- a/modules/nix.nix
+++ b/modules/configuration/nix.nix
diff --git a/modules/user.nix b/modules/configuration/user.nix
index 1b2b6747..1b2b6747 100644
--- a/modules/user.nix
+++ b/modules/configuration/user.nix
diff --git a/modules/dev.nix b/modules/development/base.nix
index abe5f969..abe5f969 100644
--- a/modules/dev.nix
+++ b/modules/development/base.nix
diff --git a/modules/javascript.nix b/modules/development/javascript.nix
index cc5b89e8..cc5b89e8 100644
--- a/modules/javascript.nix
+++ b/modules/development/javascript.nix
diff --git a/modules/lisp.nix b/modules/development/lisp.nix
index ffaa7115..ffaa7115 100644
--- a/modules/lisp.nix
+++ b/modules/development/lisp.nix
diff --git a/modules/adb.nix b/modules/hardware/adb.nix
index 8b511f55..8b511f55 100644
--- a/modules/adb.nix
+++ b/modules/hardware/adb.nix
diff --git a/modules/audio.nix b/modules/hardware/audio.nix
index f5046574..f5046574 100644
--- a/modules/audio.nix
+++ b/modules/hardware/audio.nix
diff --git a/modules/bare-metal.nix b/modules/hardware/bare-metal.nix
index b5e0fc7b..b5e0fc7b 100644
--- a/modules/bare-metal.nix
+++ b/modules/hardware/bare-metal.nix
diff --git a/modules/colemak.nix b/modules/hardware/colemak.nix
index 3b1c0582..3b1c0582 100644
--- a/modules/colemak.nix
+++ b/modules/hardware/colemak.nix
diff --git a/modules/connman.nix b/modules/hardware/connman.nix
index 0361f9cb..0361f9cb 100644
--- a/modules/connman.nix
+++ b/modules/hardware/connman.nix
diff --git a/modules/grub2.nix b/modules/hardware/grub2.nix
index 70e86e71..70e86e71 100644
--- a/modules/grub2.nix
+++ b/modules/hardware/grub2.nix
diff --git a/modules/hidpi.nix b/modules/hardware/hidpi.nix
index 1f4644c5..1f4644c5 100644
--- a/modules/hidpi.nix
+++ b/modules/hardware/hidpi.nix
diff --git a/modules/intel-gpu.nix b/modules/hardware/intel-gpu.nix
index b44ddadf..b44ddadf 100644
--- a/modules/intel-gpu.nix
+++ b/modules/hardware/intel-gpu.nix
diff --git a/modules/laptop.nix b/modules/hardware/laptop.nix
index c50c28e4..55dcbd17 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 b85b8f41..b85b8f41 100644
--- a/modules/network-manager.nix
+++ b/modules/hardware/network-manager.nix
diff --git a/modules/nitrokey.nix b/modules/hardware/nitrokey.nix
index ac85e352..ac85e352 100644
--- a/modules/nitrokey.nix
+++ b/modules/hardware/nitrokey.nix
diff --git a/modules/printing.nix b/modules/hardware/printing.nix
index 3172f33b..beba72ed 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 9f075cce..9f075cce 100644
--- a/modules/synaptics.nix
+++ b/modules/hardware/synaptics.nix
diff --git a/modules/systemd-boot.nix b/modules/hardware/systemd-boot.nix
index 80e79fdc..80e79fdc 100644
--- a/modules/systemd-boot.nix
+++ b/modules/hardware/systemd-boot.nix
diff --git a/modules/thinkpad.nix b/modules/hardware/thinkpad.nix
index 38133d76..1e97f06c 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 9aa5abc0..9aa5abc0 100644
--- a/modules/trackball.nix
+++ b/modules/hardware/trackball.nix
diff --git a/modules/t470s.nix b/modules/machines/t470s.nix
index 394df773..21614f0e 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 e163ec4f..c527f4dc 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 5882436f..5882436f 100644
--- a/modules/accounting.nix
+++ b/modules/programs/accounting.nix
diff --git a/modules/dotfiles.nix b/modules/programs/dotfiles.nix
index eed22233..eed22233 100644
--- a/modules/dotfiles.nix
+++ b/modules/programs/dotfiles.nix
diff --git a/modules/gnome.nix b/modules/programs/gnome.nix
index bd785453..bd785453 100644
--- a/modules/gnome.nix
+++ b/modules/programs/gnome.nix
diff --git a/modules/i3.nix b/modules/programs/i3.nix
index 3bba3bbb..3bba3bbb 100644
--- a/modules/i3.nix
+++ b/modules/programs/i3.nix
diff --git a/modules/infrastructure.nix b/modules/programs/infrastructure.nix
index b41816e2..b41816e2 100644
--- a/modules/infrastructure.nix
+++ b/modules/programs/infrastructure.nix
diff --git a/modules/passwords.nix b/modules/programs/passwords.nix
index 8c9d7cff..8c9d7cff 100644
--- a/modules/passwords.nix
+++ b/modules/programs/passwords.nix
diff --git a/modules/shell.nix b/modules/programs/shell.nix
index 3ea43adc..3ea43adc 100644
--- a/modules/shell.nix
+++ b/modules/programs/shell.nix
diff --git a/modules/window-manager.nix b/modules/programs/window-manager.nix
index c1593745..c1593745 100644
--- a/modules/window-manager.nix
+++ b/modules/programs/window-manager.nix
diff --git a/modules/syncthing.nix b/modules/services/syncthing.nix
index 5a3e1d6e..5a3e1d6e 100644
--- a/modules/syncthing.nix
+++ b/modules/services/syncthing.nix
diff --git a/modules/xserver.nix b/modules/services/xserver.nix
index 2cef678b..2cef678b 100644
--- a/modules/xserver.nix
+++ b/modules/services/xserver.nix
diff --git a/modules/zeroconf.nix b/modules/services/zeroconf.nix
index aa4b47e8..aa4b47e8 100644
--- a/modules/zeroconf.nix
+++ b/modules/services/zeroconf.nix
diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index 09cb2bc6..67989a97 100644
--- a/modules/user-interface.nix
+++ b/modules/user-interface.nix
@@ -78,6 +78,6 @@ in
   };
 
   imports = [
-    ./xserver.nix
+    ./services/xserver.nix
   ];
 }
diff --git a/satoshipad.nix b/satoshipad.nix
index bc927248..56ee7b45 100644
--- a/satoshipad.nix
+++ b/satoshipad.nix
@@ -3,35 +3,34 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ./private/default.nix
+
     ./modules/base.nix
-    ./modules/grub2.nix
-    ./modules/audio.nix
-    ./modules/adb.nix
-    ./modules/syncthing.nix
-    ./modules/hidpi.nix
-    ./modules/nitrokey.nix
-    ./modules/shell.nix
-    ./modules/dotfiles.nix
-    ./modules/berlin.nix
-    ./modules/colemak.nix
-    ./modules/trackball.nix
-    ./modules/british-english.nix
-    ./modules/printing.nix
-    ./modules/t470s.nix
-    ./modules/user.nix
-    ./modules/dev.nix
-    ./modules/lisp.nix
-    ./modules/javascript.nix
+    ./modules/configuration/berlin.nix
+    ./modules/configuration/british-english.nix
+    ./modules/configuration/nix.nix
+    ./modules/configuration/user.nix
+    ./modules/development/base.nix
+    ./modules/development/javascript.nix
+    ./modules/development/lisp.nix
+    ./modules/hardware/adb.nix
+    ./modules/hardware/audio.nix
+    ./modules/hardware/colemak.nix
+    ./modules/hardware/grub2.nix
+    ./modules/hardware/network-manager.nix
+    ./modules/hardware/nitrokey.nix
+    ./modules/hardware/printing.nix
+    ./modules/hardware/trackball.nix
+    ./modules/machines/t470s.nix
+    ./modules/programs/accounting.nix
+    ./modules/programs/dotfiles.nix
+    ./modules/programs/gnome.nix
+    ./modules/programs/i3.nix
+    ./modules/programs/infrastructure.nix
+    ./modules/programs/passwords.nix
+    ./modules/programs/shell.nix
     ./modules/satoshipay.nix
-    ./modules/infrastructure.nix
-    ./modules/accounting.nix
-    ./modules/passwords.nix
-    ./modules/network-manager.nix
-    ./modules/zeroconf.nix
-    ./modules/nix.nix
-    ./modules/i3.nix
-    ./modules/gnome.nix
-    ./private/default.nix
+    ./modules/services/syncthing.nix
   ];
 
   boot.initrd.luks.devices = [