summary refs log tree commit diff stats
path: root/marvin.nix
diff options
context:
space:
mode:
authorAlan Pearce2017-09-23 10:36:42 +0200
committerAlan Pearce2017-09-23 10:36:42 +0200
commit496b4ed379afe7f1e0563243a0a5efe0857fe3bb (patch)
treeeb8a416b7fe6d36f9cb732e06e120ccde9e500a1 /marvin.nix
parentb48da7c8cafca69b44b2d39f36761647f393e069 (diff)
downloadnixos-configuration-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.tar.lz
nixos-configuration-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.tar.zst
nixos-configuration-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.zip
Create nested module hierarchy
Diffstat (limited to 'marvin.nix')
-rw-r--r--marvin.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/marvin.nix b/marvin.nix
index 7d6e798..c3508fb 100644
--- a/marvin.nix
+++ b/marvin.nix
@@ -3,8 +3,6 @@
 { imports = [
     ./hardware-configuration.nix
     ./modules/systemd-boot.nix
-    ./modules/laptop.nix
-    ./modules/thinkpad.nix
     ./modules/audio.nix
     ./modules/adb.nix
     ./modules/syncthing.nix
@@ -14,13 +12,9 @@
     ./modules/berlin.nix
     ./modules/colemak.nix
     ./modules/trackball.nix
-    ./modules/xserver.nix
     ./modules/british-english.nix
-    ./modules/bare-metal.nix
-    ./modules/intel-gpu.nix
     ./modules/x250.nix
     ./modules/user.nix
-    ./modules/user-interface.nix
     ./modules/dev.nix
     ./modules/lisp.nix
     ./modules/javascript.nix
@@ -28,8 +22,7 @@
     ./modules/accounting.nix
     ./modules/passwords.nix
     ./modules/network-manager.nix
-    ./modules/nix.nix
-    ./modules/window-manager.nix
+    ./modules/nix.nix 
     ./modules/i3.nix
   ];