From 29db630a390a555bd7453280dc3f9c06b1304a62 Mon Sep 17 00:00:00 2001 From: V Date: Tue, 19 Jan 2021 10:58:40 +0100 Subject: [PATCH] chore: Remove banned user Change-Id: Icd61f7c567a327c74a4f381168e94737b2b30702 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2422 Tested-by: BuildkiteCI Reviewed-by: edef Reviewed-by: tazjin --- nix/fetchGoModule/OWNERS | 2 -- nix/fetchGoModule/default.nix | 32 ------------------- ops/nixos/whitby/default.nix | 6 ---- ops/users/default.nix | 6 ---- third_party/loxy/OWNERS | 3 -- third_party/loxy/default.nix | 31 ------------------ .../nixpkgs-exposed/exposed/default.nix | 1 - users/v/OWNERS | 3 -- users/v/keys.nix | 7 ---- web/tvl/tvl.dot | 2 -- 10 files changed, 93 deletions(-) delete mode 100644 nix/fetchGoModule/OWNERS delete mode 100644 nix/fetchGoModule/default.nix delete mode 100644 third_party/loxy/OWNERS delete mode 100644 third_party/loxy/default.nix delete mode 100644 users/v/OWNERS delete mode 100644 users/v/keys.nix diff --git a/nix/fetchGoModule/OWNERS b/nix/fetchGoModule/OWNERS deleted file mode 100644 index 47b6a0418..000000000 --- a/nix/fetchGoModule/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -owners: - - edef diff --git a/nix/fetchGoModule/default.nix b/nix/fetchGoModule/default.nix deleted file mode 100644 index 84794bbc5..000000000 --- a/nix/fetchGoModule/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, pkgs, ... }: - -let - - inherit (lib) - lowerChars - replaceStrings - upperChars - ; - - caseFold = replaceStrings upperChars (map (c: "!" + c) lowerChars); - -in - -{ path, version, sha256 }: - -pkgs.fetchurl { - name = "source"; - url = "https://proxy.golang.org/${caseFold path}/@v/v${version}.zip"; - inherit sha256; - - recursiveHash = true; - downloadToTemp = true; - - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - - ${pkgs.unzip}/bin/unzip "$downloadedFile" -d "$unpackDir" - mv "$unpackDir/${path}@v${version}" "$out" - ''; -} diff --git a/ops/nixos/whitby/default.nix b/ops/nixos/whitby/default.nix index 543a1fe2d..2f22253aa 100644 --- a/ops/nixos/whitby/default.nix +++ b/ops/nixos/whitby/default.nix @@ -426,12 +426,6 @@ in lib.fix(self: { openssh.authorizedKeys.keys = depot.users.eta.keys.whitby; }; - users.v = { - isNormalUser = true; # Questionable... - extraGroups = [ "git" ]; - openssh.authorizedKeys.keys = depot.users.v.keys.whitby; - }; - users.cynthia = { isNormalUser = true; # I'm normal OwO :3 extraGroups = [ "git" ]; diff --git a/ops/users/default.nix b/ops/users/default.nix index 87ce7e2e8..43d5475bc 100644 --- a/ops/users/default.nix +++ b/ops/users/default.nix @@ -113,12 +113,6 @@ email = "implr@hackerspace.pl"; password = "{ARGON2}$argon2id$v=19$m=65536,t=2,p=1$SHRFps5sVgyUXYdmqGPw9g$tEx9DwKK1RjWlw52GLwOZ/iHep+QJboaZE83f1pXSwQ"; } - { - username = "v"; - displayName = "V"; - email = "v@anomalous.eu"; - password = "{ARGON2}$argon2id$v=19$m=65536,t=2,p=1$Wa11vk3gQKhJr1uzvtRTRQ$RHfvcC2j6rDUgWfezm05N03LeGIEezeKtmFmt+rfvM4"; - } { username = "ben"; email = "tvl@benjojo.co.uk"; diff --git a/third_party/loxy/OWNERS b/third_party/loxy/OWNERS deleted file mode 100644 index 51102bf87..000000000 --- a/third_party/loxy/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -owners: - - v - - edef diff --git a/third_party/loxy/default.nix b/third_party/loxy/default.nix deleted file mode 100644 index d1399f3ea..000000000 --- a/third_party/loxy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, pkgs, depot, ... }: - -let - - inherit (depot.nix) fetchGoModule; - -in - -pkgs.buildGoModule rec { - pname = "loxy"; - version = "0.1.1"; - - src = fetchGoModule { - path = "go.anomalous.eu/loxy"; - inherit version; - sha256 = "0k1i7wa0v9h7r4kb7pjd3pzvcjrnsp58cfh51z73s74il7462sr5"; - }; - - vendorSha256 = "0243wq6crzy86vc5cm1nijddsrcllr3c66xkd6q8x16jrvnv09jx"; - - postInstall = '' - install -D -m 0644 -t $out/share/man/man8 loxy.8 - ''; - - meta = with lib; { - description = "a logging IRC proxy"; - homepage = "https://anomalous.eu/projects/loxy"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ V edef ]; - }; -} diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix index 32630ca6e..b24f134bc 100644 --- a/third_party/nixpkgs-exposed/exposed/default.nix +++ b/third_party/nixpkgs-exposed/exposed/default.nix @@ -131,7 +131,6 @@ thttpd tree tree-sitter - unzip which writers writeShellScript diff --git a/users/v/OWNERS b/users/v/OWNERS deleted file mode 100644 index 184107fbc..000000000 --- a/users/v/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -inherited: false -owners: - - v diff --git a/users/v/keys.nix b/users/v/keys.nix deleted file mode 100644 index 45f53f345..000000000 --- a/users/v/keys.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - whitby = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKPY9bqtJ1AV+3/2DId2/p1jg4FQi1EHvEkVrfNdfhwq v@february" - ]; -} diff --git a/web/tvl/tvl.dot b/web/tvl/tvl.dot index 64d2e0597..7282298e2 100644 --- a/web/tvl/tvl.dot +++ b/web/tvl/tvl.dot @@ -50,7 +50,6 @@ digraph tvl { seven [href="https://open.spotify.com/user/so7"]; spacekookie [href="https://spacekookie.de/"]; tazjin [href="https://tazj.in/"]; - V [href="https://anomalous.eu/"]; wpcarro [href="https://wpcarro.dev/"]; } @@ -143,7 +142,6 @@ digraph tvl { afra -> unspecific; nikky -> afra; spacekookie -> qyliss; - V -> unspecific; } // secondary edges (how are they connected otherwise?)