From 585dceef77cfe7c7c20bd24f17d7a6984d3bc10d Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 2 Sep 2024 17:05:25 +0000 Subject: [PATCH] Remove xonsh --- sets/base.nix | 3 ++- sets/xonsh.nix | 40 ---------------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 sets/xonsh.nix diff --git a/sets/base.nix b/sets/base.nix index 1b131cf..070b18d 100644 --- a/sets/base.nix +++ b/sets/base.nix @@ -10,7 +10,6 @@ inputs.lix-module.nixosModules.default inputs.private.nixosModules.base inputs.private.nixosModules.substituter - ./xonsh.nix ]; nix = { @@ -51,6 +50,8 @@ "uhk-udev-rules" "unrar" ]); + # oh god, i guess i only use matrix for public stuff though + config.permittedInsecurePackages = [ "olm-3.2.16" ]; }; console = { diff --git a/sets/xonsh.nix b/sets/xonsh.nix deleted file mode 100644 index 6362547..0000000 --- a/sets/xonsh.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ pkgs, ... }: -let - xonsh-direnv = - ps: - ps.buildPythonPackage rec { - pname = "xonsh-direnv"; - version = "1.6.1"; - src = pkgs.fetchPypi { - inherit pname version; - hash = "sha256-Nt8Da1EtMVWZ9mbBDjys7HDutLYifwoQ1HVmI5CN2Ww="; - }; - }; - xontrib-fish-completer = - ps: - ps.buildPythonPackage rec { - pname = "xontrib-fish-completer"; - version = "0.0.1"; - src = pkgs.fetchPypi { - inherit pname version; - hash = "sha256-Kr1iolx6DxqgxVNtXwwfggkLrbH9BlilGAYZahvR+3Y="; - }; - - patchPhase = "sed -i -e 's/^dependencies.*$/dependencies = []/' pyproject.toml"; - }; -in -{ - programs.xonsh = { - enable = true; - config = '' - $UPDATE_OS_ENVIRON = True - xontrib load direnv fish_completer - ''; - package = pkgs.xonsh.wrapper.override { - extraPackages = ps: [ - (xonsh-direnv ps) - (xontrib-fish-completer ps) - ]; - }; - }; -}