From a31dbdaf0f02a93e781d5082ffebd110512c117f Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 31 Jan 2025 21:55:47 -0500 Subject: [PATCH 1/3] don't overlay cutter Signed-off-by: cy --- flake.lock | 17 ----------------- flake.nix | 4 ---- home/yt/ytnix.nix | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 7bd5e59..6646c08 100644 --- a/flake.lock +++ b/flake.lock @@ -915,22 +915,6 @@ "type": "github" } }, - "nixpkgs-cutter": { - "locked": { - "lastModified": 1738351607, - "narHash": "sha256-jJ9u1dLnhGeAeQdmziihaka33zEwBOIKmlB6YbFcIjs=", - "owner": "cything", - "repo": "nixpkgs", - "rev": "940b291c7c6ad8e999cb34d8d5de7913f6776c26", - "type": "github" - }, - "original": { - "owner": "cything", - "ref": "cutter-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-garage": { "locked": { "lastModified": 1736921030, @@ -1224,7 +1208,6 @@ "lix-module": "lix-module", "niri": "niri", "nixpkgs": "nixpkgs_5", - "nixpkgs-cutter": "nixpkgs-cutter", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", diff --git a/flake.nix b/flake.nix index 9bf1fff..38609a5 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,6 @@ }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR - nixpkgs-cutter.url = "github:cything/nixpkgs/cutter-unstable"; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; @@ -150,9 +149,6 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default - (final: prev: { - cutter = inputs.nixpkgs-cutter.legacyPackages.${prev.system}.cutter; - }) ] ++ import ./overlay; }; in diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 0aa8b30..c72ead1 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -112,7 +112,7 @@ sccache awscli2 lldb - (cutter.withPlugins (plugins: [ plugins.rz-ghidra ])) + (cutter.withPlugins (plugins: with plugins; [ rz-ghidra jsdec sigdb ])) ]; programs.waybar.enable = true; From 95ff04af253818ac633a7e32860fa920437f620c Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 31 Jan 2025 23:44:15 -0500 Subject: [PATCH 2/3] nix-ld to make binaryninja work --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 5 +++++ hosts/ytnix/default.nix | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 6646c08..7b3064c 100644 --- a/flake.lock +++ b/flake.lock @@ -883,6 +883,26 @@ "type": "github" } }, + "nix-ld": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737361468, + "narHash": "sha256-+CtIrQZ22MOAOHcpg1zbhX/fVkmEc8A8lYVpXAbXElQ=", + "owner": "nix-community", + "repo": "nix-ld", + "rev": "7f15f8622b63b907fef137689f4528a9447d9377", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-ld", + "type": "github" + } + }, "nix2container": { "flake": false, "locked": { @@ -1207,6 +1227,7 @@ "lix": "lix", "lix-module": "lix-module", "niri": "niri", + "nix-ld": "nix-ld", "nixpkgs": "nixpkgs_5", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", diff --git a/flake.nix b/flake.nix index 38609a5..66dad85 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; + nix-ld = { + url = "github:nix-community/nix-ld"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -170,6 +174,7 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri inputs.lix-module.nixosModules.default + inputs.nix-ld.nixosModules.nix-ld ]; }; chunk = lib.nixosSystem { diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index ecc2d7e..b748be0 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -276,7 +276,44 @@ programs.virt-manager.enable = true; services.usbmuxd.enable = true; - programs.nix-ld.enable = true; + programs.nix-ld.dev = { + enable = true; + # nix run github:thiagokokada/nix-alien#nix-alien-find-libs ./ + libraries = with pkgs; [ + mesa + extest + stdenv.cc.cc + libGL + fontconfig + libxkbcommon + zlib + libxml2 + dbus + freetype + egl-wayland + waylandpp + cairo + xcb-util-cursor + xorg.libX11 + xorg.libxcb + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxkbfile + xorg.libxshmfence + ]; + }; programs.evolution.enable = true; xdg.portal = { From 3510da965738ac5570d011cc58e439a43fef8764 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 1 Feb 2025 12:08:57 -0500 Subject: [PATCH 3/3] install ida-free --- home/yt/ytnix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index c72ead1..0e43354 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -113,6 +113,7 @@ awscli2 lldb (cutter.withPlugins (plugins: with plugins; [ rz-ghidra jsdec sigdb ])) + ida-free ]; programs.waybar.enable = true;