From efca28aa5713f16177451b1c5383e0073591fb6a Mon Sep 17 00:00:00 2001 From: Swarsel Date: Sat, 21 Dec 2024 01:36:17 +0100 Subject: [PATCH] feat: add eontimer, pokefinder, retroarch --- SwarselSystems.org | 116 +++++++++++++++++++---- overlays/default.nix | 11 +++ pkgs/default.nix | 1 + pkgs/eontimer/default.nix | 49 ++++++++++ profiles/common/home/custom-packages.nix | 1 + profiles/common/nixos/nix-ld.nix | 1 + profiles/common/nixos/packages.nix | 2 + profiles/common/nixos/sway.nix | 1 + profiles/optional/home/gaming.nix | 3 + 9 files changed, 165 insertions(+), 20 deletions(-) create mode 100644 pkgs/eontimer/default.nix diff --git a/SwarselSystems.org b/SwarselSystems.org index 7c4098f..dbbf7ed 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -2093,6 +2093,7 @@ Note: The structure of generating the packages was changed in commit =2cf03a3 re "t2ts" "ts2t" "vershell" + "eontimer" ]; mkPackages = names: builtins.listToAttrs (map (name: { inherit name; @@ -3282,6 +3283,63 @@ This script allows for quick git branch switching. #+end_src +**** eontimer + +This script allows for quick git branch switching. + +#+begin_src nix :tangle pkgs/eontimer/default.nix + { pkgs, python3Packages }: + + python3Packages.buildPythonApplication rec { + pname = "eontimer"; + version = "3.0.0"; + pyproject = true; + + src = pkgs.fetchFromGitHub { + owner = "DasAmpharos"; + repo = "EonTimer"; + rev = "9449e6158f0aa6eaa24b3b1d0a427aa198b5c0e4"; + hash = "sha256-+XN/VGGlEg2gVncRZrWDOZ2bfxt8xyIu22F2wHlG6YI="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + altgraph + certifi + charset-normalizer + idna + libsass + macholib + packaging + pillow + pipdeptree + platformdirs + pyinstaller + pyinstaller-hooks-contrib + pyside6 + requests + setuptools + shiboken6 + urllib3 + ]; + + buildPhase = '' + ${pkgs.python3Packages.pyinstaller}/bin/pyinstaller EonTimer.spec + ''; + + installPhase = '' + mkdir -p $out/bin + cp dist/EonTimer $out/bin/ + ''; + + + } + +#+end_src + *** Overlays (additions, overrides, nixpkgs-stable) :PROPERTIES: :CUSTOM_ID: h:5e3e21e0-57af-4dad-b32f-6400af9b7aab @@ -3309,6 +3367,17 @@ When adding a new entry here, do not forget to add it in the default output of t ]; }; + retroarch = _prev.retroarch.withCores (cores: with cores; [ + snes9x # snes + nestopia # nes + dosbox # dos + scummvm # scumm + vba-m # gb/a + mgba # gb/a + melonds # ds + dolphin # gc/wii + ]); + # prismlauncher = _prev.prismlauncher.override { # glfw = _prev.glfw-wayland-minecraft; # }; @@ -4198,6 +4267,8 @@ Mostly used to install some compilers and lsp's that I want to have available wh # secure boot sbctl + libsForQt5.qt5.qtwayland + # nix package database nix-index nixos-generators @@ -5323,6 +5394,7 @@ When a program does not work, start with =nix-ldd =. This will tell you libvpx libxkbcommon libxml2 + libz mesa nspr nss @@ -8120,6 +8192,7 @@ This is just a separate container for derivations defined in [[#h:64a5cc16-6b16- t2ts ts2t vershell + eontimer bootstrap @@ -10607,28 +10680,31 @@ The rest of the settings is at [[#h:fb3f3e01-7df4-4b06-9e91-aa9cac61a431][gaming { # specialisation = { # gaming.configuration = { - home.packages = with pkgs; [ - stable.lutris - wine - libudev-zero - dwarfs - fuse-overlayfs - # steam - # steam-run - patchelf - gamescope - vulkan-tools - moonlight-qt - ns-usbloader + home.packages = with pkgs; [ + stable.lutris + wine + libudev-zero + dwarfs + fuse-overlayfs + # steam + # steam-run + patchelf + gamescope + vulkan-tools + moonlight-qt + ns-usbloader - quark-goldleaf - # gog games installing - heroic + quark-goldleaf + # gog games installing + heroic - # minecraft - prismlauncher # has overrides - temurin-bin-17 - ]; + # minecraft + prismlauncher # has overrides + temurin-bin-17 + + pokefinder + retroarch + ]; # }; # }; } diff --git a/overlays/default.nix b/overlays/default.nix index af39d4e..7aeaf69 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -15,6 +15,17 @@ let ]; }; + retroarch = _prev.retroarch.withCores (cores: with cores; [ + snes9x # snes + nestopia # nes + dosbox # dos + scummvm # scumm + vba-m # gb/a + mgba # gb/a + melonds # ds + dolphin # gc/wii + ]); + # prismlauncher = _prev.prismlauncher.override { # glfw = _prev.glfw-wayland-minecraft; # }; diff --git a/pkgs/default.nix b/pkgs/default.nix index 07cfa99..38f4e24 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -21,6 +21,7 @@ let "t2ts" "ts2t" "vershell" + "eontimer" ]; mkPackages = names: builtins.listToAttrs (map (name: { diff --git a/pkgs/eontimer/default.nix b/pkgs/eontimer/default.nix new file mode 100644 index 0000000..7d085cb --- /dev/null +++ b/pkgs/eontimer/default.nix @@ -0,0 +1,49 @@ +{ pkgs, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "eontimer"; + version = "3.0.0"; + pyproject = true; + + src = pkgs.fetchFromGitHub { + owner = "DasAmpharos"; + repo = "EonTimer"; + rev = "9449e6158f0aa6eaa24b3b1d0a427aa198b5c0e4"; + hash = "sha256-+XN/VGGlEg2gVncRZrWDOZ2bfxt8xyIu22F2wHlG6YI="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + altgraph + certifi + charset-normalizer + idna + libsass + macholib + packaging + pillow + pipdeptree + platformdirs + pyinstaller + pyinstaller-hooks-contrib + pyside6 + requests + setuptools + shiboken6 + urllib3 + ]; + + buildPhase = '' + ${pkgs.python3Packages.pyinstaller}/bin/pyinstaller EonTimer.spec + ''; + + installPhase = '' + mkdir -p $out/bin + cp dist/EonTimer $out/bin/ + ''; + + +} diff --git a/profiles/common/home/custom-packages.nix b/profiles/common/home/custom-packages.nix index 294d7d2..2ba7c9f 100644 --- a/profiles/common/home/custom-packages.nix +++ b/profiles/common/home/custom-packages.nix @@ -20,6 +20,7 @@ t2ts ts2t vershell + eontimer bootstrap diff --git a/profiles/common/nixos/nix-ld.nix b/profiles/common/nixos/nix-ld.nix index d203154..d21841b 100644 --- a/profiles/common/nixos/nix-ld.nix +++ b/profiles/common/nixos/nix-ld.nix @@ -70,6 +70,7 @@ libvpx libxkbcommon libxml2 + libz mesa nspr nss diff --git a/profiles/common/nixos/packages.nix b/profiles/common/nixos/packages.nix index 91ca10c..d82843b 100644 --- a/profiles/common/nixos/packages.nix +++ b/profiles/common/nixos/packages.nix @@ -26,6 +26,8 @@ # secure boot sbctl + libsForQt5.qt5.qtwayland + # nix package database nix-index nixos-generators diff --git a/profiles/common/nixos/sway.nix b/profiles/common/nixos/sway.nix index 73ab3b6..ba9673c 100644 --- a/profiles/common/nixos/sway.nix +++ b/profiles/common/nixos/sway.nix @@ -14,6 +14,7 @@ export SDL_VIDEODRIVER=wayland export QT_QPA_PLATFORM=wayland-egl export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + export QT_QPA_PLATFORM_PLUGIN_PATH="${pkgs.libsForQt5.qt5.qtbase.bin}/lib/qt-${pkgs.libsForQt5.qt5.qtbase.version}/plugins"; export MOZ_ENABLE_WAYLAND=1 export MOZ_DISABLE_RDD_SANDBOX=1 ''; diff --git a/profiles/optional/home/gaming.nix b/profiles/optional/home/gaming.nix index ca514bf..1e41e19 100644 --- a/profiles/optional/home/gaming.nix +++ b/profiles/optional/home/gaming.nix @@ -23,6 +23,9 @@ # minecraft prismlauncher # has overrides temurin-bin-17 + + pokefinder + retroarch ]; # }; # };