summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home/default.nix7
-rw-r--r--home/shenvs/README.md1
-rw-r--r--home/zshrc.nix8
-rw-r--r--pkgs/default.nix11
-rw-r--r--shenvs/.keep0
-rw-r--r--shenvs/android-dev.nix37
-rw-r--r--shenvs/anpi.nix13
-rw-r--r--shenvs/config.nix12
-rw-r--r--shenvs/dsp.nix7
-rw-r--r--shenvs/el3310.nix7
-rw-r--r--shenvs/randall.nix8
-rw-r--r--shenvs/stats.nix11
-rw-r--r--shenvs/tabas.nix30
-rw-r--r--shenvs/tex.nix19
14 files changed, 2 insertions, 169 deletions
diff --git a/home/default.nix b/home/default.nix
index 0941f42..7047634 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -54,13 +54,6 @@ with lib; {
"vtmp" = symlink "/run/user/1000/vtmp";
".calc_history" = devNull;
".units_history" = devNull;
-
- ".shenvs".text = let
- keeps = { gcKeep ? [] }: concatStringsSep "\n" (map toString gcKeep);
- in keeps (import ../shenvs/config.nix {
- inherit (pkgs.local) shenvs;
- inherit config lib;
- });
};
packages = import ./path.nix pkgs;
diff --git a/home/shenvs/README.md b/home/shenvs/README.md
new file mode 100644
index 0000000..37073ba
--- /dev/null
+++ b/home/shenvs/README.md
@@ -0,0 +1 @@
+# This directory has been lustrated.
diff --git a/home/zshrc.nix b/home/zshrc.nix
index 704ef0e..ec231f5 100644
--- a/home/zshrc.nix
+++ b/home/zshrc.nix
@@ -21,10 +21,6 @@
source ${local.git-aliases}
}
- function shenv() {
- NIXPKGS_ALLOW_UNFREE=1 nix shell --impure 'system#shenvs.'"$1"
- }
-
function xseli() {
T=$(mktemp)
$EDITOR -n $T
@@ -44,8 +40,6 @@
INSTALLABLES=()
while read -d: PATH_ITEM; do
if [[ "$PATH_ITEM" =~ "^(/nix/store/[a-z0-9]+-([a-zA-Z][a-zA-Z0-9_]*(-[a-zA-Z][a-zA-Z0-9_]*)*)(-[^/]+)?)/" ]]; then
- ENTER="''${match[1]}/lib/shenv/enter"
- [[ "''${match[2]}" =~ '^shenv-' && -r "$ENTER" ]] && . "$ENTER"
INSTALLABLES+=("''${match[2]}")
fi
done <<<"$PATH"
@@ -54,7 +48,7 @@
_GRML_NIX_SHELL="{''${INSTALLABLES[@]}} "
fi
- unset INSTALLABLES ENTER PATH_ITEM
+ unset INSTALLABLES PATH_ITEM
function grml_nix_shell() {
REPLY="$_GRML_NIX_SHELL"
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 7280572..ae36807 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -5,17 +5,6 @@ with pkgs.lib; let
combined = pkgs // { inherit local; };
local = {
- shenvs = let
- build = name: { paths, enter ? null }: buildEnv {
- name = "shenv-${name}";
- paths = (optional (enter != null) (writeTextDir "lib/shenv/enter" enter))
- ++ paths;
- };
- in pkgs.lib.mapAttrs (name: shenv: build name (shenv combined)) (util.importAll {
- root = ../shenvs;
- exclude = [ "config" ];
- });
-
btclone = callPackage ./btclone {};
git-aliases = callPackage ./git-aliases.nix {};
mssql-tools = callPackage ./mssql-tools.nix {};
diff --git a/shenvs/.keep b/shenvs/.keep
deleted file mode 100644
index e69de29..0000000
--- a/shenvs/.keep
+++ /dev/null
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;
- })
- ];
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-10 09:55:45 +0000