7 files changed, 5 insertions, 47 deletions

diff --git a/Makefile b/Makefile
index fafbe00..d5b8e5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-subrecipes = setup
+subrecipes = setup nix-info
 subrecipes += nixops ssh-eldiron ssh-backup-2 ssh-monitoring-1
 subrecipes += info debug dry-run build upload deploy deploy-reboot reboot
 subrecipes += list-generations delete-generations cleanup
@@ -7,28 +7,6 @@ ${subrecipes}:
         @$(MAKE) --no-print-directory -C nixops/ $@
 .PHONY: ${subrecipes}
 
-# This will automatically upgrade to latest version at each build
-nixpkgs ?= https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz
-NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgs}:nixpkgsPrevious=${nixpkgs}
-
-nix-path:
-        @echo "export NIX_PATH=$(NIX_PATH)"
-
-env:
-        ./scripts/make-env
-
-env-dry-run:
-        ./scripts/make-env --dry-run
-
-nix-info:
-        @version=$$(nix eval --option tarball-ttl 1 --raw nixpkgs.lib.version) && \
-          mainversion=$$(echo $$version | cut -d"." -f -2) && \
-          echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \
-          nix-instantiate --find-file nixpkgs
-
-nix-info-nixops:
-        @$(MAKE) --no-print-directory -C nixops/ nix-info
-
 nur:
         ./scripts/make-nur
         curl -o /dev/null -XPOST "https://nur-update.herokuapp.com/update?repo=immae"
@@ -36,4 +14,4 @@ nur:
 shellcheck:
         shellcheck scripts/* nixops/scripts/* modules/private/gitolite/gitolite_ldap_groups.sh modules/private/ssh/ldap_authorized_keys.sh modules/private/pub/restrict
 
-.PHONY: env env-dry-run nix-info nur shellcheck
+.PHONY: nur shellcheck
diff --git a/config/README.md b/config/README.md
deleted file mode 100644
index 542f31e..0000000
--- a/config/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Link this directory to ~/.config/nixpkgs
diff --git a/config/nixRoot b/config/nixRoot
deleted file mode 120000
index a96aa0e..0000000
--- a/config/nixRoot
+++ /dev/null
@@ -1 +0,0 @@
-..
\ No newline at end of file
diff --git a/config/overlays.nix b/config/overlays.nix
deleted file mode 100644
index 1040d59..0000000
--- a/config/overlays.nix
+++ /dev/null
@@ -1 +0,0 @@
-builtins.attrValues (import ./nixRoot/overlays)
diff --git a/scripts/make-env b/scripts/make-env
deleted file mode 100755
index 25aa869..0000000
--- a/scripts/make-env
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-eval "$(make --no-print-directory -C $(dirname $DIR) nix-path)"
-nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@"
-result=$?
-
-cat >> $(dirname $DIR)/versions_log <<EOF
-Ran $(date) with args "$@" and returned "$result"
-$(make --no-print-directory -C $(dirname $DIR) nix-info | sed -e "s/^/    /")
-EOF
diff --git a/scripts/make-nur b/scripts/make-nur
index 1fe5f7a..127f8bd 100755
--- a/scripts/make-nur
+++ b/scripts/make-nur
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -16,6 +16,8 @@ nur_root="252dd7d899b7a0deea1537cc5d2d48b825afffb0"
 first_commit="5145061e9b679ea1e5d2709d22d0ee53467fed15"
 git rebase --onto=$nur_root $first_commit master
 
+# The list below musn't get shrinked, it is used by filter-branch on
+# every commit
 clean_folder='
   rm -rf config lib/private modules/private pkgs/private nixops
   for broken in pkgs/crypto/cardano/default.nix; do
diff --git a/scripts/nix_env b/scripts/nix_env
deleted file mode 100644
index 7fb6646..0000000
--- a/scripts/nix_env
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# This will automatically upgrade to latest version at each build
-nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
-nixpkgsPrevious="$nixpkgs"
-nixpkgsNext="$nixpkgs"
-export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"