diff --git a/flake.nix b/flake.nix index 724daed..145d68a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,8 @@ inputs = { nixpkgs.url = "nixpkgs/nixpkgs-unstable"; }; - outputs = { self, nixpkgs, ... }: + outputs = + { self, nixpkgs, ... }: let # DayZ only runs on x86_64 systems system = "x86_64-linux"; @@ -12,16 +13,15 @@ overlays = [ self.overlays.default ]; }; in - with pkgs; { + with pkgs; + { packages.${system} = rec { default = dzgui; inherit (pkgs) dzgui; }; overlays = { - default = (final: _: { - dzgui = (final.callPackage ./package { }); - }); + default = (final: _: { dzgui = (final.callPackage ./package { }); }); }; nixosModules = rec { @@ -29,20 +29,22 @@ dzgui = import ./module.nix { inherit self; }; }; - devShells.${system}.default = - mkShell { buildInputs = self.packages.${system}.default.runtimeDeps; }; + devShells.${system}.default = mkShell { + buildInputs = self.packages.${system}.default.runtimeDeps; + }; - checks.${system}.nixosCheck = (nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - self.nixosModules.default - { - programs.dzgui.enable = true; + checks.${system}.nixosCheck = + (nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + self.nixosModules.default + { + programs.dzgui.enable = true; - boot.isContainer = true; - system.stateVersion = "24.05"; - } - ]; - }).config.system.build.toplevel; + boot.isContainer = true; + system.stateVersion = "24.05"; + } + ]; + }).config.system.build.toplevel; }; } diff --git a/module.nix b/module.nix index f72f285..0d9d529 100644 --- a/module.nix +++ b/module.nix @@ -1,5 +1,10 @@ { self, ... }: -{ pkgs, config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: with lib; let cfg = config.programs.dzgui; diff --git a/package/default.nix b/package/default.nix index 8d38801..8f4e05c 100644 --- a/package/default.nix +++ b/package/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, curl -, jq -, python3 -, wmctrl -, xdotool -, gnome -, gobject-introspection -, wrapGAppsHook +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + curl, + jq, + python3, + wmctrl, + xdotool, + gnome, + gobject-introspection, + wrapGAppsHook, }: stdenv.mkDerivation rec { pname = "dzgui"; @@ -38,9 +39,7 @@ stdenv.mkDerivation rec { runtimeDeps = [ curl jq - (python3.withPackages (p: with p; [ - pygobject3 - ])) + (python3.withPackages (p: with p; [ pygobject3 ])) wmctrl xdotool