about summary refs log tree commit diff
diff options
context:
space:
mode:
authormulti <depot@in-addr.xyz>2021-01-23T18·17+0000
committermulti <depot@in-addr.xyz>2021-01-23T21·13+0000
commit4ac51ea504bd472aae396d42506e11ce32fdcdd0 (patch)
treecb782c49e30d6839e59d05b7a5bdd36e6b9bb5c7
parent81d55713987dd3b78786132434f0673cfb83ae3e (diff)
chore(users/multi): remove user from the depot. r/2140
This commit removes my user directory in the depot, my user account on whitby,
my entry in the LDAP database, and my entry in the website graph. I've had my
fun with TVL, but I want to move on to spending time on some other things.

This additionally removes aranea from the website graph, which they have
requested in private.

Change-Id: I2d098c8fe239f20d9f6c6cbf66a3dfb4a955a4cf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2436
Tested-by: BuildkiteCI
Reviewed-by: multi <depot@in-addr.xyz>
Reviewed-by: lukegb <lukegb@tvl.fyi>
-rw-r--r--ops/nixos/whitby/default.nix9
-rw-r--r--ops/users/default.nix5
-rw-r--r--users/multi/OWNERS3
-rw-r--r--users/multi/home/.skip-subtree0
-rw-r--r--users/multi/home/configs/whitby.nix109
-rw-r--r--users/multi/home/default.nix27
-rw-r--r--users/multi/home/home-manager.nix10
-rw-r--r--users/multi/keys.nix18
-rw-r--r--users/multi/pkgs/.skip-subtree0
-rw-r--r--users/multi/pkgs/default.nix13
-rw-r--r--users/multi/pkgs/htop/default.nix19
-rw-r--r--web/tvl/tvl.dot6
12 files changed, 1 insertions, 218 deletions
diff --git a/ops/nixos/whitby/default.nix b/ops/nixos/whitby/default.nix
index 2f22253aa551..e839b8d077c4 100644
--- a/ops/nixos/whitby/default.nix
+++ b/ops/nixos/whitby/default.nix
@@ -175,8 +175,7 @@ in lib.fix(self: {
       keys = with depot.users;
         tazjin.keys.all
         ++ lukegb.keys.all
-        ++ [ glittershark.keys.whitby ]
-        ++ multi.keys.whitbyNix;
+        ++ [ glittershark.keys.whitby ];
     };
   };
 
