flake.nix

@@ -3,36 +3,33 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixpkgs-unstable";
   };
-  outputs =
+  outputs = { self, nixpkgs, ... }:
-    { self, nixpkgs, ... }:
     let
       # DayZ only runs on x86_64 systems
       system = "x86_64-linux";
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ self.overlays.default ];
+      };
     in
-    {
+    with pkgs; {
       packages.${system} = rec {
         default = dzgui;
-        dzgui = pkgs.callPackage ./package { };
+        inherit (pkgs) dzgui;
       };
 
       overlays = {
-        default = import ./overlay.nix;
+        default = (final: _: {
+          dzgui = (final.callPackage ./package { });
+        });
       };
 
       nixosModules = rec {
         default = dzgui;
-        dzgui = import ./module.nix;
+        dzgui = import ./module.nix { inherit self; };
       };
 
-      devShells.${system}.default = pkgs.mkShell {
+      devShells.${system}.default =
-        buildInputs = self.packages.${system}.default.runtimeDeps;
+        mkShell { buildInputs = self.packages.${system}.default.runtimeDeps; };
-      };
-
-      checks.${system}.nixosCheck =
-        (nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [ ./nixos-test/configuration.nix ];
-        }).config.system.build.toplevel;
     };
 }

module.nix

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

nixos-test/configuration.nix

@@ -1,7 +0,0 @@
-{
-  imports = [ ../module.nix ];
-  programs.dzgui.enable = true;
-
-  boot.isContainer = true;
-  system.stateVersion = "24.05";
-}

overlay.nix

@@ -1 +0,0 @@
-(final: _: { dzgui = (final.callPackage ./package { }); })

package/default.nix

@@ -1,16 +1,15 @@
-{
+{ lib
-  lib,
+, stdenv
-  stdenv,
+, fetchFromGitHub
-  fetchFromGitHub,
+, makeWrapper
-  makeWrapper,
+, curl
-  curl,
+, jq
-  jq,
+, python3
-  python3,
+, wmctrl
-  wmctrl,
+, xdotool
-  xdotool,
+, gnome
-  gnome,
+, gobject-introspection
-  gobject-introspection,
+, wrapGAppsHook
-  wrapGAppsHook,
 }:
 stdenv.mkDerivation rec {
   pname = "dzgui";
@@ -39,7 +38,9 @@ stdenv.mkDerivation rec {
   runtimeDeps = [
     curl
     jq
-    (python3.withPackages (p: with p; [ pygobject3 ]))
+    (python3.withPackages (p: with p; [
+      pygobject3
+    ]))
 
     wmctrl
     xdotool