From c3e3ca84a25b9953aa4dcb80ca17d3bb8e9bc7ef Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 29 Apr 2026 13:02:12 -0500 Subject: [PATCH] chore: cleanup unused packages on Darwin --- home/hosts/gregory.hellings-mbp/default.nix | 2 +- modules/hm/gui.nix | 2 + overlays/default.nix | 2 - overlays/pipenv.nix | 92 --------------------- overlays/xonsh-apipenv.nix | 31 ------- pkgs/adblock_update.nix | 4 - 6 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 overlays/pipenv.nix delete mode 100644 overlays/xonsh-apipenv.nix diff --git a/home/hosts/gregory.hellings-mbp/default.nix b/home/hosts/gregory.hellings-mbp/default.nix index 589306d..4f96a61 100644 --- a/home/hosts/gregory.hellings-mbp/default.nix +++ b/home/hosts/gregory.hellings-mbp/default.nix @@ -22,11 +22,11 @@ home-manager python3Packages.ipython just + glab go gopls mariadb nixVersions.stable - pipenv-ivr pre-commit python311 python3Packages.flake8 diff --git a/modules/hm/gui.nix b/modules/hm/gui.nix index e1ec93d..f163c6b 100644 --- a/modules/hm/gui.nix +++ b/modules/hm/gui.nix @@ -158,6 +158,8 @@ in "https://thehellings.com" else "https://kuma.shire-zebra.ts.net/"; + "devtools.debugger.remote-enabled" = true; + "devtools.debugger.remote-port" = 9222; "doh-rollout.doorhanger-decision" = "UIDisabled"; "doh-rollout.doneFirstRun" = true; "signon.rememberSignons" = false; diff --git a/overlays/default.nix b/overlays/default.nix index a61c578..d7d17d9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,7 +10,6 @@ final: prev: in { daikinone = cp ./daikinone.nix { }; - xonsh-apipenv = cp ./xonsh-apipenv.nix { }; } ) ]; @@ -25,7 +24,6 @@ final: prev: withBDplus = true; }; handbrake = prev.handbrake.override { libbluray = final.libbluray-custom; }; - pipenv-ivr = prev.callPackage ./pipenv.nix { }; OVMFFull = prev.OVMFFull.override { secureBoot = true; msVarsTemplate = true; diff --git a/overlays/pipenv.nix b/overlays/pipenv.nix deleted file mode 100644 index f04e373..0000000 --- a/overlays/pipenv.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - lib, - stdenv, - python3, - fetchFromGitHub, - installShellFiles, -}: - -let - - runtimeDeps = - ps: - with ps; - [ - certifi - pysocks - setuptools - (pip.overridePythonAttrs { - dependencies = [ ps.pysocks ]; - }) - virtualenv - virtualenv-clone - ] - ++ lib.optionals stdenv.hostPlatform.isAndroid [ pyjnius ]; - - pythonEnv = python3.withPackages runtimeDeps; - -in -python3.pkgs.buildPythonApplication rec { - pname = "pipenv"; - version = "2023.11.15"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "pypa"; - repo = "pipenv"; - rev = "refs/tags/v${version}"; - hash = "sha256-kxwyws22xJkqBy/hXXcAPHZR2NgZHbmwZr9vYqce434="; - }; - - env.LC_ALL = "en_US.UTF-8"; - - nativeBuildInputs = with python3.pkgs; [ - installShellFiles - setuptools - wheel - ]; - - postPatch = '' - # pipenv invokes python in a subprocess to create a virtualenv - # and to call setup.py. - # It would use sys.executable, which in our case points to a python that - # does not have the required dependencies. - substituteInPlace pipenv/utils/virtualenv.py \ - --replace "sys.executable" "'${pythonEnv.interpreter}'" - ''; - - propagatedBuildInputs = runtimeDeps python3.pkgs; - - preCheck = '' - export HOME="$TMPDIR" - ''; - - nativeCheckInputs = with python3.pkgs; [ - mock - pytestCheckHook - pytest-xdist - pytz - requests - ]; - - disabledTests = [ - "test_convert_deps_to_pip" - "test_download_file" - ]; - - disabledTestPaths = [ "tests/integration" ]; - - postInstall = '' - installShellCompletion --cmd pipenv \ - --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \ - --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \ - --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv) - ''; - - meta = with lib; { - description = "Python Development Workflow for Humans"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; -} diff --git a/overlays/xonsh-apipenv.nix b/overlays/xonsh-apipenv.nix deleted file mode 100644 index e3676ed..0000000 --- a/overlays/xonsh-apipenv.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - toPythonModule, - pipenv, - setuptools, -}: - -buildPythonPackage rec { - pname = "xonsh-apipenv"; - version = "0.6.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "greg-hellings"; - repo = "xontrib-apipenv"; - rev = version; - hash = "sha256-Wa8iev0ow1oh95tPCv5tAJUMBYiStWms8I31WbVcOok="; - }; - - dependencies = [ (toPythonModule pipenv) ]; - build-system = [ setuptools ]; - - meta = with lib; { - description = "Auto pipenv support for Xonsh"; - homepage = "https://github.com/greg-hellings/xontrib-apipenv"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/adblock_update.nix b/pkgs/adblock_update.nix index aec843c..a43669a 100644 --- a/pkgs/adblock_update.nix +++ b/pkgs/adblock_update.nix @@ -2,14 +2,12 @@ writeShellApplication, curl, gnused, - systemd, }: writeShellApplication { name = "adblock-update"; runtimeInputs = [ curl gnused - systemd ]; text = '' curl -s https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts | sed '1,33d' > /etc/adblock_hosts @@ -19,7 +17,5 @@ writeShellApplication { for f in "segment.com" "segment.io" "branch.io" "dev.visualwebsiteoptimizer.com" "click.discord.com"; do sed -i -e "/''${f}/d" /etc/adblock_hosts # Blocks Trelly content for house investors done - - systemctl restart dnsmasq ''; }