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 /modules | |
| parent | b48da7c8cafca69b44b2d39f36761647f393e069 (diff) | |
| download | nixos-configuration-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.tar.lz nixos-configuration-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.tar.zst nixos-configuration-496b4ed379afe7f1e0563243a0a5efe0857fe3bb.zip | |
Create nested module hierarchy
Diffstat (limited to 'modules')
| -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 |
6 files changed, 26 insertions, 0 deletions
diff --git a/modules/i3.nix b/modules/i3.nix index 07bf64a..3bba3bb 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 f0c88e7..c50c28e 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 34d7f9e..394df77 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 009e3f0..38133d7 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 d8a2b6a..09cb2bc 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 a6509bf..e163ec4 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 + ]; } |