chore(users/multi): remove user from the depot.

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>
This commit is contained in:
multi 2021-01-23 18:17:10 +00:00
parent 81d5571398
commit 4ac51ea504
12 changed files with 1 additions and 218 deletions

View file

@ -175,8 +175,7 @@ in lib.fix(self: {
keys = with depot.users; keys = with depot.users;
tazjin.keys.all tazjin.keys.all
++ lukegb.keys.all ++ lukegb.keys.all
++ [ glittershark.keys.whitby ] ++ [ glittershark.keys.whitby ];
++ multi.keys.whitbyNix;
}; };
}; };
@ -414,12 +413,6 @@ in lib.fix(self: {
openssh.authorizedKeys.keys = depot.users.qyliss.keys.all; openssh.authorizedKeys.keys = depot.users.qyliss.keys.all;
}; };
users.multi = {
isNormalUser = true;
extraGroups = [ "git" ];
openssh.authorizedKeys.keys = depot.users.multi.keys.whitbyLogin;
};
users.eta = { users.eta = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "git" ]; extraGroups = [ "git" ];

View file

@ -66,11 +66,6 @@
email = "lukegb@tvl.fyi"; email = "lukegb@tvl.fyi";
password = "{SSHA}7a85VNhpFElFw+N5xcjgGmt4HnBsaGp4"; 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"; username = "nyanotech";
email = "nyanotechnology@gmail.com"; email = "nyanotechnology@gmail.com";

View file

@ -1,3 +0,0 @@
inherited: false
owners:
- multi

View file

@ -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";
}

View file

@ -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" ];
}

View file

@ -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;
}

View file

@ -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

View file

@ -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;
}

View file

@ -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;
})

View file

@ -38,7 +38,6 @@ digraph tvl {
lukegb [href="https://lukegb.com/"]; lukegb [href="https://lukegb.com/"];
marcusr [href="http://marcus.nordaaker.com/"]; marcusr [href="http://marcus.nordaaker.com/"];
maskerad [href="https://femalelegends.com/"]; maskerad [href="https://femalelegends.com/"];
multi [href="https://1.0.168.192.in-addr.xyz/"];
ncl; ncl;
nikky [href="http://nikky.moe/"]; nikky [href="http://nikky.moe/"];
nyanotech [href="https://twitter.com/nyanotech"]; nyanotech [href="https://twitter.com/nyanotech"];
@ -102,7 +101,6 @@ digraph tvl {
espes -> edef; espes -> edef;
firefly -> edef; firefly -> edef;
leah2 -> aurora; leah2 -> aurora;
multi -> edef;
ncl -> edef; ncl -> edef;
puck -> edef; puck -> edef;
qyliss -> edef; qyliss -> edef;
@ -125,7 +123,6 @@ digraph tvl {
urbint -> wpcarro; urbint -> wpcarro;
camsbury -> wpcarro; camsbury -> wpcarro;
anon1 -> google; anon1 -> google;
aranea -> multi;
artemist -> cynthia; artemist -> cynthia;
aurora -> eve; aurora -> eve;
cynthia -> benjojo; cynthia -> benjojo;
@ -155,7 +152,6 @@ digraph tvl {
artemist -> lgbtslack; artemist -> lgbtslack;
// ircv3 // ircv3
multi -> ircv3;
eta -> ircv3; eta -> ircv3;
firefly -> ircv3; firefly -> ircv3;
@ -165,7 +161,6 @@ digraph tvl {
// random // random
leah2 -> edef; leah2 -> edef;
lukegb -> isomer; lukegb -> isomer;
eta -> multi;
eta -> firefly; eta -> firefly;
cynthia -> firefly; cynthia -> firefly;
cynthia -> lukegb; cynthia -> lukegb;
@ -173,7 +168,6 @@ digraph tvl {
kanepyork -> google; kanepyork -> google;
nyanotech -> google; nyanotech -> google;
lukegb -> benjojo; lukegb -> benjojo;
multi -> benjojo;
espes -> benjojo; espes -> benjojo;
espes -> aurora; espes -> aurora;
puck -> nix; puck -> nix;