@@ -414,12 +413,6 @@ in lib.fix(self: {
       openssh.authorizedKeys.keys = depot.users.qyliss.keys.all;
     };
 
-    users.multi = {
-      isNormalUser = true;
-      extraGroups = [ "git" ];
-      openssh.authorizedKeys.keys = depot.users.multi.keys.whitbyLogin;
-    };
-
     users.eta = {
       isNormalUser = true;
       extraGroups = [ "git" ];
diff --git a/ops/users/default.nix b/ops/users/default.nix
index 43d5475bc3d6..da5c1eb61b15 100644
--- a/ops/users/default.nix
+++ b/ops/users/default.nix
@@ -67,11 +67,6 @@
     password = "{SSHA}7a85VNhpFElFw+N5xcjgGmt4HnBsaGp4";
   }
   {
-    username = "multi";
-    email = "depot@in-addr.xyz";
-    password = "{ARGON2}$argon2i$v=19$m=4096,t=3,p=1$qCfXhZUVft1YVPx7H4x7rw$dhtwtCrEMSpZfWQJbw2wpo5XHqiJqoZkiKeEbE6AdX0";
-  }
-  {
     username = "nyanotech";
     email = "nyanotechnology@gmail.com";
     password = "{SSHA}NIJ2RCRb1+Q4Bs63cyE91VZyiN47DG6y";
diff --git a/users/multi/OWNERS b/users/multi/OWNERS
deleted file mode 100644
index ffb57ce2d671..000000000000
--- a/users/multi/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-inherited: false
-owners:
-  - multi
diff --git a/users/multi/home/.skip-subtree b/users/multi/home/.skip-subtree
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/users/multi/home/.skip-subtree
+++ /dev/null
diff --git a/users/multi/home/configs/whitby.nix b/users/multi/home/configs/whitby.nix
deleted file mode 100644
index 3f6882a55bba..000000000000
--- a/users/multi/home/configs/whitby.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{ depot, pkgs, ... }:
-
-let
-  nixpkgs = import pkgs.nixpkgsSrc {};
-  localpkgs = depot.users.multi.pkgs;
-
-  # use the depot checkout in my home directory, to make hacking around easier,
-  # instead of the depot checkout sitting in the nix stores
-  depotPath = "/home/multi/depot";
-in
-
-{
-  programs = {
-    home-manager = {
-      enable = true;
-      path = toString nixpkgs.home-manager.src;
-    };
-
-    bash = {
-      enable = true;
-      initExtra = ''
-        PS1="[\\u@\\h:\\w"
-        if [[ -n "$IN_NIX_SHELL" ]]; then
-            PS1="$PS1 (nix-shell)]\\\$ "
-        else
-            PS1="$PS1]\\\$ "
-        fi
-
-        nix-shell() {
-            local comarg=0
-            for i in "$@"; do
-                [[ "$i" == "--command" ]] && comarg=1
-            done
-
-            if (( commarg == 0 )); then
-                command nix-shell --command bash "$@"
-            else
-                command nix-shell "$@"
-            fi
-        }
-
-        _Z_CMD=d
-        source ~/.z.sh
-      '';
-    };
-
-    readline = {
-      enable = true;
-      bindings = {
-        "\\e[5~" = "history-search-backward";
-        "\\e[6~" = "history-search-forward";
-        "\\C-w" = "\"\\e\\C-h\"";
-      };
-      includeSystemConfig = false;
-      variables = {
-        expand-tilde = true;
-        colored-stats = true;
-        page-completions = false;
-        menu-complete-display-prefix = true;
-        colored-completion-prefix = true;
-        completion-query-items = 0;
-        completion-ignore-case = true;
-        revert-all-at-newline = true;
-        show-all-if-ambiguous = true;
-        skip-completed-text = true;
-      };
-    };
-
-    tmux = {
-      enable = true;
-      terminal = "tmux-256color";
-      escapeTime = 50;
-      extraConfig = ''
-        bind-key -n C-S-Left swap-window -dt -1
-        bind-key -n C-S-Right swap-window -dt +1
-      '';
-    };
-
-    vim = {
-      enable = true;
-      extraConfig = "set mouse=";
-    };
-  };
-
-  home.sessionVariables = {
-    NIX_PATH =
-      "nixpkgs=${pkgs.nixpkgsSrc}:" +
-      "depot=${depotPath}";
-    HOME_MANAGER_CONFIG = "${depotPath}/users/multi/home/home-manager.nix";
-    EDITOR = "vim";
-  };
-
-  home.packages = [
-    nixpkgs.lsof
-    nixpkgs.strace
-    nixpkgs.file
-    nixpkgs.pciutils
-    localpkgs.htop
-  ];
-
-  home.file = {
-    z = {
-      source = builtins.fetchurl "https://raw.githubusercontent.com/rupa/z/9f76454b32c0007f20b0eae46d55d7a1488c9df9/z.sh";
-      target = ".z.sh";
-    };
-  };
-
-  home.stateVersion = "20.03";
-}
diff --git a/users/multi/home/default.nix b/users/multi/home/default.nix
deleted file mode 100644
index b5befe6bb6b8..000000000000
--- a/users/multi/home/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ depot, pkgs, lib, ... }:
-
-let
-  nixpkgs = import pkgs.nixpkgsSrc {};
-  home-modules = import "${nixpkgs.home-manager.src}/modules";
-  outerLib = lib;
-
-  home = path:
-    let 
-      configSet = import path { inherit depot pkgs; };
-    in
-      home-modules {
-        pkgs = nixpkgs;
-        configuration = { config, lib, ... }: (
-          {
-            _module.args.pkgs = outerLib.mkForce (import pkgs.nixpkgsSrc {});
-          } // configSet
-        );
-      };
-
-in
-  rec {
-    whitby = home ./configs/whitby.nix;
-    whitbyHome = whitby.activationPackage;
-
-    meta.targets = [ "whitbyHome" ];
-  }
diff --git a/users/multi/home/home-manager.nix b/users/multi/home/home-manager.nix
deleted file mode 100644
index a93a541a0840..000000000000
--- a/users/multi/home/home-manager.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-let
-  depot = import <depot> {};
-  pkgs = depot.third_party;
-
-  home = path: import path { inherit depot pkgs; };
-in
-  {
-    whitby = home ./configs/whitby.nix;
-  }
-
diff --git a/users/multi/keys.nix b/users/multi/keys.nix
deleted file mode 100644
index b2da3b6b6f2e..000000000000
--- a/users/multi/keys.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ ... }:
-
-let
-  keys = {
-    thinkpad = {
-      interactiveLogin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOtKHxl87H1RSHU7xs37PcDej+EREdPRQKuaAUfgKvLR multi@in-addr.xyz";
-      nixRemote = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG8ucz+x0K0ynQYy59u1VJbhy6SQv6wiunIKCDNwvZDr thinkpad nix";
-    };
-    yubikey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCl9/WmXJcZ1dWAHQDgjJksG2vEkeSyG+b70dLk5bb5CdytsLsv8oJYPH+g2CXkaCAPc0oGfS92KRcYk7gwNinckbNWCq5Y4rG51L92yfujoXNDuddSDtPZT1PTvPTv0YmkD9/rE4SUFuPJ/bYPBqsW40BdK3f5EbISAiKmRuulZrEl053H0aRNmNbCbK4LNDgFYO78XkCmNEDAftGu5N1zY0RbU3YBw/oDzj/zWEXmliEGrpM9CrTkPbV0+OsTWpw5QXdkMUGg/YnNgtEJpDdnE5cIo1CGoUgm/jgVzvloEwCSv/2nOczGdDSE1z7YCSxNO2vSeioFiCJlQhFOKFV88GhlnOmL0YhGCBGakRFh8Ld61urdwGGbws/9z6nRZ5eiCqPw791kz0L0rhwdD9bkYjdJopkMx2rc50nRlPZVJM6Wl5oegGsZa20v9Kw5PJQsJNyPyVMGNKaRcTylu4lNaOeyP3pd7PjbDjmtRGSptDhPuaUjJrSTRizlWZ2PIODkd9b9n5PzquI/itCPNUdA4Ofe96Xm1oLae8psTWMnxt8hraQeIJZuiLJkdonI22BEA2voMciSLyFLGc1suo9HzMkmy3eJMZktKTjD9Nib9gOTqoNQevgcmu2oa1ZJdHA5vGi/obmT820/4+67HiJbcpIGgHp5wPtWfxmwM1RiZw== cardno:000608114525";
-  };
-
-  configs = {
-    whitbyLogin = [ keys.thinkpad.interactiveLogin keys.thinkpad.nixRemote keys.yubikey ];
-    whitbyNix = [ keys.thinkpad.nixRemote ];
-  };
-
-in
-  configs
diff --git a/users/multi/pkgs/.skip-subtree b/users/multi/pkgs/.skip-subtree
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/users/multi/pkgs/.skip-subtree
+++ /dev/null
diff --git a/users/multi/pkgs/default.nix b/users/multi/pkgs/default.nix
deleted file mode 100644
index ee30a106917d..000000000000
--- a/users/multi/pkgs/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ depot, pkgs, ... }:
-
-let 
-  nixpkgs = import pkgs.nixpkgsSrc {};
-  localpkg = path: import path { pkgs = nixpkgs; };
-
-  packages = {
-    htop = localpkg ./htop;
-  };
-in
-  packages // {
-    meta.targets = builtins.attrNames packages;
-  }
diff --git a/users/multi/pkgs/htop/default.nix b/users/multi/pkgs/htop/default.nix
deleted file mode 100644
index f023410bd2a3..000000000000
--- a/users/multi/pkgs/htop/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-
-let
-  newVer = "3.0.2";
-
-  newSrc = pkgs.fetchFromGitHub {
-    owner = "htop-dev";
-    repo = "htop";
-    rev = "59ef15b2ad6037f40d7fe4207b2b59dd11b14b8b";
-    sha256 = "0sirwfvqwwq2x2k25vd4k4cf9d5qv17yjizidxq4y5xfh2v0djmd";
-  };
-in
-  with pkgs; htop.overrideAttrs
-    ({ nativeBuildInputs ? [], ... }:
-      {
-        nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook ];
-        src = newSrc;
-        version = newVer;
-      })
diff --git a/web/tvl/tvl.dot b/web/tvl/tvl.dot
index 7282298e2d20..e6a4c2d3f512 100644
--- a/web/tvl/tvl.dot
+++ b/web/tvl/tvl.dot
@@ -38,7 +38,6 @@ digraph tvl {
     lukegb [href="https://lukegb.com/"];
     marcusr [href="http://marcus.nordaaker.com/"];
     maskerad [href="https://femalelegends.com/"];
-    multi [href="https://1.0.168.192.in-addr.xyz/"];
     ncl;
     nikky [href="http://nikky.moe/"];
     nyanotech [href="https://twitter.com/nyanotech"];
@@ -102,7 +101,6 @@ digraph tvl {
     espes -> edef;
     firefly -> edef;
     leah2 -> aurora;
-    multi -> edef;
     ncl -> edef;
     puck -> edef;
     qyliss -> edef;
@@ -125,7 +123,6 @@ digraph tvl {
     urbint -> wpcarro;
     camsbury -> wpcarro;
     anon1 -> google;
-    aranea -> multi;
     artemist -> cynthia;
     aurora -> eve;
     cynthia -> benjojo;
@@ -155,7 +152,6 @@ digraph tvl {
     artemist -> lgbtslack;
 
     // ircv3
-    multi -> ircv3;
     eta -> ircv3;
     firefly -> ircv3;
 
@@ -165,7 +161,6 @@ digraph tvl {
     // random
     leah2 -> edef;
     lukegb -> isomer;
-    eta -> multi;
     eta -> firefly;
     cynthia -> firefly;
     cynthia -> lukegb;
@@ -173,7 +168,6 @@ digraph tvl {
     kanepyork -> google;
     nyanotech -> google;
     lukegb -> benjojo;
-    multi -> benjojo;
     espes -> benjojo;
     espes -> aurora;
     puck -> nix;