From 9376005a21f09a4911c3a46181f934068d1778e2 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Thu, 15 Jan 2026 13:53:59 -0600 Subject: [PATCH] stuff --- .../matt@macbook-pro-nixos/default.nix | 2 +- .../x86_64-linux/matt@matt-nixos/default.nix | 2 +- packages/arm-trusted-firmware/default.nix | 2 +- packages/bolt-launcher/default.nix | 183 ------------------ packages/bolt-launcher/versions.json | 9 - packages/edk2/default.nix | 4 +- packages/edk2/versions.json | 2 +- .../macbook-pro-nixos/services.nix | 13 +- 8 files changed, 14 insertions(+), 203 deletions(-) delete mode 100644 packages/bolt-launcher/default.nix delete mode 100644 packages/bolt-launcher/versions.json diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index 6d5f6d5..8f1cea6 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -134,10 +134,10 @@ in home.packages = with pkgs.${namespace}; [ - bolt-launcher # librepods ] ++ (with pkgs; [ + bolt-launcher iw iwd orca-slicer diff --git a/homes/x86_64-linux/matt@matt-nixos/default.nix b/homes/x86_64-linux/matt@matt-nixos/default.nix index 7ad2108..a3f152b 100755 --- a/homes/x86_64-linux/matt@matt-nixos/default.nix +++ b/homes/x86_64-linux/matt@matt-nixos/default.nix @@ -166,6 +166,7 @@ in home.packages = with pkgs; [ + bolt-launcher compose2nix distrobox heroic @@ -187,7 +188,6 @@ in waydroid-helper ] ++ (with pkgs.${namespace}; [ - bolt-launcher discord-krisp superposition # librepods diff --git a/packages/arm-trusted-firmware/default.nix b/packages/arm-trusted-firmware/default.nix index 3725b31..bc6737b 100644 --- a/packages/arm-trusted-firmware/default.nix +++ b/packages/arm-trusted-firmware/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ARM-software"; repo = "arm-trusted-firmware"; - tag = "v${version}"; + rev = "${version}"; hash = versions.fw.hash; }; diff --git a/packages/bolt-launcher/default.nix b/packages/bolt-launcher/default.nix deleted file mode 100644 index c5328a8..0000000 --- a/packages/bolt-launcher/default.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - autoPatchelfHook, - makeWrapper, - # Core dependencies - alsa-lib, - at-spi2-core, - cairo, - cups, - dbus, - expat, - fontconfig, - freetype, - gdk-pixbuf, - glib, - gtk3, - libarchive, - libdrm, - libGL, - libx11, - libxcb, - libxext, - libxkbcommon, - mesa, - nspr, - nss, - pango, - systemd, - xorg, - zlib, - # Additional CEF/Chromium dependencies - libnotify, - libpulseaudio, - libuuid, - libva, - pipewire, - udev, - wayland, - jdk17 # for RuneLite/HDOS - , # for RS3 -}: -let - inherit (lib.trivial) importJSON; - versions = importJSON ./versions.json; -in -stdenv.mkDerivation rec { - pname = "bolt-launcher"; - version = versions.bolt.version; - - src = fetchzip { - url = "https://codeberg.org/Adamcake/Bolt/releases/download/${version}/Bolt-Linux.zip"; - sha256 = versions.bolt.hash; - stripRoot = false; - }; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - ]; - - buildInputs = [ - alsa-lib - at-spi2-core - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libarchive - libdrm - libGL - libx11 - libxcb - libxext - libxkbcommon - mesa - nspr - nss - pango - stdenv.cc.cc.lib # for libstdc++.so.6 - systemd - zlib - # Additional CEF/Chromium deps - libnotify - libpulseaudio - libuuid - libva - pipewire - udev - wayland - ] - ++ (with xorg; [ - libXcomposite - libXcursor - libXdamage - libXfixes - libXi - libXinerama - libXrandr - libXrender - libXScrnSaver - libxshmfence - libXtst - libXxf86vm - ]); - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - # Create directory structure - mkdir -p $out/bin - mkdir -p $out/lib/bolt-launcher - mkdir -p $out/share/applications - mkdir -p $out/share/icons - - # Copy all files to lib directory - cp -r ./bolt-launcher/* $out/lib/bolt-launcher/ - - # The main executable is 'bolt' (lowercase) - chmod +x $out/lib/bolt-launcher/bolt - - # Also make chrome-sandbox executable (needed for CEF) - if [ -f $out/lib/bolt-launcher/chrome-sandbox ]; then - chmod +x $out/lib/bolt-launcher/chrome-sandbox - fi - - # Create wrapper script with proper library paths - makeWrapper $out/lib/bolt-launcher/bolt $out/bin/bolt-launcher \ - --prefix LD_LIBRARY_PATH : "$out/lib/bolt-launcher:${lib.makeLibraryPath buildInputs}" \ - --set BOLT_SKIP_UPDATE "1" \ - --chdir "$out/lib/bolt-launcher" \ - ${lib.optionalString (jdk17 != null) "--prefix PATH : ${jdk17}/bin"} - - # Create a simple desktop file if none exists - cat > $out/share/applications/bolt-launcher.desktop << EOF - [Desktop Entry] - Name=Bolt Launcher - Comment=Free open-source third-party implementation of the Jagex Launcher - Exec=$out/bin/bolt-launcher - Icon=bolt-launcher - Type=Application - Categories=Game; - EOF - - runHook postInstall - ''; - - # Additional runtime fixes - postFixup = '' - # The CEF libraries are in the same directory as the main executable - # Make sure they can find each other - patchelf --set-rpath "$out/lib/bolt-launcher:${lib.makeLibraryPath buildInputs}" \ - $out/lib/bolt-launcher/bolt || true - - # Patch the CEF libraries - for lib in $out/lib/bolt-launcher/*.so*; do - if [ -f "$lib" ]; then - patchelf --set-rpath "$out/lib/bolt-launcher:${lib.makeLibraryPath buildInputs}" "$lib" || true - fi - done - ''; - - meta = with lib; { - description = "Free open-source third-party implementation of the Jagex Launcher"; - homepage = "https://bolt.adamcake.com/"; - license = licenses.agpl3Only; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - maintainers = with maintainers; [ ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/packages/bolt-launcher/versions.json b/packages/bolt-launcher/versions.json deleted file mode 100644 index 8afa86e..0000000 --- a/packages/bolt-launcher/versions.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "bolt": { - "hash": "sha256-s0hC822fXuYiHPRE3xcLNOsZs43xhLJ+vM1cuMc9zZQ=", - "location": "codeberg", - "owner": "Adamcake", - "repo": "Bolt", - "tag": "0.20.6" - } -} diff --git a/packages/edk2/default.nix b/packages/edk2/default.nix index 8bb1bfa..00c6c2c 100644 --- a/packages/edk2/default.nix +++ b/packages/edk2/default.nix @@ -29,8 +29,10 @@ let owner = versions."edk2${repoOwner}".owner; repo = "edk2"; name = repo; - rev = versions."edk2${repoOwner}".rev; + rev = (if MODEL == "5" then versions."edk2${repoOwner}".rev else null); + tag = (if MODEL == "5" then null else versions."edk2${repoOwner}".tag); hash = versions."edk2${repoOwner}".hash; + fetchSubmodules = true; }; edk2NonOsiSrc = fetchFromGitHub rec { diff --git a/packages/edk2/versions.json b/packages/edk2/versions.json index 3e4950f..206981c 100644 --- a/packages/edk2/versions.json +++ b/packages/edk2/versions.json @@ -1,6 +1,6 @@ { "edk2": { - "hash": "sha256-CS/jWY6B+/PIKDh6cL6n9pwAPhPcjZBZc75SnOJbHf8=", + "hash": "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=", "location": "github", "owner": "tianocore", "repo": "edk2", diff --git a/systems/aarch64-linux/macbook-pro-nixos/services.nix b/systems/aarch64-linux/macbook-pro-nixos/services.nix index c5cf165..1da9ae0 100644 --- a/systems/aarch64-linux/macbook-pro-nixos/services.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/services.nix @@ -2,22 +2,23 @@ { services = { auto-cpufreq = { - enable = false; + enable = true; settings = { # settings for when connected to a power source charger = { # see available governors by running: cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors # preferred governor - governor = "schedutil"; + governor = "performance"; # minimum cpu frequency (in kHz) # example: for 800 MHz = 800000 kHz --> scaling_min_freq = 800000 # Available: 912 MHz, 1284 MHz, 1752 MHz, 2004 MHz, 2256 MHz, 2424 MHz # 702000 948000 1188000 1452000 1704000 1968000 2208000 2400000 2568000 2724000 2868000 3000000 3132000 3264000 + # boost 3360000 3408000 3504000 # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html # to use this feature, uncomment the following line and set the value accordingly - scaling_min_freq = 912000; - scaling_max_freq = 3500000; + scaling_min_freq = 702000; + scaling_max_freq = 3504000; # scaling_min_freq = 702000; # scaling_max_freq = 1968000; @@ -28,7 +29,7 @@ battery = { # see available governors by running: cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors # preferred governor - governor = "powersave"; + governor = "schedutil"; # minimum cpu frequency (in kHz) # example: for 800 MHz = 800000 kHz --> scaling_min_freq = 800000 @@ -36,7 +37,7 @@ # 702000 948000 1188000 1452000 1704000 1968000 2208000 2400000 2568000 2724000 2868000 3000000 3132000 3264000 # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html # to use this feature, uncomment the following line and set the value accordingly - scaling_min_freq = 912000; + scaling_min_freq = 702000; scaling_max_freq = 2424000; # turbo boost setting (always, auto, or never)