From bffa0e43a2a9f9d9f421624e490d13fab9fa3624 Mon Sep 17 00:00:00 2001 From: Random936 Date: Thu, 21 Nov 2024 18:46:32 -0800 Subject: [PATCH] Added thunar deps; removed evil-winrm and binaryninja pkgs --- config/headful.nix | 4 +- config/shared.nix | 16 +++ home/modules/hacking.nix | 12 +- packages/all-packages.nix | 2 - packages/binaryninja/default.nix | 64 ----------- packages/evil-winrm/Gemfile | 7 -- packages/evil-winrm/Gemfile.lock | 51 --------- packages/evil-winrm/default.nix | 46 -------- packages/evil-winrm/gemset.nix | 187 ------------------------------- 9 files changed, 22 insertions(+), 367 deletions(-) delete mode 100644 packages/binaryninja/default.nix delete mode 100644 packages/evil-winrm/Gemfile delete mode 100644 packages/evil-winrm/Gemfile.lock delete mode 100644 packages/evil-winrm/default.nix delete mode 100644 packages/evil-winrm/gemset.nix diff --git a/config/headful.nix b/config/headful.nix index cb5c0e3..a866cec 100644 --- a/config/headful.nix +++ b/config/headful.nix @@ -64,6 +64,8 @@ backend = "glx"; }; - # Install additional programs + # Install Thunar programs.thunar.enable = true; + services.gvfs.enable = true; + services.tumbler.enable = true; } diff --git a/config/shared.nix b/config/shared.nix index d606536..16cfe62 100644 --- a/config/shared.nix +++ b/config/shared.nix @@ -35,6 +35,22 @@ vim screen killall + + # Create a "fhs" package for running binaries + (let base = pkgs.appimageTools.defaultFhsEnvArgs; in + pkgs.buildFHSUserEnv (base // { + name = "fhs"; + targetPkgs = pkgs: + (base.targetPkgs pkgs) ++ (with pkgs; [ + pkg-config + libxml2 + ncurses + ] + ); + profile = "export FHS=1"; + runScript = "bash"; + extraOutputsToInstall = ["dev"]; + })) ]; # Enable services. diff --git a/home/modules/hacking.nix b/home/modules/hacking.nix index eaeb15e..b9f6f1d 100644 --- a/home/modules/hacking.nix +++ b/home/modules/hacking.nix @@ -1,9 +1,4 @@ -{ lib, config, pkgs, ... }: -let - mypkgs = import ../../packages/all-packages.nix { - inherit pkgs lib config; - }; -in { +{ lib, config, pkgs, ... }: { # Hacking specific packages. home.packages = (with pkgs; [ yara @@ -14,6 +9,7 @@ in { nikto sqlmap wpscan + pwndbg openssl remmina netexec @@ -22,6 +18,7 @@ in { exploitdb responder burpsuite + evil-winrm feroxbuster (wordlists.override { lists = with pkgs; [ @@ -29,9 +26,6 @@ in { seclists ]; }) - ]) ++ (with mypkgs; [ - evil-winrm - #binaryninja ]); } diff --git a/packages/all-packages.nix b/packages/all-packages.nix index 35d3f72..302b0b7 100644 --- a/packages/all-packages.nix +++ b/packages/all-packages.nix @@ -1,5 +1,3 @@ { pkgs, lib, config, ... }: rec { tpm = pkgs.callPackage ./tpm {}; - evil-winrm = pkgs.callPackage ./evil-winrm {}; - binaryninja = pkgs.callPackage ./binaryninja {}; } diff --git a/packages/binaryninja/default.nix b/packages/binaryninja/default.nix deleted file mode 100644 index bb4471a..0000000 --- a/packages/binaryninja/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - buildFHSEnv, - writeScript, - pkgs, - python311 -}: -buildFHSEnv rec { - name = "binaryninja"; - - python = python311.withPackages (ps: with ps; [ - torch - pip - ]); - - targetPkgs = pkgs: with pkgs; [ - dbus - fontconfig - freetype - libGL - libxkbcommon - python - xorg.libXi - xorg.libX11 - xorg.libxcb - xorg.libXext - xorg.libXtst - xorg.libXfixes - xorg.libXrandr - xorg.libXcursor - xorg.libXdamage - xorg.libXrender - xorg.libXcomposite - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - alsaLib - wayland - libxml2 - expat - glib - zlib - krb5 - nspr - nss - ]; - - runScript = writeScript "binaryninja.sh" '' - set -e - - # Export environment variables - export PATH="${python}/bin:$PATH" - export PYTHONPATH="${python}/lib/python3.12/site-packages:$PYTHONPATH" - - # Run Binary Ninja - exec "$HOME/.binaryninja/binaryninja" "$@" - ''; - - meta = { - description = "BinaryNinja"; - platforms = ["x86_64-linux"]; - }; -} diff --git a/packages/evil-winrm/Gemfile b/packages/evil-winrm/Gemfile deleted file mode 100644 index ebdf6f5..0000000 --- a/packages/evil-winrm/Gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -gem 'winrm' -gem 'winrm-fs' -gem 'stringio' -gem 'logger' -gem 'fileutils' diff --git a/packages/evil-winrm/Gemfile.lock b/packages/evil-winrm/Gemfile.lock deleted file mode 100644 index edbda34..0000000 --- a/packages/evil-winrm/Gemfile.lock +++ /dev/null @@ -1,51 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - builder (3.2.3) - erubis (2.7.0) - ffi (1.11.1) - fileutils (0.7.2) - gssapi (1.3.0) - ffi (>= 1.0.1) - gyoku (1.3.1) - builder (>= 2.1.2) - httpclient (2.8.3) - little-plugger (1.1.4) - logger (1.4.3) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - multi_json (1.14.1) - nori (2.6.0) - rexml (3.2.5) - rubyntlm (0.6.2) - rubyzip (1.3.0) - stringio (0.0.2) - winrm (2.3.2) - builder (>= 2.1.2) - erubis (~> 2.7) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rexml (>= 3.2.3.1) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-fs (1.3.2) - erubis (~> 2.7) - logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) - winrm (~> 2.0) - -PLATFORMS - ruby - -DEPENDENCIES - fileutils - logger - stringio - winrm - winrm-fs - -BUNDLED WITH - 2.2.24 \ No newline at end of file diff --git a/packages/evil-winrm/default.nix b/packages/evil-winrm/default.nix deleted file mode 100644 index b8e88e1..0000000 --- a/packages/evil-winrm/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, bundlerEnv -}: - -stdenv.mkDerivation rec { - pname = "evil-winrm"; - version = "3.5"; - - src = fetchFromGitHub { - owner = "Hackplayers"; - repo = "evil-winrm"; - rev = "refs/tags/v${version}"; - hash = "sha256-8Lyo7BgypzrHMEcbYlxo/XWwOtBqs2tczYnc3+XEbeA="; - }; - - env = bundlerEnv { - name = pname; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = [ - env.wrappedRuby - ]; - - installPhase = '' - mkdir -p $out/bin - cp evil-winrm.rb $out/bin/evil-winrm - ''; - - meta = with lib; { - description = "WinRM shell for hacking/pentesting"; - mainProgram = "evil-winrm"; - homepage = "https://github.com/Hackplayers/evil-winrm"; - changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md"; - license = licenses.lgpl3Plus; - }; -} diff --git a/packages/evil-winrm/gemset.nix b/packages/evil-winrm/gemset.nix deleted file mode 100644 index 413b8f1..0000000 --- a/packages/evil-winrm/gemset.nix +++ /dev/null @@ -1,187 +0,0 @@ -{ - builder = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; - type = "gem"; - }; - version = "3.2.3"; - }; - erubis = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - type = "gem"; - }; - version = "2.7.0"; - }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; - type = "gem"; - }; - version = "1.11.1"; - }; - fileutils = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "173z4dsqp9khcsl7x93dq1qj9d7rd378a7yfg53b1s6mczlkvh2k"; - type = "gem"; - }; - version = "0.7.2"; - }; - gssapi = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh"; - type = "gem"; - }; - version = "1.3.0"; - }; - gyoku = { - dependencies = ["builder"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; - type = "gem"; - }; - version = "1.3.1"; - }; - httpclient = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; - type = "gem"; - }; - version = "2.8.3"; - }; - little-plugger = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; - logger = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ihvvl2im9qii31d42c9kfscdg2flfqajs6ycbpslznclmfc71gc"; - type = "gem"; - }; - version = "1.4.3"; - }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; - type = "gem"; - }; - version = "2.2.2"; - }; - multi_json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; - type = "gem"; - }; - version = "1.14.1"; - }; - nori = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; - type = "gem"; - }; - version = "2.6.0"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - rubyntlm = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; - type = "gem"; - }; - version = "0.6.2"; - }; - rubyzip = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; - type = "gem"; - }; - version = "1.3.0"; - }; - stringio = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-U0VuFBdcWU4OjrIgahvjPzl01P4hwTHmKJCLBcjCrh4="; - type = "gem"; - }; - version = "3.1.1"; - }; - winrm = { - dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19vxrclxc5l8n2agwvv291740s6gna2phg3lkybjb0ldkmpi3sj2"; - type = "gem"; - }; - version = "2.3.2"; - }; - winrm-fs = { - dependencies = ["erubis" "logging" "rubyzip" "winrm"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3"; - type = "gem"; - }; - version = "1.3.2"; - }; -}