From 619a864e92fa89890e4e1676af3d3be9d4519ece Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 11 Sep 2018 18:49:19 +0200 Subject: shell.nix: RIP --- 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 ------------------ 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 -------------------------- 20 files changed, 181 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 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/jeschli/1systems/bln/source.nix b/jeschli/1systems/bln/source.nix deleted file mode 100644 index 0864fd9..0000000 --- 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 0bd7af5..0000000 --- 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 6197876..0000000 --- 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 4f9f37b..0000000 --- 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 8c1a75f..0000000 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 7543de6..0000000 --- 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 fc1413e..0000000 --- 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/nin/1systems/axon/source.nix b/nin/1systems/axon/source.nix deleted file mode 100644 index 6a40296..0000000 --- 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 a4b366b..0000000 --- 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 60d0202..0000000 --- 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 a4bf0a9..0000000 --- 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 3695ed3..0000000 --- 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 9fd2f66..0000000 --- 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 7e148cf..0000000 --- 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 f173b65..0000000 --- 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 74eab51..0000000 --- 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 2e9cdeb..0000000 --- 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 46e1aee..0000000 --- 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 7a5c4f5..0000000 --- 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 c0df065..0000000 --- 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 85974cbe74ebf01d75fd3d93233870baa0dead32 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 16 Sep 2018 21:31:14 +0200 Subject: tv mu: import --- tv/1systems/mu/config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 6c22971..014d144 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -2,9 +2,7 @@ with import ; { config, pkgs, ... }: { imports = [ - - - + ]; -- cgit v1.2.3 From 5596dcc76837d3f36a946ea6c54d3a95daa6da69 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 16 Sep 2018 22:02:16 +0200 Subject: tv mu: add plasma-pa --- tv/1systems/mu/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 014d144..f513665 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -55,6 +55,7 @@ with import ; gimp iptables libreoffice + plasma-pa (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) -- cgit v1.2.3