From 9008367ef146a64e674807594a879ee18525f097 Mon Sep 17 00:00:00 2001 From: Kate Adkins Date: Sat, 16 Nov 2024 22:18:57 -0700 Subject: [PATCH] aigis: get more things working~ --- nixos/configs/dotfiles/talon.hm.nix | 5 ++++- nixos/configs/steam.nix | 2 +- nixos/configuration.linux.nix | 3 ++- nixos/packages/gui.pkgs.nix | 2 +- packages/binary-ninja.nix | 8 ++++++-- proprietary | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/nixos/configs/dotfiles/talon.hm.nix b/nixos/configs/dotfiles/talon.hm.nix index c0ad6fe..1dab872 100644 --- a/nixos/configs/dotfiles/talon.hm.nix +++ b/nixos/configs/dotfiles/talon.hm.nix @@ -16,7 +16,10 @@ home.file.".talon/bin/talon" = { enable = pkgs.stdenv.isLinux; executable = true; - text = '' + text = if pkgs.stdenv.isAarch64 then + "" # FIXME TODO + else + '' #!${pkgs.bash}/bin/bash set -ue base=/home/deprekated/.talon/core diff --git a/nixos/configs/steam.nix b/nixos/configs/steam.nix index 65b56aa..4d5e5b9 100644 --- a/nixos/configs/steam.nix +++ b/nixos/configs/steam.nix @@ -4,7 +4,7 @@ { pkgs, ... }: { programs.steam = { - enable = true; + enable = !pkgs.stdenv.isAarch64; # Start our steam with appropriate environment vars set. package = pkgs.steam.override { diff --git a/nixos/configuration.linux.nix b/nixos/configuration.linux.nix index 011d838..13c77e9 100644 --- a/nixos/configuration.linux.nix +++ b/nixos/configuration.linux.nix @@ -90,8 +90,9 @@ services.udev.packages = [ pkgs.minipro + ] ++ (if pkgs.stdenv.isAarch64 then [] else [ talon.default - ]; + ]); services.fwupd.enable = true; diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix index 0f38465..55ebe61 100644 --- a/nixos/packages/gui.pkgs.nix +++ b/nixos/packages/gui.pkgs.nix @@ -66,7 +66,6 @@ with pkgs; pavucontrol deprekages.argos tidal-hifi - steam vlc ] @@ -159,6 +158,7 @@ with pkgs; deprekages.home-assistant-desktop bitwig-studio calibre + steam ] else [ ] diff --git a/packages/binary-ninja.nix b/packages/binary-ninja.nix index 2470991..dcde165 100644 --- a/packages/binary-ninja.nix +++ b/packages/binary-ninja.nix @@ -31,7 +31,7 @@ let binary-ninja = stdenv.mkDerivation { pname = "binary-ninja"; - version = "4.0.4958"; + version = "4.0.5902"; buildInputs = [ autoPatchelfHook @@ -58,7 +58,11 @@ let # Use our local zip directly. dontBuild = true; - src = ../proprietary/binja/binaryninja_personal_linux.zip; + src = if stdenv.isAarch64 then + ../proprietary/binja/binaryninja_personal_linux_aarch64.zip + else + ../proprietary/binja/binaryninja_personal_linux_x64.zip; + installPhase = '' mkdir -p $out/opt diff --git a/proprietary b/proprietary index 2320a60..6cb7721 160000 --- a/proprietary +++ b/proprietary @@ -1 +1 @@ -Subproject commit 2320a602b644f6a3f552f8015418fae2712a209b +Subproject commit 6cb772104547058cb310c381f9f50e31d02dd514