From 7201ac5acc2df53a768bb9c3948307c4fcc27327 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sat, 27 May 2023 21:16:33 +0300 Subject: [PATCH] Move venv function to environment.nu as it overrid --- machines/asus/nushell/environment.nu | 5 +++++ machines/asus/python/default.nix | 15 +++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/machines/asus/nushell/environment.nu b/machines/asus/nushell/environment.nu index 10f5333..8eef906 100644 --- a/machines/asus/nushell/environment.nu +++ b/machines/asus/nushell/environment.nu @@ -24,3 +24,8 @@ let-env NU_PLUGIN_DIRS = [ | path dirname | path join 'plugins') ] + +def venv [] { + virtualenv venv + source ./venv/bin/activate.nu +} diff --git a/machines/asus/python/default.nix b/machines/asus/python/default.nix index 59268d8..f375b25 100644 --- a/machines/asus/python/default.nix +++ b/machines/asus/python/default.nix @@ -1,19 +1,10 @@ -{ lib, pkgs, systemPackages, homeConfiguration, ... }: lib.recursiveUpdate +{ pkgs, systemPackages, ... }: -(with pkgs; systemPackages [ +with pkgs; systemPackages [ (python311.withPackages (pkgs: with pkgs; [ pip requests ])) virtualenv poetry -]) - -(homeConfiguration "nixos" { - programs.nushell.envFile.source = '' - def venv [] { - virtualenv venv - source ./venv/bin/activate.nu - } - ''; -}) +]