diff options
| author | Alan Pearce | 2017-09-23 10:36:42 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-09-23 10:36:42 +0200 |
| commit | 496b4ed379afe7f1e0563243a0a5efe0857fe3bb (patch) | |
| tree | eb8a416b7fe6d36f9cb732e06e120ccde9e500a1 | |
| parent | b48da7c8cafca69b44b2d39f36761647f393e069 (diff) | |
| download | nixfiles-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.tar.lz nixfiles-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.tar.zst nixfiles-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.zip | |
Create nested module hierarchy
| -rw-r--r-- | marvin.nix | 9 | ||||
| -rw-r--r-- | modules/i3.nix | 4 | ||||
| -rw-r--r-- | modules/laptop.nix | 4 | ||||
| -rw-r--r-- | modules/t470s.nix | 5 | ||||
| -rw-r--r-- | modules/thinkpad.nix | 4 | ||||
| -rw-r--r-- | modules/user-interface.nix | 4 | ||||
| -rw-r--r-- | modules/x250.nix | 5 | ||||
| -rw-r--r-- | satoshipad.nix | 7 |
8 files changed, 27 insertions, 15 deletions
diff --git a/marvin.nix b/marvin.nix index 7d6e7986..c3508fbe 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 ]; diff --git a/modules/i3.nix b/modules/i3.nix index 07bf64a2..3bba3bbb 100644 --- a/modules/i3.nix +++ b/modules/i3.nix @@ -9,4 +9,8 @@ i3status i3lock-color ]; + + imports = [ + ./window-manager.nix + ]; } diff --git a/modules/laptop.nix b/modules/laptop.nix index f0c88e7d..c50c28e4 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -70,4 +70,8 @@ systemd.services.nixos-upgrade.unitConfig.ConditionACPower = true; systemd.services.nix-gc.unitConfig.ConditionACPower = true; + + imports = [ + ./user-interface.nix + ]; } diff --git a/modules/t470s.nix b/modules/t470s.nix index 34d7f9e3..394df773 100644 --- a/modules/t470s.nix +++ b/modules/t470s.nix @@ -16,4 +16,9 @@ environment.systemPackages = with pkgs; [ nvme-cli ]; + + imports = [ + ./intel-gpu.nix + ./thinkpad.nix + ]; } diff --git a/modules/thinkpad.nix b/modules/thinkpad.nix index 009e3f08..38133d76 100644 --- a/modules/thinkpad.nix +++ b/modules/thinkpad.nix @@ -28,4 +28,8 @@ STOP_CHARGE_THRESH_BAT1=80 ''; }; + + imports = [ + ./bare-metal.nix + ]; } diff --git a/modules/user-interface.nix b/modules/user-interface.nix index d8a2b6a4..09cb2bc6 100644 --- a/modules/user-interface.nix +++ b/modules/user-interface.nix @@ -76,4 +76,8 @@ in services.urxvtd = { enable = true; }; + + imports = [ + ./xserver.nix + ]; } diff --git a/modules/x250.nix b/modules/x250.nix index a6509bf1..e163ec4f 100644 --- a/modules/x250.nix +++ b/modules/x250.nix @@ -31,4 +31,9 @@ SATA_LINKPWR_ON_BAT=medium_power SATA_LINKPWR_BLACKLIST="host1" ''; + + imports = [ + ./intel-gpu.nix + ./thinkpad.nix + ]; } diff --git a/satoshipad.nix b/satoshipad.nix index 6393c497..bc927248 100644 --- a/satoshipad.nix +++ b/satoshipad.nix @@ -5,8 +5,6 @@ ./hardware-configuration.nix ./modules/base.nix ./modules/grub2.nix - ./modules/laptop.nix - ./modules/thinkpad.nix ./modules/audio.nix ./modules/adb.nix ./modules/syncthing.nix @@ -17,14 +15,10 @@ ./modules/berlin.nix ./modules/colemak.nix ./modules/trackball.nix - ./modules/xserver.nix ./modules/british-english.nix - ./modules/bare-metal.nix ./modules/printing.nix - ./modules/intel-gpu.nix ./modules/t470s.nix ./modules/user.nix - ./modules/user-interface.nix ./modules/dev.nix ./modules/lisp.nix ./modules/javascript.nix @@ -36,7 +30,6 @@ ./modules/zeroconf.nix ./modules/nix.nix ./modules/i3.nix - ./modules/window-manager.nix ./modules/gnome.nix ./private/default.nix ]; |