From 6cd3a545f25b28ab2f9d673c378f976948a2f14c Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 1 Oct 2024 12:07:49 -0300 Subject: [PATCH 1/5] flake: add system check --- flake.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/flake.nix b/flake.nix index 22359e7..724daed 100644 --- a/flake.nix +++ b/flake.nix @@ -31,5 +31,18 @@ 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; + + boot.isContainer = true; + system.stateVersion = "24.05"; + } + ]; + }).config.system.build.toplevel; }; } From af1a43a8de1c5437e05117a5bbe90b5b09b8cf07 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 1 Oct 2024 12:10:35 -0300 Subject: [PATCH 2/5] fmt: format with nixfmt-rfc-style --- flake.nix | 38 ++++++++++++++++++++------------------ module.nix | 7 ++++++- package/default.nix | 29 ++++++++++++++--------------- 3 files changed, 40 insertions(+), 34 deletions(-) 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 From f7a0747d6209970b79e75f737ec78d4f3768a156 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 1 Oct 2024 12:15:41 -0300 Subject: [PATCH 3/5] refactor: be less flake and overlay dependant --- flake.nix | 12 ++++-------- module.nix | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 145d68a..f75cf19 100644 --- a/flake.nix +++ b/flake.nix @@ -8,16 +8,12 @@ let # DayZ only runs on x86_64 systems system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - overlays = [ self.overlays.default ]; - }; + pkgs = import nixpkgs { inherit system; }; in - with pkgs; { packages.${system} = rec { default = dzgui; - inherit (pkgs) dzgui; + dzgui = pkgs.callPackage ./package { }; }; overlays = { @@ -26,10 +22,10 @@ nixosModules = rec { 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; }; diff --git a/module.nix b/module.nix index 0d9d529..1f957e2 100644 --- a/module.nix +++ b/module.nix @@ -1,30 +1,29 @@ -{ self, ... }: { pkgs, config, lib, ... }: -with lib; let cfg = config.programs.dzgui; in { options.programs.dzgui = { - enable = mkEnableOption (mdDoc '' - Weather to install dzgui and setup workarounds for DayZ to work on linux - ''); - package = mkOption { - type = with types; nullOr package; - default = pkgs.dzgui; - defaultText = literalExpression "pkgs.dzgui"; - description = mdDoc "Dzgui package to use."; + enable = lib.mkEnableOption ( + lib.mdDoc '' + Weather to install dzgui and setup workarounds for DayZ to work on linux + '' + ); + package = lib.mkOption { + type = with lib.types; nullOr package; + default = pkgs.callPackage ./package { }; + defaultText = lib.literalExpression "pkgs.dzgui"; + description = lib.mdDoc "Dzgui package to use."; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Needed by DayZ boot.kernel.sysctl."vm.max_map_count" = 1048576; - nixpkgs.overlays = [ self.overlays.default ]; environment.systemPackages = [ cfg.package ]; }; } From 54e6c10bacb47bb58e2749cd4990a4c2ab5006c4 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 1 Oct 2024 12:22:18 -0300 Subject: [PATCH 4/5] refactor: extract more things from flake.nix --- flake.nix | 12 ++---------- nixos-test/configuration.nix | 7 +++++++ overlay.nix | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 nixos-test/configuration.nix create mode 100644 overlay.nix diff --git a/flake.nix b/flake.nix index f75cf19..d7e1de5 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ }; overlays = { - default = (final: _: { dzgui = (final.callPackage ./package { }); }); + default = import ./overlay.nix; }; nixosModules = rec { @@ -32,15 +32,7 @@ checks.${system}.nixosCheck = (nixpkgs.lib.nixosSystem { inherit system; - modules = [ - self.nixosModules.default - { - programs.dzgui.enable = true; - - boot.isContainer = true; - system.stateVersion = "24.05"; - } - ]; + modules = [ ./nixos-test/configuration.nix ]; }).config.system.build.toplevel; }; } diff --git a/nixos-test/configuration.nix b/nixos-test/configuration.nix new file mode 100644 index 0000000..302d4d3 --- /dev/null +++ b/nixos-test/configuration.nix @@ -0,0 +1,7 @@ +{ + imports = [ ../module.nix ]; + programs.dzgui.enable = true; + + boot.isContainer = true; + system.stateVersion = "24.05"; +} diff --git a/overlay.nix b/overlay.nix new file mode 100644 index 0000000..a431f2a --- /dev/null +++ b/overlay.nix @@ -0,0 +1 @@ +(final: _: { dzgui = (final.callPackage ./package { }); }) From 80556981662112d5309409dbc22ce0c43205bc26 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 11 Nov 2024 01:16:37 +0000 Subject: [PATCH 5/5] update "5.3.0" -> "5.5.0" --- package/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/default.nix b/package/default.nix index 133eb3e..bf992b9 100644 --- a/package/default.nix +++ b/package/default.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "dzgui"; - version = "5.3.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "aclist"; repo = "dztui"; - rev = "c2c7b37b904a05cdf0c86dbf3d22ef91728577b9"; - sha256 = "sha256-iC/c2MBFjvT0wVnKlpX4kL7fVa3BbjpmbEyjCU+aUyY="; + rev = "bae6a57e1ee5660a07e3a3c326ec68617b831d31"; + sha256 = "sha256-x5GSyrbEZoru5p70QVRSFx52Njkhvtg/+qc94MqpOmo="; }; postPatch = ''