adriangl
/
ozai-webui
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

flake updates

This commit is contained in:
Adrian Gunnar Lauterer 2024-05-29 18:43:06 +02:00
parent 6aee571407
commit 27e33a2892
Signed by: adriangl
GPG Key ID: D33368A59745C2F0
5 changed files with 80 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -1,2 +0,0 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.callPackage ./src/derivation.nix {}

8
flake.lock
View File

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711200738, "lastModified": 1716769173,
"narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

168
flake.nix
View File

@ -1,106 +1,82 @@
{ {
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};
outputs = { self, nixpkgs}: outputs = { self, nixpkgs, ... }@inputs:
let let
supportedSystems = [ "x86_64-linux"]; pkgs = import nixpkgs {
forAllSystems = nixpkgs.lib.genAttrs supportedSystems; system = "x86_64-linux";
pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system}); };
lib = forAllSystems (system: nixpkgs.legacyPackages.${system}).lib; lib = pkgs.lib;
types = forAllSystems (system: nixpkgs.legacyPackages.${system}).lib.types; types = lib.types;
in in {
{ devShell = {
packages = forAllSystems (system: x86_64-linux = pkgs.mkShell {
let packages = [
python = pkgs.${system}.python3.withPackages (ps: [ps.flask ps.flask-socketio]); pkgs.python3
ozai-webui = import ./default.nix { inherit (pkgs.${system}) pkgs; }; pkgs.python3Packages.flask
in { pkgs.python3Packages.flask-socketio
default = ozai-webui; ];
}); };
};
devShells = forAllSystems (system: packages = {
let x86_64-linux.default = pkgs.python3Packages.buildPythonApplication rec {
python = pkgs.${system}.python3.withPackages (ps: [ps.flask ps.flask-socketio]); pname = "ozai-webui";
in { version = "0.1.1";
default = pkgs.${system}.mkShellNoCC { propagatedBuildInputs = [ pkgs.python3Packages.flask pkgs.python3Packages.flask-socketio ];
packages = with pkgs.${system}; [ src = ./.;
python doCheck = false;
];
};
});
nixosModules = forAllSystems (system: let postInstall = ''
ozai-webui = import ./default.nix { inherit (pkgs.${system}) pkgs; }; mkdir -p $out/share/ozai-webui
lib = pkgs.${system}.lib; cp -r static $out/share/ozai-webui/static
types = pkgs.${system}.lib.types; cp -r templates $out/share/ozai-webui/templates
in { mv $out/bin/main.py $out/bin/ozai-webui
ozai-webui = { config, pkgs, ... }: { '';
options.services.ozai-webui = { };
enable = lib.mkEnableOption "Ozai WebUI"; };
host = lib.mkOption {
type = types.str;
default = "127.0.0.1";
description = "The host to run the server on";
};
port = lib.mkOption {
type = types.int;
default = 8080;
description = "The port to run the server on";
};
ozaiUrl = lib.mkOption {
type = types.str;
default = "http://localhost:8000/api/";
description = "The URL of the Ozai server";
};
secretKey = lib.mkOption {
type = types.str;
default = "secret_key";
description = "The secret key for the Flask app";
};
};
config = lib.mkIf config.services.ozai-webui.enable {
systemd.services.ozai-webui = {
description = "Ozai WebUI";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${ozai-webui}/bin/ozai-webui --port ${toString config.services.ozai-webui.port} --host '${config.services.ozai-webui.host}' --ozai_url '${config.services.ozai-webui.ozaiUrl}' --secret_key '${config.services.ozai-webui.secretKey}' --static_folder '/share/ozai-webui/static' --template_folder '/share/ozai-webui/templates'";
Restart = "always";
};
};
};
};
});
nixosModules = {
nixosConfigurations = { ozai-webui = { config, pkgs, ... }: {
ozai-webui = nixpkgs.lib.nixosSystem { options.services.ozai-webui = {
system = "x86_64-linux"; enable = lib.mkEnableOption "Ozai WebUI";
modules = [ host = lib.mkOption {
self.nixosModules.x86_64-linux.ozai-webui type = types.str;
{ default = "127.0.0.1";
system.stateVersion = "23.11"; description = "The host to run the server on";
boot.isContainer = true; };
services.ozai-webui.enable = true; port = lib.mkOption {
} type = types.int;
]; default = 8080;
description = "The port to run the server on";
};
ozaiUrl = lib.mkOption {
type = types.str;
default = "http://localhost:8000/api/";
description = "The URL of the Ozai server";
};
secretKey = lib.mkOption {
type = types.str;
default = "secret_key";
description = "The secret key for the Flask app";
}; };
}; };
# nixosConfigurations = forAllSystems (system: { config = lib.mkIf config.services.ozai-webui.enable {
# ozai-webui = { config, pkgs, ... }: { systemd.services.ozai-webui = {
# modules = [ description = "Ozai WebUI server";
# self.systems.${system}.nixosModules.ozai-webui after = [ "network.target" ];
# { wantedBy = [ "multi-user.target" ];
# system.stateVersion = "23.11"; serviceConfig = {
# boot.isContainer = true; ExecStart = "${pkgs.ozai-webui}/bin/ozai-webui --port ${toString config.services.ozai-webui.port} --host '${config.services.ozai-webui.host}' --ozai_url '${config.services.ozai-webui.ozaiUrl}' --secret_key '${config.services.ozai-webui.secretKey}' --static_folder '/share/ozai-webui/static' --template_folder '/share/ozai-webui/templates'";
# services.ozai-webui.enable = true; Restart = "always";
# } };
# ]; };
# }; };
# }); };
}; };
};
} }

17
src/derivation.nix
View File

@ -1,17 +0,0 @@
{ lib, python3Packages }:
with python3Packages;
buildPythonApplication rec {
pname = "ozai-webui";
version = "0.1.1";
propagatedBuildInputs = [ flask flask-socketio ];
src = ./.;
doCheck = false;
#copy the static files to the output
postInstall = ''
mkdir -p $out/share/ozai-webui
cp -r static $out/share/ozai-webui/static
cp -r templates $out/share/ozai-webui/templates
mv $out/bin/main.py $out/bin/ozai-webui
'';
}

2
src/templates/game.html
View File

@ -8,7 +8,7 @@
* { * {
--border-color: #616C71; --border-color: #616C71;
--bg-transparency: 0.5; --bg-transparency: 0.5;
--tile-size: 2em; --tile-size: 3em;
--blue: 49, 157, 245; --blue: 49, 157, 245;
--yellow: 210, 160, 0; --yellow: 210, 160, 0;
--red: 200, 50, 50; --red: 200, 50, 50;