From ae64778637594451c036ce98bdd3d0d8465621d5 Mon Sep 17 00:00:00 2001
From: Kraust <secretdragoon@gmail.com>
Date: Sun, 9 Jun 2024 09:48:12 -0400
Subject: [PATCH] Test?

---
 .OSCR_settings.ini | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 default.nix        | 40 ++++++++++++++++++++++++++++
 pyproject.toml     |  3 ++-
 shell.nix          |  9 -------
 4 files changed, 107 insertions(+), 10 deletions(-)
 create mode 100644 .OSCR_settings.ini
 create mode 100644 default.nix
 delete mode 100644 shell.nix

diff --git a/.OSCR_settings.ini b/.OSCR_settings.ini
new file mode 100644
index 0000000..4b4fc93
--- /dev/null
+++ b/.OSCR_settings.ini
@@ -0,0 +1,65 @@
+[General]
+auto_scan=false
+combats_to_parse=10
+dmg_columns_length=21
+dmg_columns%7C0=true
+dmg_columns%7C1=true
+dmg_columns%7C10=true
+dmg_columns%7C11=true
+dmg_columns%7C12=true
+dmg_columns%7C13=true
+dmg_columns%7C14=true
+dmg_columns%7C15=true
+dmg_columns%7C16=true
+dmg_columns%7C17=true
+dmg_columns%7C18=true
+dmg_columns%7C19=true
+dmg_columns%7C2=true
+dmg_columns%7C20=true
+dmg_columns%7C3=true
+dmg_columns%7C4=true
+dmg_columns%7C5=true
+dmg_columns%7C6=true
+dmg_columns%7C7=true
+dmg_columns%7C8=true
+dmg_columns%7C9=true
+excluded_event_ids=Autodesc.Combatevent.Falling, 
+favorite_ladders=@Invalid()
+first_overview_tab=0
+geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x4\xd3\0\0\x2r\0\0\n,\0\0\x5\xfc\0\0\x4\xd3\0\0\x2r\0\0\n,\0\0\x5\xfc\0\0\0\0\0\0\0\0\xf\0\0\0\x4\xd3\0\0\x2r\0\0\n,\0\0\x5\xfc)"
+graph_resolution=0.2
+heal_columns_length=13
+heal_columns%7C0=true
+heal_columns%7C1=true
+heal_columns%7C10=true
+heal_columns%7C11=true
+heal_columns%7C12=true
+heal_columns%7C2=true
+heal_columns%7C3=true
+heal_columns%7C4=true
+heal_columns%7C5=true
+heal_columns%7C6=true
+heal_columns%7C7=true
+heal_columns%7C8=true
+heal_columns%7C9=true
+live_columns%7C0=true
+live_columns%7C1=false
+live_columns%7C2=true
+live_columns%7C3=false
+live_columns%7C4=false
+live_columns%7C5=false
+live_columns%7C6=false
+live_geometry=@Invalid()
+live_graph_active=false
+live_graph_field=0
+live_parser_opacity=0.85
+live_scale=1.00
+live_splitter=@Invalid()
+log_path=/home/kraust/git/OSCR-UI/
+log_size_warning=true
+overview_sort_column=1
+overview_sort_order=Descending
+seconds_between_combats=100
+split_log_after=480000
+sto_log_path=
+ui_scale=1.00
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..16b81d7
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,40 @@
+with import <nixpkgs> { };
+
+let
+  pythonPackages = python3Packages;
+in pkgs.mkShell rec {
+  name = "impurePythonEnv";
+  venvDir = "./.venv";
+  buildInputs = [
+    # A Python interpreter including the 'venv' module is required to bootstrap
+    # the environment.
+    pythonPackages.python311
+
+    # This executes some shell code to initialize a venv in $venvDir before
+    # dropping into the shell
+    pythonPackages.venvShellHook
+
+    # Those are dependencies that we would like to use from nixpkgs, which will
+    # add them to PYTHONPATH and thus make them accessible from within the venv.
+    pythonPackages311.pyside6
+
+    # In this particular example, in order to compile any binary extensions they may
+    # require, the Python modules listed in the hypothetical requirements.txt need
+    # the following packages to be installed locally:
+    qt6.full
+  ];
+
+  # Run this command, only after creating the virtual environment
+  postVenvCreation = ''
+    unset SOURCE_DATE_EPOCH
+    pip install -e .
+  '';
+
+  # Now we can execute any commands within the virtual environment.
+  # This is optional and can be left out to run pip manually.
+  postShellHook = ''
+    # allow pip to install wheels
+    unset SOURCE_DATE_EPOCH
+  '';
+
+}
diff --git a/pyproject.toml b/pyproject.toml
index 4e3d74d..486786a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,4 +53,5 @@ executables = [
 ]
 
 [tool.cxfreeze.build_exe]
-zip_include_packages = ["encodings", "PySide6", "shiboken6"]
+zip_include_packages = ["*"]
+zip_exclude_packages = []
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index da4ee33..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ nixpkgs ? import <nixpkgs> {} }:
-
-nixpkgs.mkShell {
-  nativeBuildInputs = with nixpkgs; [
-    nixpkgs.python311
-    nixpkgs.python311Packages.pyside6
-    nixpkgs.qt6.full
-  ];
-}