change: remove all cataclysm-dda

This commit is contained in:
Malte Tammena 2023-07-01 12:41:57 +02:00
parent 27193ad3ba
commit b41b486395
5 changed files with 0 additions and 106 deletions

View file

@ -83,22 +83,6 @@
"type": "github"
}
},
"cataclysm-dda": {
"flake": false,
"locked": {
"lastModified": 1688101806,
"narHash": "sha256-9Xzgzy8/tPjVAy4P3k43lGRbUzk2Rnv/WuDXmmrMrq0=",
"owner": "CleverRaven",
"repo": "Cataclysm-DDA",
"rev": "83224ec6845602a87f0ddf8fb3d52b691c1cf122",
"type": "github"
},
"original": {
"owner": "CleverRaven",
"repo": "Cataclysm-DDA",
"type": "github"
}
},
"colmena": {
"inputs": {
"flake-compat": "flake-compat",
@ -2506,7 +2490,6 @@
"root": {
"inputs": {
"2i-emulator": "2i-emulator",
"cataclysm-dda": "cataclysm-dda",
"colmena": "colmena",
"custom-udev-rules": "custom-udev-rules",
"devshell": "devshell",

View file

@ -71,10 +71,6 @@
url = "github:klemens/2i-emulator";
flake = false;
};
"cataclysm-dda" = {
url = "github:CleverRaven/Cataclysm-DDA";
flake = false;
};
radicale_infcloud = {
url = "github:Unrud/RadicaleInfCloud";
flake = false;
@ -116,8 +112,6 @@
inherit (super.perlPackages) buildPerlPackage;
netcat-openbsd = super.libressl.nc;
})
# Override cataclysm to use git
(import ./overlays/cataclysm-dda.nix)
(import ./overlays/qmk-udev-rules.nix)
(import ./overlays/sane-backends.nix)
(import ./overlays/logisim.nix)

View file

@ -1,12 +0,0 @@
_self: super: let
lock = builtins.fromJSON (builtins.readFile ../flake.lock);
in {
cataclysm-dda-git =
(super.cataclysm-dda-git.override {
useXdgDir = true;
version = lock.nodes.cataclysm-dda.locked.rev;
inherit (lock.nodes.cataclysm-dda.locked) rev;
sha256 = lock.nodes.cataclysm-dda.locked.narHash;
})
.overrideAttrs (_old: {enableParallelBuilding = true;});
}

View file

@ -1,70 +0,0 @@
{
pkgs,
lib,
config,
...
}: let
# === Setup ===
cataclysm-dda-wayland-sdl = pkgs.symlinkJoin {
name = "cataclysm-tiles";
buildInputs = [pkgs.makeWrapper];
postBuild = ''
#wrapProgram $out/bin/cataclysm-tiles --set SDL_VIDEODRIVER wayland
'';
paths = [pkgs.cataclysm-dda-git];
};
jsonConfig = pkgs.formats.json {};
configDir = "${config.xdg.configHome}/cataclysm-dda";
# === Font ===
# FIXME: until https://github.com/NixOS/nixpkgs/issues/185633 is fixed
inherit
(import (pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "0d440c18119406feb8a32cd5ec2ff0b83fc9104b";
sha256 = "sha256-Fw6zRNBonu9wwVSQ0Cj9zHliw6yChMQPf3GPQFJZ4us=";
}) {system = "x86_64-linux";})
iosevka
;
fontSingleton = lib.singleton "${iosevka}/share/fonts/truetype/iosevka-bold.ttf";
fontsConfigPath = "${configDir}/fonts.json";
fontsConfig = jsonConfig.generate "fonts.json" {
typeface = fontSingleton;
map_typeface = fontSingleton;
overmap_typeface = fontSingleton;
};
# === Sound ===
soundPack = pkgs.fetchFromGitHub {
owner = "Fris0uman";
repo = "CDDA-Soundpacks";
rev = "2025472c0328a322767b940a3dcf5cafd608b064";
sha256 = "DXviHFGHOHdgP/g03HkDKr1C5sbqS7SQGtUbABJwj48=";
fetchSubmodules = true;
};
in {
home.packages = [cataclysm-dda-wayland-sdl];
xdg.dataFile."cataclysm-dda/sound/CC-Sounds" = {
source = "${soundPack}/sound/CC-Sounds";
};
home.activation.regenCataclysmFontConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
$VERBOSE_ECHO "Generating cataclysm configuration if missing"
if [[ -v DRY_RUN ]]; then
# Create the folder
$DRY_RUN_CMD mkdir -p ${configDir}
# Just overwrite the font config!
$DRY_RUN_CMD rm -f ${fontsConfigPath}
$DRY_RUN_CMD cp ${fontsConfig} ${fontsConfigPath}
else
# Create the folder
mkdir -p ${configDir}
# Just overwrite the font config!
rm -f ${fontsConfigPath}
cp ${fontsConfig} ${fontsConfigPath}
fi
'';
}

View file

@ -50,7 +50,6 @@ in {
./zathura.nix
./taskwarrior.nix
./scarlett-solo.nix
./cataclysm-dda.nix
./kakoune.nix
./helix.nix
./mpv.nix