From aa2313b2b0e4719d1d7b8d740d887229b1a58aad Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 13 Jun 2021 20:37:12 +0200
Subject: [PATCH 1/6] nixpkgs: 60cce7e -> 1f91fd1
---
krebs/nixpkgs.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 18e9ecd83..429c23cf5 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "60cce7e5e1fdf62421ef6d4184ee399b46209366",
- "date": "2021-06-09T01:18:50-04:00",
- "path": "/nix/store/fixgn194626rb7gf99l9jaqm0hbqn2ix-nixpkgs",
- "sha256": "100xrb925cana1kfd0c7gwkjjalq891vfgr0rn1gl9j8gp3l3gx6",
+ "rev": "1f91fd1040667e9265a760b0347f8bc416249da7",
+ "date": "2021-06-13T11:32:41+02:00",
+ "path": "/nix/store/8cx16mc5cymv2ll52fs831lmd4ljzmq1-nixpkgs",
+ "sha256": "1lcfcwgal9fpaiq71981abyzz160r6nx1y4pyy1dnvaf951xkdcj",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
From c9446cda601c534755470cc2940a1d981b135e03 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 14 Jun 2021 14:44:59 +0200
Subject: [PATCH 2/6] brockman: 3.4.3 -> 3.4.5
---
krebs/5pkgs/haskell/brockman/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index d0cd6119e..ef9f36217 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -7,12 +7,12 @@
}:
mkDerivation rec {
pname = "brockman";
- version = "3.4.3";
+ version = "3.4.5";
src = fetchFromGitHub {
owner = "kmein";
repo = "brockman";
rev = version;
- sha256 = "0s8rvsj5m70wijl8j00fisz6c1kms7kx12lxfgk63mrx2ldp1fb4";
+ sha256 = "1q56ibgijcz6fgd60h0d1f2020l4n2i2nh98yaq95zhzwg0qsciy";
};
isLibrary = false;
isExecutable = true;
From 1fc23b6f7724e62f414949fe2ffdbdae19ab9eac Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Jun 2021 17:49:41 +0200
Subject: [PATCH 3/6] krebs: init neos, add ssh key to shack infra managers
---
krebs/2configs/shack/ssh-keys.nix | 7 ++++---
krebs/3modules/external/default.nix | 4 ++++
krebs/3modules/external/ssh/neos.pub | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 krebs/3modules/external/ssh/neos.pub
diff --git a/krebs/2configs/shack/ssh-keys.nix b/krebs/2configs/shack/ssh-keys.nix
index f27b5bbc3..50bb93809 100644
--- a/krebs/2configs/shack/ssh-keys.nix
+++ b/krebs/2configs/shack/ssh-keys.nix
@@ -2,10 +2,11 @@
{
users.users.root.openssh.authorizedKeys.keys = [
config.krebs.users."0x4A6F".pubkey
- config.krebs.users.ulrich.pubkey
- config.krebs.users.raute.pubkey
- config.krebs.users.xq.pubkey
config.krebs.users.hase.pubkey
+ config.krebs.users.neos.pubkey
+ config.krebs.users.raute.pubkey
+ config.krebs.users.ulrich.pubkey
+ config.krebs.users.xq.pubkey
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDb9NPa2Hf51afcG1H13UPbE5E02J8aC9a1sGCRls592wAVlQbmojYR1jWDPA2m32Bsyv0ztqi81zDyndWWZPQVJVBk00VjYBcgk6D5ifqoAuWLzfuHJPWZGOvBf/U74/LNFNUkj1ywjneK7HYTRPXrRBBfBSQNmQzkvue7s599L2vdueZKyjNsMpx2m6nm2SchaMuDskSQut/168JgU1l4M8BeT68Bo4WdelhBYnhSI1a59FGkgdu2SCjyighLQRy2sOH3ksnkHWENPkA+wwQOlKl7R3DsEybrNd4NU9FSwFDyDmdhfv5gJp8UGSFdjAwx43+8zM5t5ruZ25J0LnVb0PuTuRA00UsW83MkLxFpDQLrQV08tlsY6iGrqxP67C3VJ6t4v6oTp7/vaRLhEFc1PhOLh+sZ18o8MLO+e2rGmHGHQnSKfBOLUvDMGa4jb01XBGjdnIXLOkVo79YR5jZn7jJb2gTZ95OD6bWSDADoURSuwuLa7kh4ti1ItAKuhkIvbuky3rRVvQEc92kJ6aNUswIUXJa0K2ibbIY6ycKAA3Ljksl3Mm9KzOn6yc/i/lSF+SOrTGhabPJigKkIoqKIwnV5IU3gkfsxPQJOBMPqHDGAOeYQe3WpWedEPYuhQEczw4exMb9TkNE96F71PzuQPJDl5sPAWyPLeMKpy5XbfRiF2by4nxN3ZIQvjtoyVkjNV+qM0q0yKBzLxuRAEQOZ2yCEaBudZQkQiwHD97H2vu4SRQ/2aOie1XiOnmdbQRDZSO3BsoDK569K1w+gDfSnqY7zVUMj6tw+uKx6Gstck5lbvYMtdWKsfPv/pDM8eyIVFLL93dKTX+ertcQj6xDwLfOiNubE5ayFXhYkjwImV6NgfBuq+3hLK0URP2rPlOZbbZTQ0WlKD6CCRZPMSZCU9oD2zYfqpvRArBUcdkAwGePezORkfJQLE6mYEJp6pdFkJ/IeFLbO6M0lZVlfnpzAC9kjjkMCRofZUETcFSppyTImCbgo3+ok59/PkNU5oavBXyW80ue2tWHr08HX/QALNte3UITmIIlU6SFMCPMWJqadK1eDPWfJ4H4iDXRNn3D5wqN++iMloKvpaj0wieqXLY4+YfvNTNr177OU48GEWW8DnoEkbpwsCbjPxznGDQhdDqdYyMY/fDgRQReKITvKYGHRzesGysw5cKsp9LEfXD0R6WE2TeiiENla5AWzTgXJB0AyZEcOiIfqOgT9Nr9S8q5gc/BdA7P+jhGGJgEHhV3dVlfIZ7pmZc27Yu7UTQ0lbAKWqcMSTOdne+QL6ILzbvLrQwdvax4tQdm5opfU16SrOox1AMwAbkdq84z6uJqYVx3cUXfMJgTyDNrVv3or root@plattenschwein" # for backup
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1Lx5MKtVjB/Ef6LpEiIAgVwY5xKQFdHuLQR+odQO4cAgxj1QaIXGN0moixY52DebVQhAtiCNiFZ83uJyOj8kmu30yuXwtSOQeqziA859qMJKZ4ZcYdKvbXwnf2Chm5Ck/0FvtpjTWHIZAogwP1wQto/lcqHOjrTAnZeJfQuHTswYUSnmUU5zdsEZ9HidDPUc2Gv0wkBNd+KMQyOZl0HkaxHWvn0h4KK4hYZisOpeTfXJxD87bo+Eg4LL2vvnHW6dF6Ygrbd/0XRMsRRI8OAReVBUoJn7IE1wwAl/FpblNmhaF9hlL7g7hR1ADvaWMMw0e8SSzW6Y+oIa8qFQL6wR1 gitlab-builder" # for being deployed by gitlab ci
];
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 8e6fa225a..c6225aaa0 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -762,6 +762,10 @@ in {
mail = "hase.christian92@gmail.com";
pubkey = ssh-for "hase";
};
+ neos = {
+ mail = "neos@shackspace.de";
+ pubkey = ssh-for "neos";
+ };
"0x4A6F" = {
mail = "0x4a6f@shackspace.de";
pubkey = ssh-for "0x4A6F";
diff --git a/krebs/3modules/external/ssh/neos.pub b/krebs/3modules/external/ssh/neos.pub
new file mode 100644
index 000000000..72065dab7
--- /dev/null
+++ b/krebs/3modules/external/ssh/neos.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILEgZ29y0qTPjGHWO3TE0j0oOrCCAM1gU3cNooi0qiHm Neos
From c4f9901365e4f06b7d6a675867822cc034654b9c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 15 Jun 2021 21:11:52 +0200
Subject: [PATCH 4/6] l: clean up packages
---
lass/2configs/default.nix | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 193f4bef1..adfeef19d 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -106,7 +106,6 @@ with import <stockholm/lib>;
jq
#style
- most
rxvt_unicode.terminfo
#monitoring tools
@@ -117,6 +116,7 @@ with import <stockholm/lib>;
iptables
iftop
tcpdump
+ mosh
#stuff for dl
aria2
@@ -125,29 +125,31 @@ with import <stockholm/lib>;
file
hashPassword
kpaste
- krebspaste
- mosh
pciutils
pop
- psmisc
q
rs
- tmux
untilport
usbutils
logify
goify
#unpack stuff
- p7zip
- unzip
- unrar
+ libarchive
(pkgs.writeDashBin "sshn" ''
${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"
'')
];
+ environment.shellAliases = {
+ ll = "ls -l";
+ la = "ls -la";
+ ls = "ls --color";
+ ip = "ip -color=auto";
+ grep = "grep --color=auto";
+ };
+
programs.bash = {
enableCompletion = true;
interactiveShellInit = ''
From 8949b2ad3613e39fd47762ab839e6a9b6178cf1b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 16 Jun 2021 14:01:35 +0200
Subject: [PATCH 5/6] external: add ed25519 pubkey of makanek.r
---
krebs/3modules/external/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index c6225aaa0..75be58326 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -220,6 +220,7 @@ in {
Ya8buh4RgyE/0hp4QNpa4K7fvntriK+k6zHs7BcZcG2aMWP3O9/4DgjzBR3eslQV
oou23ajP11wyfrmZK0/PQGTpsU472Jj+06KtMAaH0zo4vAR8s2kV1ukCAwEAAQ==
-----END RSA PUBLIC KEY-----
+ Ed25519PublicKey = s/HNXjzVyDiBZImQdhJqUmj7symv+po9D9uDj+/6c2F
'';
};
};
From 985ba7c82d3400de322bfa2de7a82349e080f114 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 18 Jun 2021 19:05:47 +0200
Subject: [PATCH 6/6] nixpkgs: 1f91fd1 -> bad3ccd
---
krebs/nixpkgs.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 429c23cf5..37cee6584 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "1f91fd1040667e9265a760b0347f8bc416249da7",
- "date": "2021-06-13T11:32:41+02:00",
- "path": "/nix/store/8cx16mc5cymv2ll52fs831lmd4ljzmq1-nixpkgs",
- "sha256": "1lcfcwgal9fpaiq71981abyzz160r6nx1y4pyy1dnvaf951xkdcj",
+ "rev": "bad3ccd099ebe9a8aa017bda8500ab02787d90aa",
+ "date": "2021-06-17T20:20:32+00:00",
+ "path": "/nix/store/2m29isga2dff5x2dzyyr3dql9jpwf5kk-nixpkgs",
+ "sha256": "07ik6rcfpcvj2zch3mzkxwxjs817iysbvsydkm85f14kn7gnyzp5",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false