From 31bffebdbb86bb1940af85840dcbe177648b8bf0 Mon Sep 17 00:00:00 2001 From: despiegk Date: Sat, 13 Jan 2024 17:24:22 +0300 Subject: [PATCH] s --- .gitignore | 3 ++- shell.nix | 63 +++++++++++++++++++++++++++--------------------------- start.sh | 10 ++++++--- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 676b8fe..0b97aeb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ deluge_conf bin/ code/ -nuscripts \ No newline at end of file +nuscripts +nuscripts/* \ No newline at end of file diff --git a/shell.nix b/shell.nix index afb80fe..2730215 100644 --- a/shell.nix +++ b/shell.nix @@ -1,32 +1,31 @@ -let - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-23.11"; - pkgs = import nixpkgs { config = {}; overlays = []; }; -in - -pkgs.mkShell { - packages = with pkgs; [ - git - nushell - mc - jq - # vscode-with-extensions - deluge - libtorrent-rasterbar - python311Packages.libtorrent-rasterbar - python311Full - python311Packages.ipython - python311Packages.ipdb - python311Packages.rq - rsync - # rustc - # dumptorrent - # udpt - # buildtorrent - - ]; - # shellHook = '' - # echo "Nix shell environment is ready." - # hero_shell.sh - # ''; -} - +let + nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-23.11"; + pkgs = import nixpkgs { config = {}; overlays = []; }; +in + +pkgs.mkShell { + packages = with pkgs; [ + git + nushell + mc + jq + deluge + libtorrent-rasterbar + python311Packages.libtorrent-rasterbar + python311Full + python311Packages.ipython + python311Packages.ipdb + python311Packages.rq + rsync + # rustc + # dumptorrent + # udpt + # buildtorrent + ]; + shellHook = '' + cd $BASE + git status + $BASE/hero_shell.sh + ''; +} + diff --git a/start.sh b/start.sh index 041c0c7..1aac2e5 100755 --- a/start.sh +++ b/start.sh @@ -1,9 +1,13 @@ #!/usr/bin/env bash -set -e -MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd "$MYDIR" +export BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd "$BASE" export NIXPKGS_ALLOW_UNFREE=1 + +mkdir -p $BASE/code +code $BASE/code + +set -e nix-shell