From 5d0725a0632ce0ae7daa80755248b3e226392631 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 20 Jun 2020 08:21:15 -0400 Subject: Revert "Merge nixos-hardware into nixpkgs under `/nixos/hardware`" --- .github/CODEOWNERS | 9 - nixos/hardware/CODEOWNERS | 0 nixos/hardware/CONTRIBUTING.md | 31 - nixos/hardware/COPYING | 111 --- nixos/hardware/README.md | 115 --- nixos/hardware/acer/aspire/4810t/README.wiki | 110 --- nixos/hardware/acer/aspire/4810t/default.nix | 29 - nixos/hardware/airis/n990/default.nix | 21 - nixos/hardware/apple/default.nix | 12 - nixos/hardware/apple/macbook-air/3/default.nix | 15 - nixos/hardware/apple/macbook-air/4/default.nix | 16 - nixos/hardware/apple/macbook-air/6/default.nix | 18 - nixos/hardware/apple/macbook-air/default.nix | 8 - nixos/hardware/apple/macbook-pro/10-1/README.wiki | 9 - nixos/hardware/apple/macbook-pro/10-1/default.nix | 21 - nixos/hardware/apple/macbook-pro/11-5/README.md | 32 - nixos/hardware/apple/macbook-pro/11-5/default.nix | 27 - nixos/hardware/apple/macbook-pro/12-1/default.nix | 14 - nixos/hardware/apple/macbook-pro/default.nix | 7 - nixos/hardware/asus/wireless-ac1300.nix | 6 - nixos/hardware/audio-gd/compass2.nix | 7 - .../hardware/beagleboard/pocketbeagle/default.nix | 10 - nixos/hardware/common/cpu/amd/default.nix | 6 - nixos/hardware/common/cpu/intel/default.nix | 15 - .../common/cpu/intel/kaby-lake/default.nix | 8 - .../common/cpu/intel/sandy-bridge/default.nix | 9 - nixos/hardware/common/pc/default.nix | 5 - nixos/hardware/common/pc/hdd/default.nix | 7 - nixos/hardware/common/pc/laptop/acpi_call.nix | 10 - nixos/hardware/common/pc/laptop/default.nix | 7 - nixos/hardware/common/pc/laptop/hdd/default.nix | 8 - nixos/hardware/common/pc/laptop/ssd | 1 - nixos/hardware/common/pc/ssd/default.nix | 9 - nixos/hardware/default.nix | 3 - nixos/hardware/dell/e7240/README.md | 8 - nixos/hardware/dell/e7240/default.nix | 8 - nixos/hardware/dell/latitude/3480/default.nix | 14 - nixos/hardware/dell/xps/13-7390/README.wiki | 16 - nixos/hardware/dell/xps/13-7390/default.nix | 13 - nixos/hardware/dell/xps/13-9360/default.nix | 34 - .../hardware/dell/xps/13-9360/qca6174-firmware.nix | 26 - nixos/hardware/dell/xps/13-9370/README.wiki | 16 - nixos/hardware/dell/xps/13-9370/default.nix | 20 - nixos/hardware/dell/xps/13-9380/README.wiki | 20 - nixos/hardware/dell/xps/13-9380/default.nix | 18 - nixos/hardware/dell/xps/15-7590/README.wiki | 54 -- nixos/hardware/dell/xps/15-7590/default.nix | 51 -- nixos/hardware/dell/xps/15-9550/README.wiki | 52 -- nixos/hardware/dell/xps/15-9550/default.nix | 18 - nixos/hardware/dell/xps/15-9560/README.wiki | 54 -- nixos/hardware/dell/xps/15-9560/default.nix | 24 - nixos/hardware/dell/xps/15-9560/intel/default.nix | 18 - nixos/hardware/dell/xps/15-9560/nvidia/default.nix | 20 - nixos/hardware/dell/xps/15-9560/xps-common.nix | 12 - nixos/hardware/google/pixelbook/default.nix | 9 - nixos/hardware/inversepath/usbarmory/README.txt | 6 - nixos/hardware/inversepath/usbarmory/default.nix | 46 - nixos/hardware/inversepath/usbarmory/host.nix | 19 - nixos/hardware/inversepath/usbarmory/kernel.config | 995 --------------------- nixos/hardware/inversepath/usbarmory/kernel.nix | 20 - .../inversepath/usbarmory/usbarmory-dts.patch | 418 --------- nixos/hardware/lenovo/ideapad/default.nix | 3 - nixos/hardware/lenovo/ideapad/z510/default.nix | 11 - nixos/hardware/lenovo/thinkpad/default.nix | 11 - nixos/hardware/lenovo/thinkpad/e495/default.nix | 11 - nixos/hardware/lenovo/thinkpad/l13/default.nix | 10 - nixos/hardware/lenovo/thinkpad/p53/default.nix | 10 - nixos/hardware/lenovo/thinkpad/t410/default.nix | 36 - nixos/hardware/lenovo/thinkpad/t420/default.nix | 9 - nixos/hardware/lenovo/thinkpad/t430/default.nix | 16 - nixos/hardware/lenovo/thinkpad/t440p/default.nix | 16 - nixos/hardware/lenovo/thinkpad/t440s/default.nix | 14 - nixos/hardware/lenovo/thinkpad/t450s/default.nix | 9 - nixos/hardware/lenovo/thinkpad/t460s/default.nix | 9 - nixos/hardware/lenovo/thinkpad/t470s/default.nix | 9 - nixos/hardware/lenovo/thinkpad/t480s/default.nix | 11 - nixos/hardware/lenovo/thinkpad/t490/default.nix | 31 - .../lenovo/thinkpad/t490/t490-profile-set.conf | 107 --- nixos/hardware/lenovo/thinkpad/t495/default.nix | 16 - nixos/hardware/lenovo/thinkpad/tp-smapi.nix | 11 - .../lenovo/thinkpad/x1-extreme/default.nix | 8 - .../lenovo/thinkpad/x1-extreme/gen2/default.nix | 48 - .../lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 36 - .../lenovo/thinkpad/x1/6th-gen/default.nix | 20 - .../hardware/lenovo/thinkpad/x1/7th-gen/audio.nix | 15 - .../lenovo/thinkpad/x1/7th-gen/default.nix | 7 - nixos/hardware/lenovo/thinkpad/x1/default.nix | 6 - nixos/hardware/lenovo/thinkpad/x140e/default.nix | 14 - nixos/hardware/lenovo/thinkpad/x220/default.nix | 10 - nixos/hardware/lenovo/thinkpad/x230/default.nix | 19 - nixos/hardware/lenovo/thinkpad/x250/default.nix | 7 - nixos/hardware/lenovo/thinkpad/x260/default.nix | 12 - nixos/hardware/lenovo/thinkpad/x270/default.nix | 6 - nixos/hardware/lenovo/thinkpad/x280/default.nix | 12 - nixos/hardware/microsoft/hyper-v/README.md | 63 -- nixos/hardware/microsoft/surface-pro/3/README.wiki | 41 - nixos/hardware/microsoft/surface-pro/3/default.nix | 9 - nixos/hardware/pcengines/apu/default.nix | 8 - nixos/hardware/purism/librem/13v3/README.md | 87 -- nixos/hardware/purism/librem/13v3/default.nix | 13 - nixos/hardware/purism/librem/15v3 | 1 - nixos/hardware/raspberry-pi/2/README.org | 23 - nixos/hardware/raspberry-pi/2/default.nix | 32 - nixos/hardware/samsung/np900x3c/README.wiki | 94 -- nixos/hardware/samsung/np900x3c/default.nix | 7 - nixos/hardware/supermicro/a1sri-2758f/default.nix | 9 - nixos/hardware/supermicro/x10sll-f/default.nix | 12 - nixos/hardware/tests/build-profile.nix | 19 - nixos/hardware/tests/run.py | 116 --- nixos/hardware/toshiba/swanky/README.md | 66 -- nixos/hardware/toshiba/swanky/default.nix | 27 - nixos/hardware/tuxedo/infinitybook/v4/default.nix | 5 - 112 files changed, 3927 deletions(-) delete mode 100644 nixos/hardware/CODEOWNERS delete mode 100644 nixos/hardware/CONTRIBUTING.md delete mode 100644 nixos/hardware/COPYING delete mode 100644 nixos/hardware/README.md delete mode 100644 nixos/hardware/acer/aspire/4810t/README.wiki delete mode 100644 nixos/hardware/acer/aspire/4810t/default.nix delete mode 100644 nixos/hardware/airis/n990/default.nix delete mode 100644 nixos/hardware/apple/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/3/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/4/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/6/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/10-1/README.wiki delete mode 100644 nixos/hardware/apple/macbook-pro/10-1/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/11-5/README.md delete mode 100644 nixos/hardware/apple/macbook-pro/11-5/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/12-1/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/default.nix delete mode 100644 nixos/hardware/asus/wireless-ac1300.nix delete mode 100644 nixos/hardware/audio-gd/compass2.nix delete mode 100644 nixos/hardware/beagleboard/pocketbeagle/default.nix delete mode 100644 nixos/hardware/common/cpu/amd/default.nix delete mode 100644 nixos/hardware/common/cpu/intel/default.nix delete mode 100644 nixos/hardware/common/cpu/intel/kaby-lake/default.nix delete mode 100644 nixos/hardware/common/cpu/intel/sandy-bridge/default.nix delete mode 100644 nixos/hardware/common/pc/default.nix delete mode 100644 nixos/hardware/common/pc/hdd/default.nix delete mode 100644 nixos/hardware/common/pc/laptop/acpi_call.nix delete mode 100644 nixos/hardware/common/pc/laptop/default.nix delete mode 100644 nixos/hardware/common/pc/laptop/hdd/default.nix delete mode 120000 nixos/hardware/common/pc/laptop/ssd delete mode 100644 nixos/hardware/common/pc/ssd/default.nix delete mode 100644 nixos/hardware/default.nix delete mode 100644 nixos/hardware/dell/e7240/README.md delete mode 100644 nixos/hardware/dell/e7240/default.nix delete mode 100644 nixos/hardware/dell/latitude/3480/default.nix delete mode 100644 nixos/hardware/dell/xps/13-7390/README.wiki delete mode 100644 nixos/hardware/dell/xps/13-7390/default.nix delete mode 100644 nixos/hardware/dell/xps/13-9360/default.nix delete mode 100644 nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix delete mode 100644 nixos/hardware/dell/xps/13-9370/README.wiki delete mode 100644 nixos/hardware/dell/xps/13-9370/default.nix delete mode 100644 nixos/hardware/dell/xps/13-9380/README.wiki delete mode 100644 nixos/hardware/dell/xps/13-9380/default.nix delete mode 100644 nixos/hardware/dell/xps/15-7590/README.wiki delete mode 100644 nixos/hardware/dell/xps/15-7590/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9550/README.wiki delete mode 100644 nixos/hardware/dell/xps/15-9550/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/README.wiki delete mode 100644 nixos/hardware/dell/xps/15-9560/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/intel/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/nvidia/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/xps-common.nix delete mode 100644 nixos/hardware/google/pixelbook/default.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/README.txt delete mode 100644 nixos/hardware/inversepath/usbarmory/default.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/host.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/kernel.config delete mode 100644 nixos/hardware/inversepath/usbarmory/kernel.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch delete mode 100644 nixos/hardware/lenovo/ideapad/default.nix delete mode 100644 nixos/hardware/lenovo/ideapad/z510/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/e495/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/l13/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/p53/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t410/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t420/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t430/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t440p/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t440s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t450s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t460s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t470s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t480s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t490/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf delete mode 100644 nixos/hardware/lenovo/thinkpad/t495/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/tp-smapi.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x140e/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x220/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x230/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x250/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x260/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x270/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x280/default.nix delete mode 100644 nixos/hardware/microsoft/hyper-v/README.md delete mode 100644 nixos/hardware/microsoft/surface-pro/3/README.wiki delete mode 100644 nixos/hardware/microsoft/surface-pro/3/default.nix delete mode 100644 nixos/hardware/pcengines/apu/default.nix delete mode 100644 nixos/hardware/purism/librem/13v3/README.md delete mode 100644 nixos/hardware/purism/librem/13v3/default.nix delete mode 120000 nixos/hardware/purism/librem/15v3 delete mode 100644 nixos/hardware/raspberry-pi/2/README.org delete mode 100644 nixos/hardware/raspberry-pi/2/default.nix delete mode 100644 nixos/hardware/samsung/np900x3c/README.wiki delete mode 100644 nixos/hardware/samsung/np900x3c/default.nix delete mode 100644 nixos/hardware/supermicro/a1sri-2758f/default.nix delete mode 100644 nixos/hardware/supermicro/x10sll-f/default.nix delete mode 100644 nixos/hardware/tests/build-profile.nix delete mode 100755 nixos/hardware/tests/run.py delete mode 100644 nixos/hardware/toshiba/swanky/README.md delete mode 100644 nixos/hardware/toshiba/swanky/default.nix delete mode 100644 nixos/hardware/tuxedo/infinitybook/v4/default.nix diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9b2fdd85c31d..5376d51a6178 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,15 +55,6 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc -# NixOS hardware descriptions -/nixos/hardware/beagleboard/pocketbeagle @yegortimoshenko -/nixos/hardware/dell/xps/13-9370 @moredread -/nixos/hardware/dell/xps/13-9380 @kalbasit -/nixos/hardware/lenovo/thinkpad/x230 @makefu @yegortimoshenko -/nixos/hardware/lenovo/thinkpad/x250 @Mic92 -/nixos/hardware/pcengines/apu @yegortimoshenko -/nixos/hardware/purism/librem/13v3 @yegortimoshenko - # Updaters ## update.nix /maintainers/scripts/update.nix @jtojnar diff --git a/nixos/hardware/CODEOWNERS b/nixos/hardware/CODEOWNERS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/nixos/hardware/CONTRIBUTING.md b/nixos/hardware/CONTRIBUTING.md deleted file mode 100644 index ea468923ae10..000000000000 --- a/nixos/hardware/CONTRIBUTING.md +++ /dev/null @@ -1,31 +0,0 @@ -# Writing profiles - -When setting an option, use `lib.mkDefault` unless: -- The option *must* be set and the user should get an error if they try to override it. -- The setting should merge with the user's settings (typical for list or set options). - -For example: - -```nix -{ lib }: { - # Using mkDefault, because the user might want to disable tlp - services.tlp.enable = lib.mkDefault true; - # No need to use mkDefault, because the setting will merge with the user's setting - boot.kernelModules = [ "tmp_smapi" ]; -} -``` - -Try to avoid "opinionated" settings relating to optional features like sound, bluetooth, choice of bootloader etc. - -Where possible, use module imports to share code between similar hardware variants. - -# Performance - -Profiles should favor usability and stability, so performance improvements should either be conservative or -be guarded behind additional NixOS module options. - -If it makes sense to have a performance-focussed config, it can be declared in a separate profile. - -# Testing - -Because profiles can only be tested with the appropriate hardware, quality assurance is up to *you*. diff --git a/nixos/hardware/COPYING b/nixos/hardware/COPYING deleted file mode 100644 index 47c6e27d1700..000000000000 --- a/nixos/hardware/COPYING +++ /dev/null @@ -1,111 +0,0 @@ -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator and -subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for the -purpose of contributing to a commons of creative, cultural and scientific -works ("Commons") that the public can reliably and without fear of later -claims of infringement build upon, modify, incorporate in other works, reuse -and redistribute as freely as possible in any form whatsoever and for any -purposes, including without limitation commercial purposes. These owners may -contribute to the Commons to promote the ideal of a free culture and the -further production of creative, cultural and scientific works, or to gain -reputation or greater distribution for their Work in part through the use and -efforts of others. - -For these and/or other purposes and motivations, and without any expectation -of additional consideration or compensation, the person associating CC0 with a -Work (the "Affirmer"), to the extent that he or she is an owner of Copyright -and Related Rights in the Work, voluntarily elects to apply CC0 to the Work -and publicly distribute the Work under its terms, with knowledge of his or her -Copyright and Related Rights in the Work and the meaning and intended legal -effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not limited -to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, communicate, - and translate a Work; - - ii. moral rights retained by the original author(s) and/or performer(s); - - iii. publicity and privacy rights pertaining to a person's image or likeness - depicted in a Work; - - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - - v. rights protecting the extraction, dissemination, use and reuse of data in - a Work; - - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation thereof, - including any amended or successor version of such directive); and - - vii. other similar, equivalent or corresponding rights throughout the world - based on applicable law or treaty, and any national implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention of, -applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and -unconditionally waives, abandons, and surrenders all of Affirmer's Copyright -and Related Rights and associated claims and causes of action, whether now -known or unknown (including existing as well as future claims and causes of -action), in the Work (i) in all territories worldwide, (ii) for the maximum -duration provided by applicable law or treaty (including future time -extensions), (iii) in any current or future medium and for any number of -copies, and (iv) for any purpose whatsoever, including without limitation -commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes -the Waiver for the benefit of each member of the public at large and to the -detriment of Affirmer's heirs and successors, fully intending that such Waiver -shall not be subject to revocation, rescission, cancellation, termination, or -any other legal or equitable action to disrupt the quiet enjoyment of the Work -by the public as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason be -judged legally invalid or ineffective under applicable law, then the Waiver -shall be preserved to the maximum extent permitted taking into account -Affirmer's express Statement of Purpose. In addition, to the extent the Waiver -is so judged Affirmer hereby grants to each affected person a royalty-free, -non transferable, non sublicensable, non exclusive, irrevocable and -unconditional license to exercise Affirmer's Copyright and Related Rights in -the Work (i) in all territories worldwide, (ii) for the maximum duration -provided by applicable law or treaty (including future time extensions), (iii) -in any current or future medium and for any number of copies, and (iv) for any -purpose whatsoever, including without limitation commercial, advertising or -promotional purposes (the "License"). The License shall be deemed effective as -of the date CC0 was applied by Affirmer to the Work. Should any part of the -License for any reason be judged legally invalid or ineffective under -applicable law, such partial invalidity or ineffectiveness shall not -invalidate the remainder of the License, and in such case Affirmer hereby -affirms that he or she will not (i) exercise any of his or her remaining -Copyright and Related Rights in the Work or (ii) assert any associated claims -and causes of action with respect to the Work, in either case contrary to -Affirmer's express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - - b. Affirmer offers the Work as-is and makes no representations or warranties - of any kind concerning the Work, express, implied, statutory or otherwise, - including without limitation warranties of title, merchantability, fitness - for a particular purpose, non infringement, or the absence of latent or - other defects, accuracy, or the present or absence of errors, whether or not - discoverable, all to the greatest extent permissible under applicable law. - - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without limitation - any person's Copyright and Related Rights in the Work. Further, Affirmer - disclaims responsibility for obtaining any necessary consents, permissions - or other rights required for any use of the Work. - - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to this - CC0 or use of the Work. diff --git a/nixos/hardware/README.md b/nixos/hardware/README.md deleted file mode 100644 index 1dff0a8daad1..000000000000 --- a/nixos/hardware/README.md +++ /dev/null @@ -1,115 +0,0 @@ -NixOS profiles covering hardware quirks. - -## Setup - -Add and update `nixos-hardware` channel: - -``` -$ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware -$ sudo nix-channel --update -``` - -Then import an appropriate profile path from the table below. For example, to -enable ThinkPad X220 profile, your `imports` in `/etc/nixos/configuration.nix` -should look like: - -``` -imports = [ - - ./hardware-configuration.nix -]; -``` - -## Incomplete list of Profiles - -See code for all available configurations. - -| Model | Path | -| --------------------------------- | -------------------------------------------------- | -| [Acer Aspire 4810T][] | `` | -| Airis N990 | `` | -| Apple MacBook Air 3,X | `` | -| Apple MacBook Air 4,X | `` | -| Apple MacBook Air 6,X | `` | -| [Apple MacBook Pro 10,1][] | `` | -| Apple MacBook Pro 12,1 | `` | -| BeagleBoard PocketBeagle | `` | -| Dell Latitude 3480 | `` | -| [Dell XPS E7240][] | `` | -| [Dell XPS 13 7390][] | `` | -| [Dell XPS 13 9360][] | `` | -| [Dell XPS 13 9370][] | `` | -| [Dell XPS 13 9380][] | `` | -| [Dell XPS 15 7590][] | `` | -| [Dell XPS 15 9550][] | `` | -| [Dell XPS 15 9560][] | `` | -| [Dell XPS 15 9560, intel only][] | `` | -| [Dell XPS 15 9560, nvidia only][] | `` | -| [Google Pixelbook][] | `` | -| [Inverse Path USB armory][] | `` | -| Lenovo IdeaPad Z510 | `` | -| Lenovo ThinkPad E495 | `` | -| Lenovo ThinkPad L13 | `` | -| Lenovo ThinkPad P53 | `` | -| Lenovo ThinkPad T410 | `` | -| Lenovo ThinkPad T420 | `` | -| Lenovo ThinkPad T430 | `` | -| Lenovo ThinkPad T440s | `` | -| Lenovo ThinkPad T440p | `` | -| Lenovo ThinkPad T450s | `` | -| Lenovo ThinkPad T460s | `` | -| Lenovo ThinkPad T470s | `` | -| Lenovo ThinkPad T480s | `` | -| Lenovo ThinkPad T490 | `` | -| Lenovo ThinkPad T495 | `` | -| Lenovo ThinkPad X140e | `` | -| Lenovo ThinkPad X220 | `` | -| Lenovo ThinkPad X230 | `` | -| Lenovo ThinkPad X250 | `` | -| [Lenovo ThinkPad X260][] | `` | -| Lenovo ThinkPad X270 | `` | -| Lenovo ThinkPad X280 | `` | -| [Lenovo ThinkPad X1 (6th Gen)][] | `` | -| [Lenovo ThinkPad X1 (7th Gen)][] | `` | -| Lenovo ThinkPad X1 Extreme Gen 2 | `` | -| [Microsoft Surface Pro 3][] | `` | -| PC Engines APU | `` | -| [Raspberry Pi 2][] | `` | -| [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3][] | `` | -| [Purism Librem 15v3][] | `` | -| Supermicro A1SRi-2758F | `` | -| Supermicro X10SLL-F | `` | -| [Toshiba Chromebook 2 `swanky`][] | `` | -| [Tuxedo InfinityBook v4][] | `` | - -[Acer Aspire 4810T]: acer/aspire/4810t -[Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 -[Dell XPS E7240]: dell/e7240 -[Dell XPS 13 7390]: dell/xps/13-7390 -[Dell XPS 13 9360]: dell/xps/13-9360 -[Dell XPS 13 9370]: dell/xps/13-9370 -[Dell XPS 13 9380]: dell/xps/13-9380 -[Dell XPS 15 7590]: dell/xps/15-7590 -[Dell XPS 15 9550]: dell/xps/15-9550 -[Dell XPS 15 9560]: dell/xps/15-9560 -[Dell XPS 15 9560, intel only]: dell/xps/15-9560/intel -[Dell XPS 15 9560, nvidia only]: dell/xps/15-9560/nvidia -[Google Pixelbook]: google/pixelbook -[Inverse Path USB armory]: inversepath/usbarmory -[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen -[Lenovo ThinkPad X1 (7th Gen)]: lenovo/thinkpad/x1/7th-gen -[Lenovo ThinkPad X260]: lenovo/thinkpad/x260 -[Microsoft Surface Pro 3]: microsoft/surface-pro/3 -[Raspberry Pi 2]: raspberry-pi/2 -[Samsung Series 9 NP900X3C]: samsung/np900x3c -[Purism Librem 13v3]: purism/librem/13v3 -[Purism Librem 13v5]: purism/librem/13v5 -[Toshiba Chromebook 2 `swanky`]: toshiba/swanky -[Tuxedo InfinityBook v4]: nixos-hardware/tuxedo/infinitybook/v4 - -## How to contribute a new device profile - -1. Add your device profile expression in the appropriate directory -2. Link it in the table in README.md -3. Run ./tests/run.py to test it. The test script script will parse all the profiles from the README.md diff --git a/nixos/hardware/acer/aspire/4810t/README.wiki b/nixos/hardware/acer/aspire/4810t/README.wiki deleted file mode 100644 index 0b045b6e4da8..000000000000 --- a/nixos/hardware/acer/aspire/4810t/README.wiki +++ /dev/null @@ -1,110 +0,0 @@ -= Overview = -* CPU: Intel Core 2 Solo U3500 @ 1.40GHz (speeds: 0.8, 1.2 and 1.4GHz), 3MB L2 -* Screen: 1366x768 LED - -= BIOS versions = -* 1.10 - average ACPI temperature around 34°C, good GL playing -* 1.20 - average ACPI temperature around 39°C, good GL playing -* 1.31 - big slowdown in X windows from time to time, GL games with annoying slowdowns regularly - -The most recent BIOS updates (1.20 onwards) come with a DOS flasher; older come only with a windows flasher. I used a [http://www.pcengines.ch/freedos.htm freedos image] stored in a USB flash memory to boot freedos and flash the BIOS. - -= Drivers = -All provided in linux 2.6.32 kernels. - -Linux 2.6.29 has problems at least with the wire ethernet card (Attansic Technology Corp. Device 1063). Loading and unloading the ethernet card driver module (atl1c) helps getting a working link, although it will change from eth0 to eth1, eth2, or another interface name. - -== lspci == - 00:00.0 Host bridge: Intel Corporation Mobile 4 Series Chipset Memory Controller Hub (rev 07) - 00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07) - 00:02.1 Display controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07) - 00:1a.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #4 (rev 03) - 00:1a.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #5 (rev 03) - 00:1a.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #2 (rev 03) - 00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 03) - 00:1c.0 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 1 (rev 03) - 00:1c.1 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 2 (rev 03) - 00:1d.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #1 (rev 03) - 00:1d.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #2 (rev 03) - 00:1d.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #3 (rev 03) - 00:1d.3 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #6 (rev 03) - 00:1d.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #1 (rev 03) - 00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev 93) - 00:1f.0 ISA bridge: Intel Corporation ICH9M-E LPC Interface Controller (rev 03) - 00:1f.2 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03) - 00:1f.3 SMBus: Intel Corporation 82801I (ICH9 Family) SMBus Controller (rev 03) - 00:1f.5 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03) - 00:1f.6 Signal processing controller: Intel Corporation 82801I (ICH9 Family) Thermal Subsystem (rev 03) - 01:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0) - 02:00.0 Network controller: Intel Corporation Wireless WiFi Link 5100 - -= Configuration = - - { - # Make te network WLAN card (wlan0) firmware available - require = [ ./nixos/modules/hardware/network/intel-5000.nix ]; - - boot = rec { - initrd = { - kernelModules = [ "ata_piix" "reiserfs" ]; - }; - kernelParams = [ - "selinux=0" - "apm=on" - "acpi=on" - "vga=0x317" - "console=tty1" - "video=vesafb:ywrap" - # Important, to disable Kernel Mode Setting for the graphics card - # This will allow backlight regulation - "nomodeset" - ]; - kernelModules = [ - "acpi-cpufreq" - "cpufreq-ondemand" # not autoloaded in 2.6.32.2 - "kvm-intel" - ]; - resumeDevice = "8:2"; - extraKernelParams = ["resume=/dev/sda2"]; - kernelPackages = pkgs.kernelPackages_2_6_32; - postBootCommands = '' - echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - ''; - }; - - services = { - xserver = { - enable = true; - defaultDepth = 24; - videoDriver = "intel"; - exportConfiguration = true; - enableTCP = true; - autorun = true; - driSupport = false; - synaptics = { - enable = true; - dev = "/dev/input/event8"; - }; - }; - }; - -= X settings = - -== Backlight == -Having disabled Kernel Mode Setting for the i915 kernel drm module (kernel parameter ''nomodeset''), use ''xrandr'' to set: - xrandr --output LVDS --set BACKLIGHT_CONTROL combination - xrandr --output LVDS --set BACKLIGHT 300 # ~1000, max light. - -If those steps make your mouse cursor not appear, switch to another VT, and then back to X, and it will come. - -== Synaptics pad == -I like the pad speed set by: - synclient MaxTapTime=0 MaxSpeed=1.12 MinSpeed=0.6 AccelFactor=0.001 VertEdgeScroll=1 -Install the ''xf86-input-synaptics-1.2.0'' for ''synclient'' to be in your PATH. - -= Suspending and hibernating = -Usual pm-utils work, with pm-suspend and pm-hibernate. - -[[Category:Installation]] -[[Category:Hardware]] -[[Category:Laptops]] diff --git a/nixos/hardware/acer/aspire/4810t/default.nix b/nixos/hardware/acer/aspire/4810t/default.nix deleted file mode 100644 index d40b454b3aa4..000000000000 --- a/nixos/hardware/acer/aspire/4810t/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ]; - - boot = { - initrd.kernelModules = [ "ata_piix" ]; - kernelParams = [ - "apm=on" - "acpi=on" - "vga=0x317" - "video=vesafb:ywrap" - - # Important, disable KMS to fix backlight regulation: - "nomodeset" - ]; - }; - - # TODO: reverse compat - hardware.opengl.driSupport = false; - - # TODO: reverse compat - services.xserver = { - defaultDepth = lib.mkDefault 24; - }; -} diff --git a/nixos/hardware/airis/n990/default.nix b/nixos/hardware/airis/n990/default.nix deleted file mode 100644 index ae06813131a8..000000000000 --- a/nixos/hardware/airis/n990/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ ../../common/pc/laptop ]; - - boot = { - initrd.kernelModules = [ "pata_via" ]; - - kernelParams = [ - "apm=on" - "acpi=on" - "vga=0x317" # 1024x768 - "console=tty1" - "video=vesafb:ywrap" # Faster scroll - ]; - }; - - hardware.firmware = with pkgs; [ intel2200BGFirmware ]; - - services.xserver.videoDrivers = [ "openchrome" ]; -} diff --git a/nixos/hardware/apple/default.nix b/nixos/hardware/apple/default.nix deleted file mode 100644 index a2ee26230aaa..000000000000 --- a/nixos/hardware/apple/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: - -{ - boot.kernelParams = [ - "hid_apple.iso_layout=0" - ]; - - hardware.facetimehd.enable = lib.mkDefault - (config.nixpkgs.config.allowUnfree or false); - - services.mbpfan.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/apple/macbook-air/3/default.nix b/nixos/hardware/apple/macbook-air/3/default.nix deleted file mode 100644 index 03221edcd0b0..000000000000 --- a/nixos/hardware/apple/macbook-air/3/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, ... }: - -{ - imports = [ - ../../. - ../../../common/pc/laptop - ../../../common/pc/ssd - ]; - - # Built-in iSight is recognized by the generic uvcvideo kernel module - hardware.facetimehd.enable = false; - - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/hardware/apple/macbook-air/4/default.nix b/nixos/hardware/apple/macbook-air/4/default.nix deleted file mode 100644 index 181a099799a1..000000000000 --- a/nixos/hardware/apple/macbook-air/4/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel/sandy-bridge - ]; - - boot.kernelParams = [ - "acpi_backlight=vendor" - ]; - - services.xserver.deviceSection = lib.mkDefault '' - Option "TearFree" "true" - ''; -} diff --git a/nixos/hardware/apple/macbook-air/6/default.nix b/nixos/hardware/apple/macbook-air/6/default.nix deleted file mode 100644 index 555d70418b85..000000000000 --- a/nixos/hardware/apple/macbook-air/6/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, ... }: - -{ - imports = [ ../. ]; - - boot = { - extraModulePackages = with config.boot.kernelPackages; [ mba6x_bl ]; - kernelModules = [ "mba6x_bl" ]; - - # Divides power consumption by two. - kernelParams = [ "acpi_osi=" ]; - }; - - services.xserver.deviceSection = lib.mkDefault '' - Option "Backlight" "mba6x_backlight" - Option "TearFree" "true" - ''; -} diff --git a/nixos/hardware/apple/macbook-air/default.nix b/nixos/hardware/apple/macbook-air/default.nix deleted file mode 100644 index ea15175d0319..000000000000 --- a/nixos/hardware/apple/macbook-air/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ - ../. - ../../common/cpu/intel - ../../common/pc/laptop - ../../common/pc/laptop/ssd - ]; -} diff --git a/nixos/hardware/apple/macbook-pro/10-1/README.wiki b/nixos/hardware/apple/macbook-pro/10-1/README.wiki deleted file mode 100644 index 149b30e6ed22..000000000000 --- a/nixos/hardware/apple/macbook-pro/10-1/README.wiki +++ /dev/null @@ -1,9 +0,0 @@ -= Apple MacBook Pro 10,1 = - -I presume the associated configuration also will work with to other 10,x models. - -If you don't have an Ethernet adapter, make sure your NixOS installer has a sufficiently modern kernel or you will be stuck without internet and unable to installer. - -Note that (with NixPkgs circa late October 2016) Linux 4.8.1 does not work: everything will boot through X, but then manually-run commands accessing peripherals (nmcli, lspci, etc) will hang inexplicably. - -Thankfully no tweaking of the BIOS or similar was needed. Do note that if your MacOS partition is encrypted, you will have an easier time shrinking it from within MacOS, but this is standard advice. diff --git a/nixos/hardware/apple/macbook-pro/10-1/default.nix b/nixos/hardware/apple/macbook-pro/10-1/default.nix deleted file mode 100644 index e029ef21ecac..000000000000 --- a/nixos/hardware/apple/macbook-pro/10-1/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/pc/laptop/ssd - ]; - - # TODO: boot loader - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # TODO: reverse compat - hardware.opengl.driSupport32Bit = true; - - services.xserver = { - # TODO: we should not enable unfree drivers - # when there is an alternative (i.e. nouveau) - videoDrivers = [ "nvidia" ]; - }; -} diff --git a/nixos/hardware/apple/macbook-pro/11-5/README.md b/nixos/hardware/apple/macbook-pro/11-5/README.md deleted file mode 100644 index 17e5ef1d36e0..000000000000 --- a/nixos/hardware/apple/macbook-pro/11-5/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# Apple MacBook Pro 11,5 - -This configuration will **not** work with MacBook Pro 11,2 or 11,3 models. - -## Notable features - -* Prevent intermittent USB 3.0 controller wakeup signal when the lid is closed. Without this fix your laptop may get very hot and drain the battery after waking up in your laptop bag. - - You can see for yourself which devices are allowed to wake up your laptop using the command: - - ```shell - cat /proc/acpi/wakeup - ``` - - This fix works for Linux kernel 3.13 and above. - - Sources: - - * [Fix unwanted laptop resume after lid is closed](https://medium.com/@laurynas.karvelis_95228/install-arch-linux-on-macbook-pro-11-2-retina-install-guide-for-year-2017-2034ceed4cb2#66ba) - * [Arch wiki: MacBookPro11,x Suspend](https://wiki.archlinux.org/index.php/MacBookPro11,x#Suspend) - * [simonvandel/dotfiles (nix config)](https://github.com/simonvandel/dotfiles/blob/f254a4a607257faee295ce798ed215273c342850/nixos/vandel-macair/configuration.nix#L45) - -## Graphics - -The [MacBookPro11,4 and MacBookPro11,5](https://support.apple.com/kb/SP719) models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU. - -You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it. - -## Additional resources - -* Arch linux wiki: [MacBookPro11,x](https://wiki.archlinux.org/index.php/MacBookPro11,x) -* Kernel patches: [MacBookPro11,x](https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11) diff --git a/nixos/hardware/apple/macbook-pro/11-5/default.nix b/nixos/hardware/apple/macbook-pro/11-5/default.nix deleted file mode 100644 index a53b5d8adeb4..000000000000 --- a/nixos/hardware/apple/macbook-pro/11-5/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, config, pkgs, ... }: - -let - - kernelPackages = config.boot.kernelPackages; - -in - -{ - imports = [ - ../. - ../../../common/pc/laptop/ssd - - ]; - - # Apparently this is currently only supported by ati_unfree drivers, not ati - hardware.opengl.driSupport32Bit = false; - - services.xserver.videoDrivers = [ "ati" ]; - - services.udev.extraRules = - # Disable XHC1 wakeup signal to avoid resume getting triggered some time - # after suspend. Reboot required for this to take effect. - lib.optionalString - (lib.versionAtLeast kernelPackages.kernel.version "3.13") - ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"''; -} diff --git a/nixos/hardware/apple/macbook-pro/12-1/default.nix b/nixos/hardware/apple/macbook-pro/12-1/default.nix deleted file mode 100644 index 02c6f328cf5a..000000000000 --- a/nixos/hardware/apple/macbook-pro/12-1/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../. - ../../../common/pc/laptop/ssd - - ]; - - # USB subsystem wakes up MBP right after suspend unless we disable it. - services.udev.extraRules = lib.mkDefault '' - SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled" - ''; -} diff --git a/nixos/hardware/apple/macbook-pro/default.nix b/nixos/hardware/apple/macbook-pro/default.nix deleted file mode 100644 index 4ced65a382e0..000000000000 --- a/nixos/hardware/apple/macbook-pro/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ../. - ../../common/cpu/intel - ../../common/pc/laptop - ]; -} diff --git a/nixos/hardware/asus/wireless-ac1300.nix b/nixos/hardware/asus/wireless-ac1300.nix deleted file mode 100644 index 6e9b815a0eb0..000000000000 --- a/nixos/hardware/asus/wireless-ac1300.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8812au ]; - boot.kernelModules = [ "8812au" ]; -} diff --git a/nixos/hardware/audio-gd/compass2.nix b/nixos/hardware/audio-gd/compass2.nix deleted file mode 100644 index 5268c1dab8d1..000000000000 --- a/nixos/hardware/audio-gd/compass2.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - boot = { - extraModprobeConfig = lib.mkDefault '' - options snd slots=snd_usb_audio,snd-hda-intel - ''; - }; -} diff --git a/nixos/hardware/beagleboard/pocketbeagle/default.nix b/nixos/hardware/beagleboard/pocketbeagle/default.nix deleted file mode 100644 index bc426300f458..000000000000 --- a/nixos/hardware/beagleboard/pocketbeagle/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, ... }: - -{ - boot.kernelParams = [ "console=ttyO0,115200n8" ]; - - boot.loader = { - generic-extlinux-compatible.enable = lib.mkDefault true; - grub.enable = lib.mkDefault false; - }; -} diff --git a/nixos/hardware/common/cpu/amd/default.nix b/nixos/hardware/common/cpu/amd/default.nix deleted file mode 100644 index d8c48a263081..000000000000 --- a/nixos/hardware/common/cpu/amd/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, ... }: - -{ - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/hardware/common/cpu/intel/default.nix b/nixos/hardware/common/cpu/intel/default.nix deleted file mode 100644 index ad945f394a6c..000000000000 --- a/nixos/hardware/common/cpu/intel/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot.initrd.kernelModules = [ "i915" ]; - - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; - - hardware.opengl.extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-media-driver - ]; -} diff --git a/nixos/hardware/common/cpu/intel/kaby-lake/default.nix b/nixos/hardware/common/cpu/intel/kaby-lake/default.nix deleted file mode 100644 index e6a2d1ce8e6e..000000000000 --- a/nixos/hardware/common/cpu/intel/kaby-lake/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ ../. ]; - - boot.kernelParams = [ - "i915.enable_fbc=1" - "i915.enable_psr=2" - ]; -} diff --git a/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix b/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix deleted file mode 100644 index 682815cee473..000000000000 --- a/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ ../. ]; - - # Enables RC6, RC6p and RC6pp. - # Last two are only available on Sandy Bridge CPUs (circa 2011). - boot.kernelParams = [ - "i915.enable_rc6=7" - ]; -} diff --git a/nixos/hardware/common/pc/default.nix b/nixos/hardware/common/pc/default.nix deleted file mode 100644 index 0b498ff1d20e..000000000000 --- a/nixos/hardware/common/pc/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - services.xserver.libinput.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/common/pc/hdd/default.nix b/nixos/hardware/common/pc/hdd/default.nix deleted file mode 100644 index 8cc5ada0deb9..000000000000 --- a/nixos/hardware/common/pc/hdd/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, ... }: - -{ - boot.kernel.sysctl = { - "vm.swappiness" = lib.mkDefault 10; - }; -} diff --git a/nixos/hardware/common/pc/laptop/acpi_call.nix b/nixos/hardware/common/pc/laptop/acpi_call.nix deleted file mode 100644 index f8c17dcc4901..000000000000 --- a/nixos/hardware/common/pc/laptop/acpi_call.nix +++ /dev/null @@ -1,10 +0,0 @@ -# acpi_call makes tlp work for newer thinkpads - -{ config, ... }: - -{ - boot = { - kernelModules = [ "acpi_call" ]; - extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; - }; -} diff --git a/nixos/hardware/common/pc/laptop/default.nix b/nixos/hardware/common/pc/laptop/default.nix deleted file mode 100644 index 946d066d04d5..000000000000 --- a/nixos/hardware/common/pc/laptop/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, ... }: - -{ - imports = [ ../. ]; - - services.tlp.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/common/pc/laptop/hdd/default.nix b/nixos/hardware/common/pc/laptop/hdd/default.nix deleted file mode 100644 index 63f29d458c29..000000000000 --- a/nixos/hardware/common/pc/laptop/hdd/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, ... }: - -{ - imports = [ ../../hdd ]; - - # Hard disk protection if the laptop falls: - services.hdapsd.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/common/pc/laptop/ssd b/nixos/hardware/common/pc/laptop/ssd deleted file mode 120000 index e313834a4372..000000000000 --- a/nixos/hardware/common/pc/laptop/ssd +++ /dev/null @@ -1 +0,0 @@ -../ssd \ No newline at end of file diff --git a/nixos/hardware/common/pc/ssd/default.nix b/nixos/hardware/common/pc/ssd/default.nix deleted file mode 100644 index 00922e649938..000000000000 --- a/nixos/hardware/common/pc/ssd/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, ... }: - -{ - boot.kernel.sysctl = { - "vm.swappiness" = lib.mkDefault 1; - }; - - services.fstrim.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/default.nix b/nixos/hardware/default.nix deleted file mode 100644 index fbb5b77061ff..000000000000 --- a/nixos/hardware/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file is necessary so nix-env -qa does not break, -# when nixos-hardware is used as a channel -{} diff --git a/nixos/hardware/dell/e7240/README.md b/nixos/hardware/dell/e7240/README.md deleted file mode 100644 index b712f4d2bc25..000000000000 --- a/nixos/hardware/dell/e7240/README.md +++ /dev/null @@ -1,8 +0,0 @@ -On some kernel versions user ashgillman has experiences suspend issues -(see https://bugzilla.redhat.com/show_bug.cgi?id=1597481). - -Try: - -```nix -boot.kernelPackages = pkgs.linuxPackages_4_14; -``` diff --git a/nixos/hardware/dell/e7240/default.nix b/nixos/hardware/dell/e7240/default.nix deleted file mode 100644 index 3334a745f8c3..000000000000 --- a/nixos/hardware/dell/e7240/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../common/cpu/intel - ../../common/pc/laptop - ]; -} diff --git a/nixos/hardware/dell/latitude/3480/default.nix b/nixos/hardware/dell/latitude/3480/default.nix deleted file mode 100644 index 86be458a1d96..000000000000 --- a/nixos/hardware/dell/latitude/3480/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/laptop/ssd - ]; - - # touchpad goes over i2c - boot.blacklistedKernelModules = [ "psmouse" ]; - - services.xserver.videoDrivers = lib.mkDefault [ "intel" ]; -} diff --git a/nixos/hardware/dell/xps/13-7390/README.wiki b/nixos/hardware/dell/xps/13-7390/README.wiki deleted file mode 100644 index 6ec37d0f4476..000000000000 --- a/nixos/hardware/dell/xps/13-7390/README.wiki +++ /dev/null @@ -1,16 +0,0 @@ -= Dell XPS 13 7390 = - -== Installation == - -You need to disable RAID and use AHCI instead as described [https://wiki.ubuntu.com/Dell/XPS/XPS-13-7390-2-in-1 here]. - -== Firmware upgrades == - -Note that this device is supported by [https://fwupd.org/ fwupd]. -To perform firmware upgrades just activate the service - - -services.fwupd.enable = true; - - -Then use fwupdmgr to perform updates. diff --git a/nixos/hardware/dell/xps/13-7390/default.nix b/nixos/hardware/dell/xps/13-7390/default.nix deleted file mode 100644 index 991e4352cb50..000000000000 --- a/nixos/hardware/dell/xps/13-7390/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/laptop/ssd - ]; - - boot.kernelParams = [ "mem_sleep_default=deep" ]; - - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/13-9360/default.nix b/nixos/hardware/dell/xps/13-9360/default.nix deleted file mode 100644 index 439bbe09f564..000000000000 --- a/nixos/hardware/dell/xps/13-9360/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, pkgs, ... }: - -# TODO: move to general HiDPI profile -# 4K screen, use bigger console font -# i18n.consoleFont deprecated in >=20.03, choose option based on OS version -lib.recursiveUpdate -(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { - console.font = lib.mkDefault "latarcyrheb-sun32"; -} else { - i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; -}) { - imports = [ - ../../../common/cpu/intel/kaby-lake - ../../../common/pc/laptop - ]; - - boot.blacklistedKernelModules = [ "psmouse" ]; # touchpad goes over i2c - - # TODO: decide on boot loader policy - boot.loader = { - efi.canTouchEfiVariables = lib.mkDefault true; - systemd-boot.enable = lib.mkDefault true; - }; - - hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; - - # TODO: upstream to NixOS/nixpkgs - nixpkgs.overlays = [(final: previous: { - qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; - })]; - - # This will save you money and possibly your life! - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix b/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix deleted file mode 100644 index c5da6c183280..000000000000 --- a/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "${target}-firmware-${version}"; - version = "${branch}-00042"; - - branch = "4.4.1.c1"; - target = "QCA6174"; - - src = fetchurl { - url = "https://github.com/kvalo/ath10k-firmware/raw/952afa4949cb34193040cd4e7441e1aee50ac731/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; - sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh"; - }; - - buildCommand = '' - install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin - ''; - - meta = with stdenv.lib; { - description = "Updated firmware for the qca6174 wireless chip"; - homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ yorickvp ]; - platforms = platforms.linux; - }; -} diff --git a/nixos/hardware/dell/xps/13-9370/README.wiki b/nixos/hardware/dell/xps/13-9370/README.wiki deleted file mode 100644 index 57b5e08d3850..000000000000 --- a/nixos/hardware/dell/xps/13-9370/README.wiki +++ /dev/null @@ -1,16 +0,0 @@ -= Dell XPS 13 9370 = - -== Battery drain when sleeping == - -The laptop uses the S2 sleep mode by default instead of S3, which leads to -draining a lot of battery during sleep. - -Though this is intentional by the manufacturer and might cause lockups when -forced I - @moredread - never had any issues with it. - -See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management -and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference - -== Additional resources == - -* Arch linux wiki: [https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370) Dell XPS 13 9370] diff --git a/nixos/hardware/dell/xps/13-9370/default.nix b/nixos/hardware/dell/xps/13-9370/default.nix deleted file mode 100644 index dbe852f0c27f..000000000000 --- a/nixos/hardware/dell/xps/13-9370/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel/kaby-lake - ../../../common/pc/laptop - ../../../common/pc/laptop/acpi_call.nix - ]; - - # Force S3 sleep mode. See README.wiki for details. - boot.kernelParams = [ "mem_sleep_default=deep" ]; - - # touchpad goes over i2c - boot.blacklistedKernelModules = [ "psmouse" ]; - - services.throttled.enable = lib.mkDefault true; - - # This will save you money and possibly your life! - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/13-9380/README.wiki b/nixos/hardware/dell/xps/13-9380/README.wiki deleted file mode 100644 index c5ad61e3fd63..000000000000 --- a/nixos/hardware/dell/xps/13-9380/README.wiki +++ /dev/null @@ -1,20 +0,0 @@ -= Dell XPS 13 9380 = - -== Firmware upgrades == - -Note that this device is supported by [https://fwupd.org/ fwupd]. -To perform firmware upgrades just activate the service - - -services.fwupd.enable = true; - - -Then use fwupdmgr to perform updates. - -== Battery drain when sleeping == - -The laptop uses the S2 sleep mode by default instead of S3, which leads to -draining a lot of battery during sleep. - -See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management -and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference diff --git a/nixos/hardware/dell/xps/13-9380/default.nix b/nixos/hardware/dell/xps/13-9380/default.nix deleted file mode 100644 index 162cc2618eb1..000000000000 --- a/nixos/hardware/dell/xps/13-9380/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/laptop/acpi_call.nix - ]; - - # Force S3 sleep mode. See README.wiki for details. - boot.kernelParams = [ "mem_sleep_default=deep" ]; - - # touchpad goes over i2c - boot.blacklistedKernelModules = [ "psmouse" ]; - - # This will save you money and possibly your life! - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/15-7590/README.wiki b/nixos/hardware/dell/xps/15-7590/README.wiki deleted file mode 100644 index 052df2911f1b..000000000000 --- a/nixos/hardware/dell/xps/15-7590/README.wiki +++ /dev/null @@ -1,54 +0,0 @@ -= Dell XPS 15 7590 = -*Mostly copied from 15-9550 - -== Tested Hardware == - -* CPU: Intel(R) Core(TM) i9-9980HK -* RAM: 32 GB -* HDD: 1 TiB SSD -* Screen: 15" 4k (3840✕2160) -* Input: Touchscreen and trackpad. - -== Firmware Configuration == - -Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. - -=== Before installation === - -These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. - -* ''Disable Secure Boot (but keep UEFI Boot).'' Thankfully doing so is as easy as changing any other simple setting. - -* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) - -=== Wifi === -~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) - -Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. -default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. -To use it one also needs to enable unfree firmware in their own configuration (hardware.enableRedistributableFirmware = true;) - -``` - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.grub = { - device = "nodev"; - efiSupport = true; - efiInstallAsRemovable = true; - }; - boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_5_1; -``` -Disable the `canTouchEfiVariables` after a boot or two to prevent NVRAM wearout. - - -=== After installation === - -* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. - -=== Optional === - -* ''Update BIOS.'' According to Reddit, this helps with battery life. - -=== Troubleshooting === - diff --git a/nixos/hardware/dell/xps/15-7590/default.nix b/nixos/hardware/dell/xps/15-7590/default.nix deleted file mode 100644 index eeb69e204ee9..000000000000 --- a/nixos/hardware/dell/xps/15-7590/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, ... }: -# Earlier font-size setup. -# Virtual console options were renamed in 20.03; use the right option depending -# on the OS version; keep this here at least until 20.03 is stable. -lib.recursiveUpdate -(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { - console.earlySetup = true; -} else { - boot.earlyVconsoleSetup = true; -}) { - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/ssd - ]; - - # Set to true for just the first run, then disable it. - # boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - - # Load GPU drivers. - # hardware.bumblebee.enable = lib.mkDefault true; - - # High DPI for X users. 175 "looks reasonable" but I didn't do the actual DPI - # calculation. - # services.xserver.dpi = lib.mkDefault 175; - - # Earlier font-size setup - console.earlySetup = true; - - # Prevent small EFI partiion from filling up - boot.loader.grub.configurationLimit = 10; - - # The 48.ucode causes the Killer wifi card to crash. - # The iwlfwifi-cc-a0-46.ucode works perfectly - nixpkgs.overlays = [ - (self: super: { - firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { - src = super.fetchgit { - url = - "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; - sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; - }; - postInstall = '' - rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode - ''; - outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4"; - }); - }) - ]; -} diff --git a/nixos/hardware/dell/xps/15-9550/README.wiki b/nixos/hardware/dell/xps/15-9550/README.wiki deleted file mode 100644 index c0e9158a883e..000000000000 --- a/nixos/hardware/dell/xps/15-9550/README.wiki +++ /dev/null @@ -1,52 +0,0 @@ -= Dell XPS 15 9550 = - -Most of this I presume also applies to the XPS 13 1530, the 13" variant. - -== Tested Hardware == - -* CPU: Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz -* RAM: 16 GB -* HDD: 512 GiB SSD -* Screen: 15" 4k (3840✕2160) -* Graphics: NVIDIA Corporation GM107M, with Intel Graphics too. -* Input: Touchscreen and trackpad. - - -== Firmware Configuration == - -Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. - -=== Before installation === - -These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. - -* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting. - -* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) - - -=== After installation === - -* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. - -=== Optional === - -* ''Disable C-States.'' This is a processor idling thing. It seems to cause random crashes (Blank screen, no normal panic debug dump). Unfortunately, without it, the computer cannot be suspended. On the other hand, it doesn't seem to affect acpi's estimation of battery life when the computer is running with minimal load, but I haven't tested battery life in practice. I list it as optional as there's a tradeoff, and the crashes are rare enough one can probably get through installation just fine. - -* ''Update BIOS.'' According to Redd