diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-02-26 03:18:37 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2016-02-26 03:18:37 +0100 |
| commit | 4b435f20075d73cfcea7c7a9c2ebebb86015c818 (patch) | |
| tree | f842bbe57c87ac3f5a93d63af752b7cd2d21418e /modules/module-list.nix | |
| parent | 3cbe26730d6e7b64040979d512afe46f90ed33ab (diff) | |
| parent | f3f4e855600a10cc1ae7275f9ecf302160430b6a (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules/module-list.nix')
| -rw-r--r-- | modules/module-list.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/module-list.nix b/modules/module-list.nix index a606acb3..a0672259 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -1,12 +1,12 @@ [ ./hardware/gamecontroller.nix ./hardware/t100ha + ./hardware/thinkpad.nix ./profiles/common.nix ./profiles/tests.nix ./services/multipath-vpn.nix ./services/postfix ./system/iso.nix - ./system/thinkpad.nix ./user/aszlig/profiles/base.nix ./user/aszlig/profiles/workstation ./user/aszlig/programs/gajim |