From 64e6052f5f24213141faba155b896c6beaef26f4 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Thu, 25 Aug 2022 15:21:33 -0600 Subject: home: switch old-style shenvs to hm-isolation --- shenvs/.keep | 0 shenvs/android-dev.nix | 37 ------------------------------------- shenvs/anpi.nix | 13 ------------- shenvs/config.nix | 12 ------------ shenvs/dsp.nix | 7 ------- shenvs/el3310.nix | 7 ------- shenvs/randall.nix | 8 -------- shenvs/stats.nix | 11 ----------- shenvs/tabas.nix | 30 ------------------------------ shenvs/tex.nix | 19 ------------------- 10 files changed, 144 deletions(-) delete mode 100644 shenvs/.keep delete mode 100644 shenvs/android-dev.nix delete mode 100644 shenvs/anpi.nix delete mode 100644 shenvs/config.nix delete mode 100644 shenvs/dsp.nix delete mode 100644 shenvs/el3310.nix delete mode 100644 shenvs/randall.nix delete mode 100644 shenvs/stats.nix delete mode 100644 shenvs/tabas.nix delete mode 100644 shenvs/tex.nix (limited to 'shenvs') diff --git a/shenvs/.keep b/shenvs/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/shenvs/android-dev.nix b/shenvs/android-dev.nix deleted file mode 100644 index cb0d74c..0000000 --- a/shenvs/android-dev.nix +++ /dev/null @@ -1,37 +0,0 @@ -# Leer del manual de nixpkgs: -# 15.2.5. Notes on environment variables in Android projects -pkgs: let - buildToolsVersion = "31.0.0"; - - android = (pkgs.androidenv.override { - licenseAccepted = true; - }).composeAndroidPackages { - buildToolsVersions = [ buildToolsVersion ]; - platformVersions = [ "29" ]; - abiVersions = [ "armeabi-v7a" "arm64-v8a" ]; - extraLicenses = []; - }; - - sdkRoot = "${android.androidsdk}/libexec/android-sdk"; -in { - paths = with pkgs; [ - (gradleGen.override { - # all-packages.nix dice esto: - # java = pkgs.jdk8; TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 - java = pkgs.jdk; - }).gradle_latest - - android.androidsdk - android.build-tools - - ktlint - ]; - - enter = '' - export ANDROID_SDK_ROOT=${sdkRoot} - #export ANDROID_NDK_ROOT=ANDROID_SDK_ROOT/ndk-bundle - - # Use the same buildToolsVersion here - alias gradle='gradle -Dorg.gradle.project.android.aapt2FromMavenOverride=${sdkRoot}/build-tools/${buildToolsVersion}/aapt2' - ''; -} diff --git a/shenvs/anpi.nix b/shenvs/anpi.nix deleted file mode 100644 index 283fc42..0000000 --- a/shenvs/anpi.nix +++ /dev/null @@ -1,13 +0,0 @@ -pkgs: with pkgs.lib; { - paths = with pkgs; [ - (octave.withPackages (packages: with packages; [ - symbolic - ])) - - (python310.withPackages (packages: with packages; [ - sympy - numpy - matplotlib - ])) - ]; -} diff --git a/shenvs/config.nix b/shenvs/config.nix deleted file mode 100644 index 4d33f74..0000000 --- a/shenvs/config.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ shenvs, config, lib }: with lib; { - gcKeep = with shenvs; let - common = [ - dsp - tex - ]; - - workstation = [ - randall - ]; - in []; # common ++ optionals config.local.workstation workstation; -} diff --git a/shenvs/dsp.nix b/shenvs/dsp.nix deleted file mode 100644 index fb9d1c8..0000000 --- a/shenvs/dsp.nix +++ /dev/null @@ -1,7 +0,0 @@ -pkgs: { - paths = with pkgs; [ - (octave.withPackages (packages: with packages; [ - #communications - ])) - ]; -} diff --git a/shenvs/el3310.nix b/shenvs/el3310.nix deleted file mode 100644 index f8a0179..0000000 --- a/shenvs/el3310.nix +++ /dev/null @@ -1,7 +0,0 @@ -pkgs: { - paths = with pkgs; [ - gcc-arm-embedded - gnumake - qemu - ]; -} diff --git a/shenvs/randall.nix b/shenvs/randall.nix deleted file mode 100644 index dd628bc..0000000 --- a/shenvs/randall.nix +++ /dev/null @@ -1,8 +0,0 @@ -pkgs: { - paths = with pkgs; [ - ghostscript - imagemagick - paps - pdftk - ]; -} diff --git a/shenvs/stats.nix b/shenvs/stats.nix deleted file mode 100644 index 04e4172..0000000 --- a/shenvs/stats.nix +++ /dev/null @@ -1,11 +0,0 @@ -pkgs: with pkgs.lib; - let py = with pkgs; python39.withPackages (packages: with packages; [ - numpy - scipy - matplotlib - pandas - ipython - ]); -in { - paths = [ py ]; -} diff --git a/shenvs/tabas.nix b/shenvs/tabas.nix deleted file mode 100644 index fdb16ca..0000000 --- a/shenvs/tabas.nix +++ /dev/null @@ -1,30 +0,0 @@ -pkgs: let - odbcinst = - { lib, writeTextDir, unixODBCDrivers }: - with lib; let - driver = unixODBCDrivers.msodbcsql17; - odbcinst."${driver.fancyName}" = { - Description = driver.meta.description; - Driver = "${driver}/${driver.driver}"; - }; - in writeTextDir "odbcinst.ini" (generators.toINI {} odbcinst); -in { - paths = with pkgs; [ - dotnet-sdk - nodejs - nodePackages.npm - postgresql_14 - sqlite - local.mssql-tools - local.rqlite - ]; - - enter = '' - export PGDATA=$HOME/vtmp/psql - export DOTNET_ROOT=${pkgs.dotnet-sdk} - export ODBCSYSINI=${pkgs.callPackage odbcinst {}} - export PATH="$PATH:$HOME/.dotnet/tools:$HOME/.npm-packages/bin"; - - alias straviasql='sqlcmd -S itcr.database.windows.net -U pmaestro -d straviatec' - ''; -} diff --git a/shenvs/tex.nix b/shenvs/tex.nix deleted file mode 100644 index 12dfe73..0000000 --- a/shenvs/tex.nix +++ /dev/null @@ -1,19 +0,0 @@ -pkgs: { - paths = with pkgs; [ - biber - (texlive.combine { - inherit (texlive) - appendix - scheme-medium - biblatex - biblatex-ieee - cleveref - csquotes - enumitem - ieeetran - titlesec - titling - zref; - }) - ]; -} -- cgit v1.2.3