From ea9fcce6944eb71ebb03862ced66cf280dad55a2 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 11 Sep 2018 18:49:19 +0200 Subject: shell.nix: RIP --- default.nix | 3 - jeschli/1systems/bln/source.nix | 4 - jeschli/1systems/bolide/source.nix | 4 - jeschli/1systems/brauerei/source.nix | 4 - jeschli/1systems/enklave/source.nix | 3 - jeschli/1systems/reagenzglas/.source.nix.swp | Bin 12288 -> 0 bytes jeschli/1systems/reagenzglas/source.nix | 4 - jeschli/source.nix | 26 --- krebs/0tests/deploy.nix | 5 - krebs/1systems/hotdog/source.nix | 3 - krebs/1systems/onebutton/source.nix | 13 -- krebs/1systems/puyak/source.nix | 3 - krebs/1systems/test-all-krebs-modules/source.nix | 3 - krebs/1systems/test-arch/source.nix | 3 - krebs/1systems/test-centos6/source.nix | 3 - krebs/1systems/test-centos7/source.nix | 3 - krebs/1systems/test-failing/source.nix | 3 - krebs/1systems/test-minimal-deploy/source.nix | 3 - krebs/1systems/wolf/source.nix | 3 - krebs/5pkgs/simple/stockholm/default.nix | 230 ----------------------- krebs/source.nix | 29 --- lass/1systems/blue/source.nix | 4 - lass/1systems/cabal/source.nix | 4 - lass/1systems/daedalus/source.nix | 4 - lass/1systems/icarus/source.nix | 4 - lass/1systems/littleT/source.nix | 4 - lass/1systems/mors/source.nix | 4 - lass/1systems/prism/source.nix | 4 - lass/1systems/red/source.nix | 4 - lass/1systems/shodan/source.nix | 3 - lass/1systems/skynet/source.nix | 4 - lass/1systems/uriel/source.nix | 3 - lass/1systems/xerxes/source.nix | 5 - lass/source.nix | 29 --- makefu/2configs/tools/dev.nix | 1 - makefu/source.nix | 2 +- nin/1systems/axon/source.nix | 4 - nin/1systems/hiawatha/source.nix | 4 - nin/1systems/onondaga/source.nix | 4 - nin/source.nix | 23 --- shell.nix | 38 ---- tv/1systems/alnus/source.nix | 4 - tv/1systems/mu/source.nix | 3 - tv/1systems/nomic/source.nix | 4 - tv/1systems/querel/source.nix | 3 - tv/1systems/wu/source.nix | 4 - tv/1systems/xu/source.nix | 4 - tv/1systems/zu/source.nix | 4 - tv/source.nix | 37 ---- 49 files changed, 1 insertion(+), 566 deletions(-) delete mode 100644 jeschli/1systems/bln/source.nix delete mode 100644 jeschli/1systems/bolide/source.nix delete mode 100644 jeschli/1systems/brauerei/source.nix delete mode 100644 jeschli/1systems/enklave/source.nix delete mode 100644 jeschli/1systems/reagenzglas/.source.nix.swp delete mode 100644 jeschli/1systems/reagenzglas/source.nix delete mode 100644 jeschli/source.nix delete mode 100644 krebs/1systems/hotdog/source.nix delete mode 100644 krebs/1systems/onebutton/source.nix delete mode 100644 krebs/1systems/puyak/source.nix delete mode 100644 krebs/1systems/test-all-krebs-modules/source.nix delete mode 100644 krebs/1systems/test-arch/source.nix delete mode 100644 krebs/1systems/test-centos6/source.nix delete mode 100644 krebs/1systems/test-centos7/source.nix delete mode 100644 krebs/1systems/test-failing/source.nix delete mode 100644 krebs/1systems/test-minimal-deploy/source.nix delete mode 100644 krebs/1systems/wolf/source.nix delete mode 100644 krebs/5pkgs/simple/stockholm/default.nix delete mode 100644 krebs/source.nix delete mode 100644 lass/1systems/blue/source.nix delete mode 100644 lass/1systems/cabal/source.nix delete mode 100644 lass/1systems/daedalus/source.nix delete mode 100644 lass/1systems/icarus/source.nix delete mode 100644 lass/1systems/littleT/source.nix delete mode 100644 lass/1systems/mors/source.nix delete mode 100644 lass/1systems/prism/source.nix delete mode 100644 lass/1systems/red/source.nix delete mode 100644 lass/1systems/shodan/source.nix delete mode 100644 lass/1systems/skynet/source.nix delete mode 100644 lass/1systems/uriel/source.nix delete mode 100644 lass/1systems/xerxes/source.nix delete mode 100644 lass/source.nix delete mode 100644 nin/1systems/axon/source.nix delete mode 100644 nin/1systems/hiawatha/source.nix delete mode 100644 nin/1systems/onondaga/source.nix delete mode 100644 nin/source.nix delete mode 100644 shell.nix delete mode 100644 tv/1systems/alnus/source.nix delete mode 100644 tv/1systems/mu/source.nix delete mode 100644 tv/1systems/nomic/source.nix delete mode 100644 tv/1systems/querel/source.nix delete mode 100644 tv/1systems/wu/source.nix delete mode 100644 tv/1systems/xu/source.nix delete mode 100644 tv/1systems/zu/source.nix delete mode 100644 tv/source.nix diff --git a/default.nix b/default.nix index cab55d40a..5ae8e399e 100644 --- a/default.nix +++ b/default.nix @@ -13,10 +13,7 @@ import { (attrNames (filterAttrs (_: eq "directory") (readDir ( + "/${ns}/1systems")))) (name: let config = import ( + "/${ns}/1systems/${name}/config.nix"); - source = import ( + "/${ns}/1systems/${name}/source.nix"); in import { modules = [ config ]; - } // { - inherit source; }); } diff --git a/jeschli/1systems/bln/source.nix b/jeschli/1systems/bln/source.nix deleted file mode 100644 index 0864fd90c..000000000 --- a/jeschli/1systems/bln/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "bln"; - secure = true; -} diff --git a/jeschli/1systems/bolide/source.nix b/jeschli/1systems/bolide/source.nix deleted file mode 100644 index 0bd7af50f..000000000 --- a/jeschli/1systems/bolide/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "bolide"; - secure = true; -} diff --git a/jeschli/1systems/brauerei/source.nix b/jeschli/1systems/brauerei/source.nix deleted file mode 100644 index 61978768e..000000000 --- a/jeschli/1systems/brauerei/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "brauerei"; - secure = true; -} diff --git a/jeschli/1systems/enklave/source.nix b/jeschli/1systems/enklave/source.nix deleted file mode 100644 index 4f9f37be7..000000000 --- a/jeschli/1systems/enklave/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "enklave"; -} diff --git a/jeschli/1systems/reagenzglas/.source.nix.swp b/jeschli/1systems/reagenzglas/.source.nix.swp deleted file mode 100644 index 8c1a75f39..000000000 Binary files a/jeschli/1systems/reagenzglas/.source.nix.swp and /dev/null differ diff --git a/jeschli/1systems/reagenzglas/source.nix b/jeschli/1systems/reagenzglas/source.nix deleted file mode 100644 index 7543de6b9..000000000 --- a/jeschli/1systems/reagenzglas/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "reagenzglas"; - secure = true; -} diff --git a/jeschli/source.nix b/jeschli/source.nix deleted file mode 100644 index fc1413ee4..000000000 --- a/jeschli/source.nix +++ /dev/null @@ -1,26 +0,0 @@ -with import ; -host@{ name, secure ? false, override ? {} }: let - builder = if getEnv "dummy_secrets" == "true" - then "buildbot" - else "jeschli"; - _file = + "/jeschli/1systems/${name}/source.nix"; - pkgs = import { - overlays = map import [ - - - ]; - }; -in - evalSource (toString _file) [ - { - nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; - nixpkgs = (import host).nixpkgs; - secrets.file = getAttr builder { - buildbot = toString ; - jeschli = "${getEnv "HOME"}/secrets/${name}"; - }; - stockholm.file = toString ; - stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; - } - override - ] diff --git a/krebs/0tests/deploy.nix b/krebs/0tests/deploy.nix index d96963500..5fae60ecc 100644 --- a/krebs/0tests/deploy.nix +++ b/krebs/0tests/deploy.nix @@ -44,11 +44,6 @@ let exec >&2 source=${pkgs.writeJSON "source.json" populate-source} LOGNAME=krebs ${pkgs.populate}/bin/populate --force root@server:22/var/src/ < "$source" - # TODO: make deploy work - #LOGNAME=krebs ${pkgs.stockholm}/bin/deploy \ - # --force-populate \ - # --source=${./data/test-source.nix} \ - # --system=server \ ''; minimalSystem = (import { modules = [ diff --git a/krebs/1systems/hotdog/source.nix b/krebs/1systems/hotdog/source.nix deleted file mode 100644 index 0fa61b20f..000000000 --- a/krebs/1systems/hotdog/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "hotdog"; -} diff --git a/krebs/1systems/onebutton/source.nix b/krebs/1systems/onebutton/source.nix deleted file mode 100644 index 91a998de7..000000000 --- a/krebs/1systems/onebutton/source.nix +++ /dev/null @@ -1,13 +0,0 @@ -with import ; -let - pkgs = import {}; - nixpkgs = builtins.fetchTarball { - url = https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz; - }; -in import { - name = "onebutton"; - override.nixpkgs = mkForce { - file = toString nixpkgs; - }; - -} diff --git a/krebs/1systems/puyak/source.nix b/krebs/1systems/puyak/source.nix deleted file mode 100644 index a21651899..000000000 --- a/krebs/1systems/puyak/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "puyak"; -} diff --git a/krebs/1systems/test-all-krebs-modules/source.nix b/krebs/1systems/test-all-krebs-modules/source.nix deleted file mode 100644 index 66fdaa773..000000000 --- a/krebs/1systems/test-all-krebs-modules/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-all-krebs-modules"; -} diff --git a/krebs/1systems/test-arch/source.nix b/krebs/1systems/test-arch/source.nix deleted file mode 100644 index bff9d4325..000000000 --- a/krebs/1systems/test-arch/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-arch"; -} diff --git a/krebs/1systems/test-centos6/source.nix b/krebs/1systems/test-centos6/source.nix deleted file mode 100644 index 3693bbb29..000000000 --- a/krebs/1systems/test-centos6/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-centos6"; -} diff --git a/krebs/1systems/test-centos7/source.nix b/krebs/1systems/test-centos7/source.nix deleted file mode 100644 index 44230f08d..000000000 --- a/krebs/1systems/test-centos7/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-centos7"; -} diff --git a/krebs/1systems/test-failing/source.nix b/krebs/1systems/test-failing/source.nix deleted file mode 100644 index 60b77a0a0..000000000 --- a/krebs/1systems/test-failing/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-failing"; -} diff --git a/krebs/1systems/test-minimal-deploy/source.nix b/krebs/1systems/test-minimal-deploy/source.nix deleted file mode 100644 index 032ab12bb..000000000 --- a/krebs/1systems/test-minimal-deploy/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-minimal-deploy"; -} diff --git a/krebs/1systems/wolf/source.nix b/krebs/1systems/wolf/source.nix deleted file mode 100644 index c292bfa62..000000000 --- a/krebs/1systems/wolf/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "wolf"; -} diff --git a/krebs/5pkgs/simple/stockholm/default.nix b/krebs/5pkgs/simple/stockholm/default.nix deleted file mode 100644 index c973386d6..000000000 --- a/krebs/5pkgs/simple/stockholm/default.nix +++ /dev/null @@ -1,230 +0,0 @@ -{ pkgs }: let - - stockholm-dir = ../../../..; - - lib = import (stockholm-dir + "/lib"); - - # - # high level commands - # - - cmds.deploy = pkgs.withGetopt { - force-populate = { default = /* sh */ "false"; switch = true; }; - quiet = { default = /* sh */ "false"; switch = true; }; - source_file = { - default = /* sh */ "$user/1systems/$system/source.nix"; - long = "source"; - }; - system = {}; - target.default = /* sh */ "$system"; - user.default = /* sh */ "$LOGNAME"; - } (opts: pkgs.writeDash "stockholm.deploy" '' - set -efu - - . ${init.env} - . ${init.proxy "deploy" opts} - - # Use system's nixos-rebuild, which is not self-contained - export PATH=/run/current-system/sw/bin - exec ${utils.with-whatsupnix} \ - nixos-rebuild switch \ - --show-trace \ - -I "$target_path" - ''); - - cmds.get-version = pkgs.writeDash "get-version" '' - set -efu - hostname=''${HOSTNAME-$(${pkgs.nettools}/bin/hostname)} - version=git.$(${pkgs.git}/bin/git describe --always --dirty) - case $version in (*-dirty) - version=$version@$hostname - esac - date=$(${pkgs.coreutils}/bin/date +%y.%m) - echo "$date.$version" - ''; - - cmds.install = pkgs.withGetopt { - force-populate = { default = /* sh */ "false"; switch = true; }; - quiet = { default = /* sh */ "false"; switch = true; }; - source_file = { - default = /* sh */ "$user/1systems/$system/source.nix"; - long = "source"; - }; - system = {}; - target = {}; - user.default = /* sh */ "$LOGNAME"; - } (opts: pkgs.writeBash "stockholm.install" '' - set -efu - - . ${init.env} - - if \test "''${using_proxy-}" != true; then - ${pkgs.openssh}/bin/ssh \ - -o StrictHostKeyChecking=no \ - -o UserKnownHostsFile=/dev/null \ - "$target_user@$target_host" -p "$target_port" \ - env target_path=$(${pkgs.quote}/bin/quote "$target_path") \ - sh -s prepare \ - < ${stockholm-dir + "/krebs/4lib/infest/prepare.sh"} - # TODO inline prepare.sh? - fi - - . ${init.proxy "install" opts} - - # these variables get defined by nix-shell (i.e. nix-build) from - # XDG_RUNTIME_DIR and reference the wrong directory (/run/user/0), - # which only exists on / and not at /mnt. - export NIX_BUILD_TOP=/tmp - export TEMPDIR=/tmp - export TEMP=/tmp - export TMPDIR=/tmp - export TMP=/tmp - export XDG_RUNTIME_DIR=/tmp - - export NIXOS_CONFIG="$target_path/nixos-config" - - cd - exec nixos-install - ''); - - cmds.test = pkgs.withGetopt { - force-populate = { default = /* sh */ "false"; switch = true; }; - quiet = { default = /* sh */ "false"; switch = true; }; - source_file = { - default = /* sh */ "$user/1systems/$system/source.nix"; - long = "source"; - }; - system = {}; - target = {}; - user.default = /* sh */ "$LOGNAME"; - } (opts: pkgs.writeDash "stockholm.test" /* sh */ '' - set -efu - - export dummy_secrets=true - - . ${init.env} - . ${init.proxy "test" opts} - - exec ${utils.build} config.system.build.toplevel - ''); - - # - # low level commands - # - - # usage: get-source SOURCE_FILE - cmds.get-source = pkgs.writeDash "stockholm.get-source" '' - set -efu - exec ${pkgs.nix}/bin/nix-instantiate \ - --eval \ - --json \ - --readonly-mode \ - --show-trace \ - --strict \ - "$1" - ''; - - # usage: parse-target [--default=TARGET] TARGET - # TARGET = [USER@]HOST[:PORT][/PATH] - cmds.parse-target = pkgs.withGetopt { - default_target = { - long = "default"; - short = "d"; - }; - } (opts: pkgs.writeDash "stockholm.parse-target" '' - set -efu - target=$1; shift - for arg; do echo "$0: bad argument: $arg" >&2; done - if \test $# != 0; then exit 2; fi - exec ${pkgs.jq}/bin/jq \ - -enr \ - --arg default_target "$default_target" \ - --arg target "$target" \ - -f ${pkgs.writeText "stockholm.parse-target.jq" '' - def parse: match("^(?:([^@]+)@)?([^:/]+)?(?::([0-9]+))?(/.*)?$") | { - user: .captures[0].string, - host: .captures[1].string, - port: .captures[2].string, - path: .captures[3].string, - }; - def sanitize: with_entries(select(.value != null)); - ($default_target | parse) + ($target | parse | sanitize) | - . + { local: (.user == env.LOGNAME and .host == env.HOSTNAME) } - ''} - ''); - - init.env = pkgs.writeText "init.env" /* sh */ '' - - export HOSTNAME="$(${pkgs.nettools}/bin/hostname)" - - export quiet - export system - export target - export user - - default_target=root@$system:22/var/src - - export target_object="$( - ${cmds.parse-target} "$target" -d "$default_target" - )" - export target_user="$(echo $target_object | ${pkgs.jq}/bin/jq -r .user)" - export target_host="$(echo $target_object | ${pkgs.jq}/bin/jq -r .host)" - export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)" - export target_path="$(echo $target_object | ${pkgs.jq}/bin/jq -r .path)" - export target_local="$(echo $target_object | ${pkgs.jq}/bin/jq -r .local)" - ''; - - init.proxy = command: opts: pkgs.writeText "init.proxy" /* sh */ '' - if \test "''${using_proxy-}" != true; then - - source=$(${cmds.get-source} "$source_file") - qualified_target=$target_user@$target_host:$target_port$target_path - if \test "$force_populate" = true; then - echo "$source" | ${pkgs.populate}/bin/populate --force "$qualified_target" - else - echo "$source" | ${pkgs.populate}/bin/populate "$qualified_target" - fi - - if \test "$target_local" != true; then - exec ${pkgs.openssh}/bin/ssh \ - "$target_user@$target_host" -p "$target_port" \ - cd "$target_path/stockholm" \; \ - NIX_PATH=$(${pkgs.quote}/bin/quote "$target_path") \ - nix-shell --run "$(${pkgs.quote}/bin/quote " - ${lib.concatStringsSep " " (lib.mapAttrsToList - (name: opt: /* sh */ - "${opt.varname}=\$(${pkgs.quote}/bin/quote ${opt.ref})") - opts - )} \ - using_proxy=true \ - ${lib.shell.escape command} \ - $WITHGETOPT_ORIG_ARGS \ - ")" - fi - fi - ''; - - utils.build = pkgs.writeDash "utils.build" '' - set -efu - ${utils.with-whatsupnix} \ - ${pkgs.nix}/bin/nix-build \ - --no-out-link \ - --show-trace \ - -E "with import ; $1" \ - -I "$target_path" \ - ''; - - utils.with-whatsupnix = pkgs.writeDash "utils.with-whatsupnix" '' - set -efu - if \test "$quiet" = true; then - "$@" -Q 2>&1 | ${pkgs.whatsupnix}/bin/whatsupnix - else - exec "$@" - fi - ''; - -in - - pkgs.write "stockholm" (lib.mapAttrs' (name: link: - lib.nameValuePair "/bin/${name}" { inherit link; } - ) cmds) diff --git a/krebs/source.nix b/krebs/source.nix deleted file mode 100644 index 5b86e89c6..000000000 --- a/krebs/source.nix +++ /dev/null @@ -1,29 +0,0 @@ -with import ; -host@{ name, secure ? false, override ? {} }: let - builder = if getEnv "dummy_secrets" == "true" - then "buildbot" - else "krebs"; - _file = + "/krebs/1systems/${name}/source.nix"; - pkgs = import { - overlays = map import [ - - - ]; - }; -in - evalSource (toString _file) [ - { - nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix"; - secrets = getAttr builder { - buildbot.file = toString ; - krebs.pass = { - dir = "${getEnv "HOME"}/brain"; - name = "krebs-secrets/${name}"; - }; - }; - stockholm.file = toString ; - stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; - nixpkgs = (import ./krops.nix { name = ""; }).krebs-source.nixpkgs; - } - override - ] diff --git a/lass/1systems/blue/source.nix b/lass/1systems/blue/source.nix deleted file mode 100644 index d8b979812..000000000 --- a/lass/1systems/blue/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "blue"; - secure = true; -} diff --git a/lass/1systems/cabal/source.nix b/lass/1systems/cabal/source.nix deleted file mode 100644 index 5d9507f3d..000000000 --- a/lass/1systems/cabal/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "cabal"; - secure = true; -} diff --git a/lass/1systems/daedalus/source.nix b/lass/1systems/daedalus/source.nix deleted file mode 100644 index a15ac80c2..000000000 --- a/lass/1systems/daedalus/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "daedalus"; - secure = true; -} diff --git a/lass/1systems/icarus/source.nix b/lass/1systems/icarus/source.nix deleted file mode 100644 index 5b46a44f3..000000000 --- a/lass/1systems/icarus/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "icarus"; - secure = true; -} diff --git a/lass/1systems/littleT/source.nix b/lass/1systems/littleT/source.nix deleted file mode 100644 index a86b8fd10..000000000 --- a/lass/1systems/littleT/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "littleT"; - secure = true; -} diff --git a/lass/1systems/mors/source.nix b/lass/1systems/mors/source.nix deleted file mode 100644 index a9dfa2eb6..000000000 --- a/lass/1systems/mors/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "mors"; - secure = true; -} diff --git a/lass/1systems/prism/source.nix b/lass/1systems/prism/source.nix deleted file mode 100644 index 3dbd6c52b..000000000 --- a/lass/1systems/prism/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -with import ; -import { - name = "prism"; -} diff --git a/lass/1systems/red/source.nix b/lass/1systems/red/source.nix deleted file mode 100644 index f2bad743c..000000000 --- a/lass/1systems/red/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "red"; - secure = true; -} diff --git a/lass/1systems/shodan/source.nix b/lass/1systems/shodan/source.nix deleted file mode 100644 index be24ae2d5..000000000 --- a/lass/1systems/shodan/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "shodan"; -} diff --git a/lass/1systems/skynet/source.nix b/lass/1systems/skynet/source.nix deleted file mode 100644 index 2aa627f5c..000000000 --- a/lass/1systems/skynet/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "skynet"; - secure = true; -} diff --git a/lass/1systems/uriel/source.nix b/lass/1systems/uriel/source.nix deleted file mode 100644 index 11d6e1c34..000000000 --- a/lass/1systems/uriel/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "uriel"; -} diff --git a/lass/1systems/xerxes/source.nix b/lass/1systems/xerxes/source.nix deleted file mode 100644 index d256b885b..000000000 --- a/lass/1systems/xerxes/source.nix +++ /dev/null @@ -1,5 +0,0 @@ -with import ; -import { - name = "xerxes"; - secure = true; -} diff --git a/lass/source.nix b/lass/source.nix deleted file mode 100644 index 49f919faf..000000000 --- a/lass/source.nix +++ /dev/null @@ -1,29 +0,0 @@ -with import ; -host@{ name, secure ? false, override ? {} }: let - builder = if getEnv "dummy_secrets" == "true" - then "buildbot" - else "lass"; - _file = + "/lass/1systems/${name}/source.nix"; - pkgs = import { - overlays = map import [ - - - ]; - }; -in - evalSource (toString _file) [ - { - nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix"; - nixpkgs = (import host).nixpkgs; - secrets = getAttr builder { - buildbot.file = toString ; - lass.pass = { - dir = "${getEnv "HOME"}/.password-store"; - name = "hosts/${name}"; - }; - }; - stockholm.file = toString ; - stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; - } - override - ] diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index b652241bd..0de65cceb 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -20,7 +20,6 @@ brain gen-oath-safe cdrtools - stockholm # nix related nix-repl nix-index diff --git a/makefu/source.nix b/makefu/source.nix index 82a41886b..c350fe72c 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -57,7 +57,7 @@ in stockholm.file = toString ; - stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; + stockholm-version.pipe = "${pkgs.coreutils}/bin/echo derp"; } (mkIf ( musnix ) { musnix.git = { diff --git a/nin/1systems/axon/source.nix b/nin/1systems/axon/source.nix deleted file mode 100644 index 6a40296da..000000000 --- a/nin/1systems/axon/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "axon"; - secure = true; -} diff --git a/nin/1systems/hiawatha/source.nix b/nin/1systems/hiawatha/source.nix deleted file mode 100644 index a4b366b9c..000000000 --- a/nin/1systems/hiawatha/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "hiawatha"; - secure = true; -} diff --git a/nin/1systems/onondaga/source.nix b/nin/1systems/onondaga/source.nix deleted file mode 100644 index 60d020222..000000000 --- a/nin/1systems/onondaga/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "onondaga"; - secure = true; -} diff --git a/nin/source.nix b/nin/source.nix deleted file mode 100644 index a4bf0a98c..000000000 --- a/nin/source.nix +++ /dev/null @@ -1,23 +0,0 @@ -with import ; -host@{ name, secure ? false }: let - builder = if getEnv "dummy_secrets" == "true" - then "buildbot" - else "nin"; - _file = + "/nin/1systems/${name}/source.nix"; - pkgs = import { - overlays = map import [ - - - ]; - }; -in - evalSource (toString _file) { - nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix"; - secrets.file = getAttr builder { - buildbot = toString ; - nin = "/home/nin/secrets/${name}"; - }; - stockholm.file = toString ; - stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; - nixpkgs = (import host).nixpkgs; - } diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 3695ed3ac..000000000 --- a/shell.nix +++ /dev/null @@ -1,38 +0,0 @@ -let - lib = import ./lib; - pkgs = import { - overlays = [ - (import ./krebs/5pkgs) - (import ./submodules/nix-writers/pkgs) - ]; - }; - -in pkgs.stdenv.mkDerivation { - name = "stockholm"; - shellHook = /* sh */ '' - export NIX_PATH=stockholm=${toString ./.}:nixpkgs=${toString } - if test -e /nix/var/nix/daemon-socket/socket; then - export NIX_REMOTE=daemon - fi - export PATH=${lib.makeBinPath [ - pkgs.stockholm - ]}''${PATH+:$PATH} - - eval "$(declare -F | ${pkgs.gnused}/bin/sed s/declare/unset/)" - shopt -u no_empty_cmd_completion - unalias -a - - enable -n \ - . [ alias bg bind break builtin caller cd command compgen complete \ - compopt continue dirs disown eval exec false fc fg getopts hash \ - help history jobs kill let local logout mapfile popd printf pushd \ - pwd read readarray readonly shift source suspend test times trap \ - true typeset ulimit umask unalias wait - - exitHandler() { - : - } - - PS1='\[\e[38;5;162m\]\w\[\e[0m\] ' - ''; -} diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix deleted file mode 100644 index 9fd2f668c..000000000 --- a/tv/1systems/alnus/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "alnus"; - override.nixpkgs.git.ref = "d0f0657ca06cc8cb239cb94f430b53bcdf755887"; -} diff --git a/tv/1systems/mu/source.nix b/tv/1systems/mu/source.nix deleted file mode 100644 index 7e148cf36..000000000 --- a/tv/1systems/mu/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "mu"; -} diff --git a/tv/1systems/nomic/source.nix b/tv/1systems/nomic/source.nix deleted file mode 100644 index f173b65a6..000000000 --- a/tv/1systems/nomic/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "nomic"; - secure = true; -} diff --git a/tv/1systems/querel/source.nix b/tv/1systems/querel/source.nix deleted file mode 100644 index 74eab51e4..000000000 --- a/tv/1systems/querel/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "querel"; -} diff --git a/tv/1systems/wu/source.nix b/tv/1systems/wu/source.nix deleted file mode 100644 index 2e9cdeb8a..000000000 --- a/tv/1systems/wu/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "wu"; - secure = true; -} diff --git a/tv/1systems/xu/source.nix b/tv/1systems/xu/source.nix deleted file mode 100644 index 46e1aee90..000000000 --- a/tv/1systems/xu/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "xu"; - secure = true; -} diff --git a/tv/1systems/zu/source.nix b/tv/1systems/zu/source.nix deleted file mode 100644 index 7a5c4f523..000000000 --- a/tv/1systems/zu/source.nix +++ /dev/null @@ -1,4 +0,0 @@ -import { - name = "zu"; - secure = true; -} diff --git a/tv/source.nix b/tv/source.nix deleted file mode 100644 index c0df06567..000000000 --- a/tv/source.nix +++ /dev/null @@ -1,37 +0,0 @@ -with import ; -{ name -, dummy_secrets ? getEnv "dummy_secrets" == "true" -, override ? {} -, secure ? false -}@host: let - builder = if dummy_secrets then "buildbot" else "tv"; - _file = + "/tv/1systems/${name}/source.nix"; - pkgs = import { - overlays = map import [ - - - ]; - }; -in - evalSource (toString _file) [ - { - nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; - nixpkgs.git = { - ref = mkDefault "7cbf6ca1c84dfc917c1a99524e082fb677501844"; - url = https://github.com/NixOS/nixpkgs; - }; - secrets.file = getAttr builder { - buildbot = toString ; - tv = "/home/tv/secrets/${name}"; - }; - stockholm.file = toString ; - stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; - } - (mkIf (builder == "tv") { - secrets-common.file = "/home/tv/secrets/common"; - }) - (mkIf (builder == "tv" && secure) { - secrets-master.file = "/home/tv/secrets/master"; - }) - override - ] -- cgit v1.2.3 From ca2477ab3a4dbe392e8b9e6614540c4b089ade82 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 11 Sep 2018 20:18:01 +0200 Subject: krebs krops: cd to proper stockholm directory --- krebs/krops.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/krops.nix b/krebs/krops.nix index 5378d6fb0..e5013ad08 100644 --- a/krebs/krops.nix +++ b/krebs/krops.nix @@ -18,7 +18,7 @@ stockholm.file = toString ../.; stockholm-version.pipe = toString (pkgs.writeDash "${name}-version" '' set -efu - cd $HOME/stockholm + cd ${lib.escapeShellArg krebs-source.stockholm.file} V=$(${pkgs.coreutils}/bin/date +%y.%m) if test -d .git; then V=$V.git.$(${pkgs.git}/bin/git describe --always --dirty) -- cgit v1.2.3