refactor: be less flake and overlay dependant

This commit is contained in:
lelgenio 2024-10-01 12:15:41 -03:00
parent af1a43a8de
commit f7a0747d62
2 changed files with 15 additions and 20 deletions

View file

@ -8,16 +8,12 @@
let let
# DayZ only runs on x86_64 systems # DayZ only runs on x86_64 systems
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs { inherit system; };
inherit system;
overlays = [ self.overlays.default ];
};
in in
with pkgs;
{ {
packages.${system} = rec { packages.${system} = rec {
default = dzgui; default = dzgui;
inherit (pkgs) dzgui; dzgui = pkgs.callPackage ./package { };
}; };
overlays = { overlays = {
@ -26,10 +22,10 @@
nixosModules = rec { nixosModules = rec {
default = dzgui; default = dzgui;
dzgui = import ./module.nix { inherit self; }; dzgui = import ./module.nix;
}; };
devShells.${system}.default = mkShell { devShells.${system}.default = pkgs.mkShell {
buildInputs = self.packages.${system}.default.runtimeDeps; buildInputs = self.packages.${system}.default.runtimeDeps;
}; };

View file

@ -1,30 +1,29 @@
{ self, ... }:
{ {
pkgs, pkgs,
config, config,
lib, lib,
... ...
}: }:
with lib;
let let
cfg = config.programs.dzgui; cfg = config.programs.dzgui;
in in
{ {
options.programs.dzgui = { options.programs.dzgui = {
enable = mkEnableOption (mdDoc '' enable = lib.mkEnableOption (
lib.mdDoc ''
Weather to install dzgui and setup workarounds for DayZ to work on linux Weather to install dzgui and setup workarounds for DayZ to work on linux
''); ''
package = mkOption { );
type = with types; nullOr package; package = lib.mkOption {
default = pkgs.dzgui; type = with lib.types; nullOr package;
defaultText = literalExpression "pkgs.dzgui"; default = pkgs.callPackage ./package { };
description = mdDoc "Dzgui package to use."; defaultText = lib.literalExpression "pkgs.dzgui";
description = lib.mdDoc "Dzgui package to use.";
}; };
}; };
config = mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Needed by DayZ # Needed by DayZ
boot.kernel.sysctl."vm.max_map_count" = 1048576; boot.kernel.sysctl."vm.max_map_count" = 1048576;
nixpkgs.overlays = [ self.overlays.default ];
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
}; };
} }