51 files changed, 65 insertions, 65 deletions
diff --git a/system/marvin.nix b/system/marvin.nix
index c8b46085..59b90e9b 100644
--- a/system/marvin.nix
+++ b/system/marvin.nix
@@ -3,25 +3,25 @@
 { imports = [
     ./hardware-configuration.nix
 
-    ./modules/base.nix
-    ./modules/configuration/berlin.nix
-    ./modules/configuration/british-english.nix
-    ./modules/configuration/nix.nix
-    ./modules/configuration/user.nix
-    ./modules/hardware/adb.nix
-    ./modules/hardware/audio.nix
-    ./modules/hardware/qwerty.nix
-    ./modules/hardware/network-manager.nix
-    ./modules/hardware/nitrokey.nix
-    ./modules/hardware/systemd-boot.nix
-    ./modules/hardware/trackball.nix
-    ./modules/hardware/trezor.nix
-    ./modules/machines/x250.nix
-    ./modules/programs/accounting.nix
-    ./modules/programs/i3.nix
-    ./modules/programs/infrastructure.nix
-    ./modules/programs/shell.nix
-    ./modules/services/syncthing.nix
+    ./settings/base.nix
+    ./settings/configuration/berlin.nix
+    ./settings/configuration/british-english.nix
+    ./settings/configuration/nix.nix
+    ./settings/configuration/user.nix
+    ./settings/hardware/adb.nix
+    ./settings/hardware/audio.nix
+    ./settings/hardware/qwerty.nix
+    ./settings/hardware/network-manager.nix
+    ./settings/hardware/nitrokey.nix
+    ./settings/hardware/systemd-boot.nix
+    ./settings/hardware/trackball.nix
+    ./settings/hardware/trezor.nix
+    ./settings/machines/x250.nix
+    ./settings/programs/accounting.nix
+    ./settings/programs/i3.nix
+    ./settings/programs/infrastructure.nix
+    ./settings/programs/shell.nix
+    ./settings/services/syncthing.nix
   ];
 
   networking = {
diff --git a/system/prefect.nix b/system/prefect.nix
index d375b3c0..ed8ce720 100644
--- a/system/prefect.nix
+++ b/system/prefect.nix
@@ -3,30 +3,30 @@
 { imports = [
     ./hardware-configuration.nix
 
-    ./modules/satoshipay.nix
-    ./modules/base.nix
-    ./modules/configuration/berlin.nix
-    ./modules/configuration/british-english.nix
-    ./modules/configuration/nix.nix
-    ./modules/configuration/user.nix
-    ./modules/hardware/audio.nix
-    ./modules/hardware/bare-metal.nix
-    ./modules/hardware/mouse.nix
-    ./modules/hardware/systemd-boot.nix
-    ./modules/hardware/nvidia-gpu.nix
-    ./modules/hardware/trezor.nix
-    ./modules/services/zeroconf.nix
-    ./modules/user-interface.nix
-    ./modules/programs/accounting.nix
-    ./modules/programs/gnupg.nix
-    ./modules/programs/keybase.nix
-    ./modules/programs/i3.nix
-    ./modules/programs/infrastructure.nix
-    ./modules/programs/shell.nix
-    ./modules/gaming.nix
-    ./modules/programs/tor.nix
-    ./modules/programs/barrier.nix
-    ./modules/services/syncthing.nix
+    ./settings/satoshipay.nix
+    ./settings/base.nix
+    ./settings/configuration/berlin.nix
+    ./settings/configuration/british-english.nix
+    ./settings/configuration/nix.nix
+    ./settings/configuration/user.nix
+    ./settings/hardware/audio.nix
+    ./settings/hardware/bare-metal.nix
+    ./settings/hardware/mouse.nix
+    ./settings/hardware/systemd-boot.nix
+    ./settings/hardware/nvidia-gpu.nix
+    ./settings/hardware/trezor.nix
+    ./settings/services/zeroconf.nix
+    ./settings/user-interface.nix
+    ./settings/programs/accounting.nix
+    ./settings/programs/gnupg.nix
+    ./settings/programs/keybase.nix
+    ./settings/programs/i3.nix
+    ./settings/programs/infrastructure.nix
+    ./settings/programs/shell.nix
+    ./settings/gaming.nix
+    ./settings/programs/tor.nix
+    ./settings/programs/barrier.nix
+    ./settings/services/syncthing.nix
   ];
   boot.loader.efi.canTouchEfiVariables = pkgs.lib.mkForce false;
   services.xserver.screenSection = ''
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
index e910859d..84d2407f 100644
--- a/system/satoshipad.nix
+++ b/system/satoshipad.nix
@@ -5,26 +5,26 @@
     ./hardware-configuration.nix
     ./private/default.nix
 
-    ./modules/base.nix
-    ./modules/configuration/berlin.nix
-    ./modules/configuration/british-english.nix
-    ./modules/configuration/nix.nix
-    ./modules/configuration/user.nix
-    ./modules/hardware/audio.nix
-    ./modules/hardware/systemd-boot.nix
-    ./modules/hardware/keyboardio-model01.nix
-    ./modules/hardware/network-manager.nix
-    ./modules/hardware/qwerty.nix
-    ./modules/hardware/trackball.nix
-    ./modules/hardware/trezor.nix
-    ./modules/machines/t470s.nix
-    ./modules/programs/gnupg.nix
-    ./modules/programs/keybase.nix
-    ./modules/programs/tor.nix
-    ./modules/programs/i3.nix
-    ./modules/programs/infrastructure.nix
-    ./modules/programs/shell.nix
-    ./modules/satoshipay.nix
+    ./settings/base.nix
+    ./settings/configuration/berlin.nix
+    ./settings/configuration/british-english.nix
+    ./settings/configuration/nix.nix
+    ./settings/configuration/user.nix
+    ./settings/hardware/audio.nix
+    ./settings/hardware/systemd-boot.nix
+    ./settings/hardware/keyboardio-model01.nix
+    ./settings/hardware/network-manager.nix
+    ./settings/hardware/qwerty.nix
+    ./settings/hardware/trackball.nix
+    ./settings/hardware/trezor.nix
+    ./settings/machines/t470s.nix
+    ./settings/programs/gnupg.nix
+    ./settings/programs/keybase.nix
+    ./settings/programs/tor.nix
+    ./settings/programs/i3.nix
+    ./settings/programs/infrastructure.nix
+    ./settings/programs/shell.nix
+    ./settings/satoshipay.nix
   ];
 
   boot.initrd.luks.devices = [
diff --git a/system/modules/base.nix b/system/settings/base.nix
index 9e94a5a2..9e94a5a2 100644
--- a/system/modules/base.nix
+++ b/system/settings/base.nix
diff --git a/system/modules/configuration/berlin.nix b/system/settings/configuration/berlin.nix
index 246510c4..246510c4 100644
--- a/system/modules/configuration/berlin.nix
+++ b/system/settings/configuration/berlin.nix
diff --git a/system/modules/configuration/british-english.nix b/system/settings/configuration/british-english.nix
index 3ff93678..3ff93678 100644
--- a/system/modules/configuration/british-english.nix
+++ b/system/settings/configuration/british-english.nix
diff --git a/system/modules/configuration/england.nix b/system/settings/configuration/england.nix
index b2f799cd..b2f799cd 100644
--- a/system/modules/configuration/england.nix
+++ b/system/settings/configuration/england.nix
diff --git a/system/modules/configuration/nix.nix b/system/settings/configuration/nix.nix
index d254de0e..d254de0e 100644
--- a/system/modules/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
diff --git a/system/modules/configuration/user.nix b/system/settings/configuration/user.nix
index e7362bce..e7362bce 100644
--- a/system/modules/configuration/user.nix
+++ b/system/settings/configuration/user.nix
diff --git a/system/modules/gaming.nix b/system/settings/gaming.nix
index 0dbc5b12..0dbc5b12 100644
--- a/system/modules/gaming.nix
+++ b/system/settings/gaming.nix
diff --git a/system/modules/hardware/adb.nix b/system/settings/hardware/adb.nix
index 8b511f55..8b511f55 100644
--- a/system/modules/hardware/adb.nix
+++ b/system/settings/hardware/adb.nix
diff --git a/system/modules/hardware/audio.nix b/system/settings/hardware/audio.nix
index ed956919..ed956919 100644
--- a/system/modules/hardware/audio.nix
+++ b/system/settings/hardware/audio.nix
diff --git a/system/modules/hardware/bare-metal.nix b/system/settings/hardware/bare-metal.nix
index 0a61790a..0a61790a 100644
--- a/system/modules/hardware/bare-metal.nix
+++ b/system/settings/hardware/bare-metal.nix
diff --git a/system/modules/hardware/connman.nix b/system/settings/hardware/connman.nix
index 0361f9cb..0361f9cb 100644
--- a/system/modules/hardware/connman.nix
+++ b/system/settings/hardware/connman.nix
diff --git a/system/modules/hardware/grub2.nix b/system/settings/hardware/grub2.nix
index 70e86e71..70e86e71 100644
--- a/system/modules/hardware/grub2.nix
+++ b/system/settings/hardware/grub2.nix
diff --git a/system/modules/hardware/hidpi.nix b/system/settings/hardware/hidpi.nix
index 1f4644c5..1f4644c5 100644
--- a/system/modules/hardware/hidpi.nix
+++ b/system/settings/hardware/hidpi.nix
diff --git a/system/modules/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix
index fc6b6fa3..fc6b6fa3 100644
--- a/system/modules/hardware/intel-gpu.nix
+++ b/system/settings/hardware/intel-gpu.nix
diff --git a/system/modules/hardware/keyboardio-model01.nix b/system/settings/hardware/keyboardio-model01.nix
index 7a624f56..7a624f56 100644
--- a/system/modules/hardware/keyboardio-model01.nix
+++ b/system/settings/hardware/keyboardio-model01.nix
diff --git a/system/modules/hardware/laptop.nix b/system/settings/hardware/laptop.nix
index 17e27b63..17e27b63 100644
--- a/system/modules/hardware/laptop.nix
+++ b/system/settings/hardware/laptop.nix
diff --git a/system/modules/hardware/mouse.nix b/system/settings/hardware/mouse.nix
index b30d4124..b30d4124 100644
--- a/system/modules/hardware/mouse.nix
+++ b/system/settings/hardware/mouse.nix
diff --git a/system/modules/hardware/network-manager.nix b/system/settings/hardware/network-manager.nix
index f28548a1..f28548a1 100644
--- a/system/modules/hardware/network-manager.nix
+++ b/system/settings/hardware/network-manager.nix
diff --git a/system/modules/hardware/nitrokey.nix b/system/settings/hardware/nitrokey.nix
index a77ce00c..a77ce00c 100644
--- a/system/modules/hardware/nitrokey.nix
+++ b/system/settings/hardware/nitrokey.nix
diff --git a/system/modules/hardware/nvidia-gpu.nix b/system/settings/hardware/nvidia-gpu.nix
index 9fc34169..9fc34169 100644
--- a/system/modules/hardware/nvidia-gpu.nix
+++ b/system/settings/hardware/nvidia-gpu.nix
diff --git a/system/modules/hardware/printing.nix b/system/settings/hardware/printing.nix
index 96d3a959..96d3a959 100644
--- a/system/modules/hardware/printing.nix
+++ b/system/settings/hardware/printing.nix
diff --git a/system/modules/hardware/qwerty.nix b/system/settings/hardware/qwerty.nix
index c967d561..c967d561 100644
--- a/system/modules/hardware/qwerty.nix
+++ b/system/settings/hardware/qwerty.nix
diff --git a/system/modules/hardware/synaptics.nix b/system/settings/hardware/synaptics.nix
index 9f075cce..9f075cce 100644
--- a/system/modules/hardware/synaptics.nix
+++ b/system/settings/hardware/synaptics.nix
diff --git a/system/modules/hardware/systemd-boot.nix b/system/settings/hardware/systemd-boot.nix
index 80e79fdc..80e79fdc 100644
--- a/system/modules/hardware/systemd-boot.nix
+++ b/system/settings/hardware/systemd-boot.nix
diff --git a/system/modules/hardware/thinkpad.nix b/system/settings/hardware/thinkpad.nix
index 903e819b..903e819b 100644
--- a/system/modules/hardware/thinkpad.nix
+++ b/system/settings/hardware/thinkpad.nix
diff --git a/system/modules/hardware/trackball.nix b/system/settings/hardware/trackball.nix
index 9aa5abc0..9aa5abc0 100644
--- a/system/modules/hardware/trackball.nix
+++ b/system/settings/hardware/trackball.nix
diff --git a/system/modules/hardware/trezor.nix b/system/settings/hardware/trezor.nix
index 33cc6f25..33cc6f25 100644
--- a/system/modules/hardware/trezor.nix
+++ b/system/settings/hardware/trezor.nix
diff --git a/system/modules/kubernetes.nix b/system/settings/kubernetes.nix
index 692e46d6..692e46d6 100644
--- a/system/modules/kubernetes.nix
+++ b/system/settings/kubernetes.nix
diff --git a/system/modules/machines/t470s.nix b/system/settings/machines/t470s.nix
index 4ee6c2ac..4ee6c2ac 100644
--- a/system/modules/machines/t470s.nix
+++ b/system/settings/machines/t470s.nix
diff --git a/system/modules/machines/x250.nix b/system/settings/machines/x250.nix
index 0e8ac04e..0e8ac04e 100644
--- a/system/modules/machines/x250.nix
+++ b/system/settings/machines/x250.nix
diff --git a/system/modules/programs/accounting.nix b/system/settings/programs/accounting.nix
index e98c3e7e..e98c3e7e 100644
--- a/system/modules/programs/accounting.nix
+++ b/system/settings/programs/accounting.nix
diff --git a/system/modules/programs/barrier.nix b/system/settings/programs/barrier.nix
index 9a73620d..9a73620d 100644
--- a/system/modules/programs/barrier.nix
+++ b/system/settings/programs/barrier.nix
diff --git a/system/modules/programs/gnome.nix b/system/settings/programs/gnome.nix
index bd785453..bd785453 100644
--- a/system/modules/programs/gnome.nix
+++ b/system/settings/programs/gnome.nix
diff --git a/system/modules/programs/gnupg.nix b/system/settings/programs/gnupg.nix
index 663bcb3c..663bcb3c 100644
--- a/system/modules/programs/gnupg.nix
+++ b/system/settings/programs/gnupg.nix
diff --git a/system/modules/programs/i3.nix b/system/settings/programs/i3.nix
index b0140cdb..b0140cdb 100644
--- a/system/modules/programs/i3.nix
+++ b/system/settings/programs/i3.nix
diff --git a/system/modules/programs/infrastructure.nix b/system/settings/programs/infrastructure.nix
index 5e68bc8a..5e68bc8a 100644
--- a/system/modules/programs/infrastructure.nix
+++ b/system/settings/programs/infrastructure.nix
diff --git a/system/modules/programs/kde.nix b/system/settings/programs/kde.nix
index 652eb2a6..652eb2a6 100644
--- a/system/modules/programs/kde.nix
+++ b/system/settings/programs/kde.nix
diff --git a/system/modules/programs/keybase.nix b/system/settings/programs/keybase.nix
index 39a16b27..39a16b27 100644
--- a/system/modules/programs/keybase.nix
+++ b/system/settings/programs/keybase.nix
diff --git a/system/modules/programs/shell.nix b/system/settings/programs/shell.nix
index a8d4f56f..a8d4f56f 100644
--- a/system/modules/programs/shell.nix
+++ b/system/settings/programs/shell.nix
diff --git a/system/modules/programs/tor.nix b/system/settings/programs/tor.nix
index 5524aede..5524aede 100644
--- a/system/modules/programs/tor.nix
+++ b/system/settings/programs/tor.nix
diff --git a/system/modules/programs/window-manager.nix b/system/settings/programs/window-manager.nix
index 7095d523..7095d523 100644
--- a/system/modules/programs/window-manager.nix
+++ b/system/settings/programs/window-manager.nix
diff --git a/system/modules/programs/wine.nix b/system/settings/programs/wine.nix
index 98dd60a2..98dd60a2 100644
--- a/system/modules/programs/wine.nix
+++ b/system/settings/programs/wine.nix
diff --git a/system/modules/satoshipay.nix b/system/settings/satoshipay.nix
index 9cc5a341..9cc5a341 100644
--- a/system/modules/satoshipay.nix
+++ b/system/settings/satoshipay.nix
diff --git a/system/modules/services/syncthing.nix b/system/settings/services/syncthing.nix
index b6a12861..b6a12861 100644
--- a/system/modules/services/syncthing.nix
+++ b/system/settings/services/syncthing.nix
diff --git a/system/modules/services/xserver.nix b/system/settings/services/xserver.nix
index d898f55a..d898f55a 100644
--- a/system/modules/services/xserver.nix
+++ b/system/settings/services/xserver.nix
diff --git a/system/modules/services/zeroconf.nix b/system/settings/services/zeroconf.nix
index 0b428c54..0b428c54 100644
--- a/system/modules/services/zeroconf.nix
+++ b/system/settings/services/zeroconf.nix
diff --git a/system/modules/user-interface.nix b/system/settings/user-interface.nix
index 08d390ab..08d390ab 100644
--- a/system/modules/user-interface.nix
+++ b/system/settings/user-interface.nix
diff --git a/system/trillian.nix b/system/trillian.nix
index 184fa906..21245fe8 100644
--- a/system/trillian.nix
+++ b/system/trillian.nix
@@ -4,8 +4,8 @@
   imports = [
     ./private/default.nix
 
-    ./modules/programs/accounting.nix
-    ./modules/programs/shell.nix
+    ./settings/programs/accounting.nix
+    ./settings/programs/shell.nix
   ];
 
   nixpkgs.config = {