-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into staging-next
- Loading branch information
Showing
80 changed files
with
6,003 additions
and
1,872 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| # Cataclysm: Dark Days Ahead | ||
|
|
||
| ## How to install Cataclysm DDA | ||
|
|
||
| To install the latest stable release of Cataclysm DDA to your profile, execute | ||
| `nix-env -f "<nixpkgs>" -iA cataclysm-dda`. For the curses build (build | ||
| without tiles), install `cataclysmDDA.stable.curses`. Note: `cataclysm-dda` is | ||
| an alias to `cataclysmDDA.stable.tiles`. | ||
|
|
||
| If you like access to a development build of your favorite git revision, | ||
| override `cataclysm-dda-git` (or `cataclysmDDA.git.curses` if you like curses | ||
| build): | ||
|
|
||
| ```nix | ||
| cataclysm-dda-git.override { | ||
| version = "YYYY-MM-DD"; | ||
| rev = "YOUR_FAVORITE_REVISION"; | ||
| sha256 = "CHECKSUM_OF_THE_REVISION"; | ||
| } | ||
| ``` | ||
|
|
||
| The sha256 checksum can be obtained by | ||
|
|
||
| ```sh | ||
| nix-prefetch-url --unpack "https://github.com/CleverRaven/Cataclysm-DDA/archive/${YOUR_FAVORITE_REVISION}.tar.gz" | ||
| ``` | ||
|
|
||
| The default configuration directory is `~/.cataclysm-dda`. If you prefer | ||
| `$XDG_CONFIG_HOME/cataclysm-dda`, override the derivation: | ||
|
|
||
| ```nix | ||
| cataclysm-dda.override { | ||
| useXdgDir = true; | ||
| } | ||
| ``` | ||
|
|
||
| ## Customizing with mods | ||
|
|
||
| To install Cataclysm DDA with mods of your choice, you can use `withMods` | ||
| attribute: | ||
|
|
||
| ```nix | ||
| cataclysm-dda.withMods (mods: with mods; [ | ||
| tileset.UndeadPeople | ||
| ]) | ||
| ``` | ||
|
|
||
| All mods, soundpacks, and tilesets available in nixpkgs are found in | ||
| `cataclysmDDA.pkgs`. | ||
|
|
||
| Here is an example to modify existing mods and/or add more mods not available | ||
| in nixpkgs: | ||
|
|
||
| ```nix | ||
| let | ||
| customMods = self: super: lib.recursiveUpdate super { | ||
| # Modify existing mod | ||
| tileset.UndeadPeople = super.tileset.UndeadPeople.overrideAttrs (old: { | ||
| # If you like to apply a patch to the tileset for example | ||
| patches = [ ./path/to/your.patch ]; | ||
| }); | ||
| # Add another mod | ||
| mod.Awesome = cataclysmDDA.buildMod { | ||
| modName = "Awesome"; | ||
| version = "0.x"; | ||
| src = fetchFromGitHub { | ||
| owner = "Someone"; | ||
| repo = "AwesomeMod"; | ||
| rev = "..."; | ||
| sha256 = "..."; | ||
| }; | ||
| # Path to be installed in the unpacked source (default: ".") | ||
| modRoot = "contents/under/this/path/will/be/installed"; | ||
| }; | ||
| # Add another soundpack | ||
| soundpack.Fantastic = cataclysmDDA.buildSoundPack { | ||
| # ditto | ||
| }; | ||
| # Add another tileset | ||
| tileset.SuperDuper = cataclysmDDA.buildTileSet { | ||
| # ditto | ||
| }; | ||
| }; | ||
| in | ||
| cataclysm-dda.withMods (mods: with mods.extend customMods; [ | ||
| tileset.UndeadPeople | ||
| mod.Awesome | ||
| soundpack.Fantastic | ||
| tileset.SuperDuper | ||
| ]) | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { lib, pkgs, config, ...}: | ||
| with lib; | ||
|
|
||
| { | ||
| options.hardware.video.hidpi.enable = mkEnableOption "Font/DPI configuration optimized for HiDPI displays"; | ||
|
|
||
| config = mkIf config.hardware.video.hidpi.enable { | ||
| console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz"; | ||
|
|
||
| # Needed when typing in passwords for full disk encryption | ||
| console.earlySetup = mkDefault true; | ||
| boot.loader.systemd-boot.consoleMode = mkDefault "1"; | ||
|
|
||
| # TODO Find reasonable defaults X11 & wayland | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { config, lib, ... }: | ||
|
|
||
| with lib; | ||
| let | ||
| cfg = config.hardware.xpadneo; | ||
| in | ||
| { | ||
| options.hardware.xpadneo = { | ||
| enable = mkEnableOption "the xpadneo driver for Xbox One wireless controllers"; | ||
| }; | ||
|
|
||
| config = mkIf cfg.enable { | ||
| boot = { | ||
| # Must disable Enhanced Retransmission Mode to support bluetooth pairing | ||
| # https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth | ||
| extraModprobeConfig = | ||
| mkIf | ||
| config.hardware.bluetooth.enable | ||
| "options bluetooth disable_ertm=1"; | ||
|
|
||
| extraModulePackages = with config.boot.kernelPackages; [ xpadneo ]; | ||
| kernelModules = [ "hid_xpadneo" ]; | ||
| }; | ||
| }; | ||
|
|
||
| meta = { | ||
| maintainers = with maintainers; [ metadark ]; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.