1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/.git-age.yaml b/.git-age.yaml
index d706490e027d9821d44691bfef9840f38fcc5200..997548f4caea9807dcbfa36287098cdc6dd2bdab 100644
--- a/.git-age.yaml
+++ b/.git-age.yaml
@@ -1,6 +1,6 @@
 apps/gui/firefox/work.nix:
     - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
-machines/chai/cifs.nix:
+machines/common/cifs.nix:
     - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
 machines/dragonwell/dex.nix:
     - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7

 1
 2
 3
 4
 5
 6
 7
 8
 9
10

diff --git a/.gitattributes b/.gitattributes
index afc1751bdb9012673c9509044ad8e268ce26e400..bbc97fa42c1f6d7afaf88e58bfdb63e79ac49ab2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
 # Age
 apps/gui/firefox/work.nix filter=git-age diff=git-age
-machines/chai/cifs.nix filter=git-age diff=git-age
+machines/common/cifs.nix filter=git-age diff=git-age
 machines/dragonwell/dex.nix filter=git-age diff=git-age

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19

diff --git a/flake.nix b/flake.nix
index 42d7e07835f4b024e58a4676381caca1c9c52f2d..50b132e138ceaad1dcc8fe9e812193860cabb3e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -213,6 +213,14 @@             ++ [
               ./machines/chai
             ];
         };
+        "earlgrey" = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules =
+            workModules
+            ++ [
+              ./machines/earlgrey
+            ];
+        };
         "masala" = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules =

1
2
3
4

diff --git a/machines/chai/cifs.nix b/machines/chai/cifs.nix
deleted file mode 100644
index 194f004730ef6fbc807787b4c893f375f4ddb7fc..0000000000000000000000000000000000000000
Binary files a/machines/chai/cifs.nix and /dev/null differ

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/machines/chai/hardware.nix b/machines/chai/hardware.nix
index ea5a40b4f3023e6ca01fa606e7ba59f276b47610..d6aaec73129f2ff6bb9694f9e8d14c9f7130bfa3 100644
--- a/machines/chai/hardware.nix
+++ b/machines/chai/hardware.nix
@@ -4,7 +4,7 @@   lib,
   modulesPath,
   ...
 }: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix") ./cifs.nix];
+  imports = [(modulesPath + "/installer/scan/not-detected.nix") ../common/cifs.nix];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
   boot.initrd.kernelModules = [];

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18

diff --git a/machines/common/cifs.nix b/machines/common/cifs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9a72e86d7350754b2c22e6433a4aa1eb28d4b224
--- /dev/null
+++ b/machines/common/cifs.nix
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> X25519 c4mfhguoo3d3c4S2+D6rfLc/iOWDyiZSgcx7iHGB00Y
+0GGSiSO6bQ6YTYGv+RC75Azwndft793YbqeMNSVjPjU
+--- FzPgP+ISlehyKEs8+LJioURo7uPsevy8xrWQxcssF7A
+1�S:�Q�u�)M+%��/DNQu�_-������Vʃ�+��&
�}��hb�W�ñ`y6Z��}m������"|��A�I b���	�?Ļ\����c��k_,�Ҏŏf�B�sOޖeTX����ֱo�3si����G��*!�TVB�ɐ�4Hr9��Yͣ*1v
�
+�����"�������	��ҫw-y���
���Ki�Tg�{���$����}q'�|������^�\�~7j�_�Q��"�����[
 +��[��,i='�Lv�~�
6�
6�+Q���Sa��u<K�.����V�v�C�N���}�"�hE�.!4|�
ir0$�1���K1�
+r#C��%L]�����s�7�';Q���+@���/�6���o���O�D�y
��B���419�ҡ'/��'B��fp��"D.(n�؟��^0�f�-�>�@�G$0�N"��U
\ No newline at end of file

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71

diff --git a/machines/earlgrey/default.nix b/machines/earlgrey/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5cba3994a98496754b7cc8f7227dbe63a199ee18
--- /dev/null
+++ b/machines/earlgrey/default.nix
@@ -0,0 +1,65 @@
+{pkgs, ...}: let
+  username = "jolheiser";
+in {
+  imports = [./hardware.nix ../common/gui];
+
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelParams = ["quiet" "splash"];
+    loader.efi.canTouchEfiVariables = true;
+    loader.systemd-boot.enable = true;
+    initrd.systemd.enable = true;
+  };
+
+  hardware = {bluetooth.enable = true;};
+
+  networking = {
+    hostName = "earlgrey";
+    networkmanager.enable = true;
+    firewall.enable = true;
+  };
+
+  services = {
+    blueman.enable = true;
+    pcscd.enable = true;
+    openssh = {
+      enable = true;
+      settings = {X11Forwarding = true;};
+    };
+    globalprotect.enable = true;
+    printing = {
+      enable = true;
+      drivers = [pkgs.hplip];
+    };
+  };
+
+  virtualisation.docker.enable = true;
+
+  users.users."${username}" = {
+    extraGroups = ["wheel" "docker"];
+    isNormalUser = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    globalprotect-openconnect
+    jetbrains.pycharm-professional
+    jetbrains.idea-ultimate
+    jetbrains.datagrip
+    libxcrypt
+    py39.python39
+    py39.python39Packages.virtualenv
+    py39.python39Packages.psycopg2
+    py39.python39Packages.wheel
+    py39.python39Packages.setuptools
+    py39.python39Packages.pip
+    python3Packages.twine
+    subversion
+    teams-for-linux
+    xorg.xauth
+
+    # Flake overlay
+    jolheiser.nur.prospect-mail
+  ];
+
+  system.stateVersion = "22.11";
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

diff --git a/machines/earlgrey/hardware.nix b/machines/earlgrey/hardware.nix
new file mode 100644
index 0000000000000000000000000000000000000000..aac7688fdbbfc1dda2869cfac580272f6bb01135
--- /dev/null
+++ b/machines/earlgrey/hardware.nix
@@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix") ../common/cifs.nix
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/e2274508-9989-4f6b-9bcf-a0d246f292f9";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-1121cd25-7c4c-47ee-b04a-2cab0cd251ea".device = "/dev/disk/by-uuid/1121cd25-7c4c-47ee-b04a-2cab0cd251ea";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/86CA-6DF6";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp197s0f4u1u4.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28

diff --git a/secrets/personal/dex-tailscale.age b/secrets/personal/dex-tailscale.age
index 156373e84098b5b96d7ff671433ae3bd5530ce6b..1f45c0f0a2696da1d72b8304388334bcb13780ea 100644
--- a/secrets/personal/dex-tailscale.age
+++ b/secrets/personal/dex-tailscale.age
@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g 3YEltKNS2GZeGUIGuhVxQAs5bv5TpHtExTDGLRE46XU
-3g5T+txUu8pJEyrIKRSuvOafYToXw4e0+e3EGYqO/4Q
--> ssh-ed25519 f31uNA 16B+bom6u8H/7Ow+1m0JOMjH0biZeHQi4/6ao7Yfmz0
-O8yaDavuZhZrp/hdiidDXVXHbD9b6G5wUWN6Ic3lmek
--> xIu.+T?!-grease D5 iK}#} N,P?<&
-FPClNBflmHpIAS1WTSZw+cydtHuitkQKBVPV1RzF5zmp1FL/HlOh5A
---- guw/iQCkuXH+6Se6s0V5jCJ36aE0HBEoA4JnXiEZ864
-�k2�Ȭ��z�Me�PE�KxaFϾ��zF$�r�Z����2��ը��5b�]*|x]�
\ No newline at end of file
+-> ssh-ed25519 E8j6/g HFKa0iZ+3BjzgXcWImvZ8pDxqSXaU3ArmfUzHSDWUAc
+LcyBupbwCAdyLLoDDpGSSUvTwVsl6dfWKsWuG58FKR4
+-> ssh-ed25519 f31uNA en9whJKk3OymAdjK4t6cAK9ll1rOw0H+MFyJ459zNQk
+GcTcl5Dv66eP85q5ckECROc9KlWLoL/q1BppeeMtnIA
+-> lDpUBe<-grease )|9 T3 [E/3N_c-
+tONI1/ErGae8xx/kGH/5GGjQ1Wft/pWkmeql/hWYhkvHuaJiIZsHcNYdPa3QWdA9
+gajB9zwiEB9k
+--- GVU3qkwpyhO1Lb+l/c9VNedBZir5u4TQwHESpMzWnv4
+2��
�2�����#h]`C�	B��,���e4�4=��\C
N��e�
~)6
\ No newline at end of file

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

diff --git a/secrets/personal/dex.age b/secrets/personal/dex.age
index dd60748e75d59dfc30490cbcbec5cf5f3c3b920a..a8c3506b71c13d27ccdbbafbd45b11f7a9898b46 100644
--- a/secrets/personal/dex.age
+++ b/secrets/personal/dex.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g Oy3ytCKUvsVd+MZ1QmGFcqCK1I7gPv5W2GpTY0IKllY
-XYnQcYAWnHAq0J7/9gS4KPEgYveAxmHjq9I8gexUZ58
--> ssh-ed25519 f31uNA QlpT+c0vPzdLnO86YkIx9vfLg3H0bnHh4IAaUdIatlo
-eTsLC0Y4CTrsC2yxO8hgQxORSkUAINj++K/aEOly2Hw
--> h-grease eLUzO}
-/Ee39e4a
---- qZhUUEMufsYoRSoMavCBG5TkN7iX8aY21guO9hFNLNs
-A�$�����S�H�F�d��F�=
�������l� ��Ԓ��t���0�����R\90,Tn��}ۃ"<v�\��ݏ��l%D��!��6$9�8t�5CG�k�j;�9�mW}�^
\ No newline at end of file
+-> ssh-ed25519 E8j6/g lRoy/4CSW9cQCzG6LdrZNgxfxkxqIP4vqWVM2BFioWc
+Td8VAfUM0WiNBobkFt/G6C9rto4RownaCBIFsoNPAdk
+-> ssh-ed25519 f31uNA zSrq8vvb6m4OgM3SgckfkjKBywsAXWp+l8VMa5eoHx0
+YGV5W9NeGVWTrld7WnpymtZxf+Fjszr1By/TFs+CSk4
+-> DV5h_-grease B'
+6apd32tU7QBcqxlsGxzlY6rVghplLDqi2gr21QS9BSxoqwH4
+--- TuBTBf9xCHgxy8hMR7qi5m89kqLlWkEIf1baUho7qkw
+���>:�2}d�ԁN}1���WPUaU 3� ���5�_�`��\^���A��O%i��`�J8�4{o5��}pX�!d�wc8Ƒ��Z��v������N3p�z8�C&�@��(��
\ No newline at end of file

1
2
3

diff --git a/secrets/personal/restic-env.age b/secrets/personal/restic-env.age
index 19ba73de7fa6eed7abaf5fd62e0a3a3ba5a5f7fd..52128ca4c7b4fa974c14a301fd1ee4f534e75a66 100644
Binary files a/secrets/personal/restic-env.age and b/secrets/personal/restic-env.age differ

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

diff --git a/secrets/personal/restic-pass.age b/secrets/personal/restic-pass.age
index 81a2dd54e3abb8179e87c5cdce5162df0ca531ac..50ed4610ddca908e1fc4e3eb19c1855918f7a56d 100644
--- a/secrets/personal/restic-pass.age
+++ b/secrets/personal/restic-pass.age
@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g vJ44QXH609Gdz21eaPJYfSl7LnGYIlH+OyXsgqN7FVc
-bZ2m/Z0PLtvEAe8mN1w2BKRJ9IlUloGFjqzDC+aPnNo
--> ssh-ed25519 f31uNA j6nFenIYytjtCg5QKn7hcmUwhc67KI52Eri8+j1te2Q
-vVpqmJ3ilkCff4lD6nVlouiZRlqXKkA5Weo+TZtpHYU
--> 1cou-grease tIV
-8F7BqbUT
---- pxluaWPdPVE1fulpg5CjTeZnH2qdM2pUZwiy7WSk6qA
-W͑N�h;�4[=�:��KI�&��-���U��p�졒�U�G8�~s�3
\ No newline at end of file
+-> ssh-ed25519 E8j6/g 8G6eRsnRs0V6UU0haRdsrDTdIPPkCs4Za28QPIggNDo
+MUrKL5W5C+jp3Wf9YTqcTnPlDPd6K1ehOQpvistc9FA
+-> ssh-ed25519 f31uNA WbcuiNfaVxct1uZnMi9ZLcmNkTrcovcnrnRn4P1wHm8
+IWwi8uZjA5k0kr07/SlC1GOzV85XjvHJqeTzWX4CWA8
+-> gnOdn-grease ]2DTmO^ N6 q=f%DXM
+B0OfIBLLfNo30z1AqfUBNoH6WryEUdkTFEQDllC1wFX/gZrEcjBRHzR6Onmh9LUx
+0VmEMsacAXgdQS4d4/zZNeeHc4Gm7AjfirsWUUD9aoc
+--- 9IyFn99ehW6OUklLg5B+pZDoVCEEKu5/nXehgIlZlJ4
+�"_�"��+�10C�͆��pbP�vf�B�t�����b�4z��P
\ No newline at end of file

1
2
3

diff --git a/secrets/personal/restic-repo.age b/secrets/personal/restic-repo.age
index b88c9510a561b86496eea462302eae6275594ced..82a027c3ab1e6f2fd4277bb02b5fc11987869b2d 100644
Binary files a/secrets/personal/restic-repo.age and b/secrets/personal/restic-repo.age differ

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index ae3e5b2acce8e5e2dc5fa5fe3cdb473e1a65aae4..01c1bd64a8e5669c5b3c59f806ddf24a8d8e2ac3 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -4,10 +4,11 @@   matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1";
   genmaicha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhyzwMV0eoS8RSAcUvLkPhbXoR9/06cLoBmUVyb9DTw";
   sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am";
   chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM";
+  earlgrey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEJDcKxHqsnW9IMTfMQLPR2113acjm5Zi3IbZWfEDb7f";
   masala = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDltwsOkqNsP0Gia32jzUUzohzMYpE9uSwxBqJoG2Vd";
   dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53";
 
-  all = [jolheiser matcha genmaicha sencha chai masala dragonwell];
+  all = [jolheiser matcha genmaicha sencha chai earlgrey masala dragonwell];
 in {
   "shared/cachix.age".publicKeys = all;
   "shared/ssh-config.age".publicKeys = all;
@@ -16,10 +17,10 @@   "shared/spotify.age".publicKeys = all;
   "shared/irc-pw.age".publicKeys = all;
   "shared/gist-pw.age".publicKeys = all;
   "shared/git-send-email.age".publicKeys = all;
-  "work/netrc.age".publicKeys = [jolheiser chai masala];
-  "work/pip.conf.age".publicKeys = [jolheiser chai masala];
-  "work/pypirc.age".publicKeys = [jolheiser chai masala];
-  "work/cifs.age".publicKeys = [jolheiser chai masala];
+  "work/netrc.age".publicKeys = [jolheiser chai earlgrey masala];
+  "work/pip.conf.age".publicKeys = [jolheiser chai earlgrey masala];
+  "work/pypirc.age".publicKeys = [jolheiser chai earlgrey masala];
+  "work/cifs.age".publicKeys = [jolheiser chai earlgrey masala];
   "personal/restic-env.age".publicKeys = [jolheiser dragonwell];
   "personal/restic-pass.age".publicKeys = [jolheiser dragonwell];
   "personal/restic-repo.age".publicKeys = [jolheiser dragonwell];

1
2
3

diff --git a/secrets/shared/cachix.age b/secrets/shared/cachix.age
index cd68a719f6e588e3790a833333916e118b045657..36c7b4928c64a723e44c782cf248208bc7f2bacf 100644
Binary files a/secrets/shared/cachix.age and b/secrets/shared/cachix.age differ

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

diff --git a/secrets/shared/gist-pw.age b/secrets/shared/gist-pw.age
index 620d61b0e39a810f3e337b6fa7ade6df05a731b2..33346f0352553d6f21989944e4cfd4caaa5f5b57 100644
--- a/secrets/shared/gist-pw.age
+++ b/secrets/shared/gist-pw.age
@@ -1,20 +1,22 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
-KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
--> ssh-ed25519 xUMv2w z987wPGwVyvrXFZP28tWzA1h+XNq1HnCACMfoj+iHns
-qwa2313UF7q2IFvagMmu7mgtNjtqEz/qEjyo0Zbiwfc
--> ssh-ed25519 ph+d2g a1c+MOauSJvc1erF+EzTCsdO3N+IGKm2boxRvrIz5AQ
-fFFqyvybedblBsWAOxb/19GOJ5uo+V9BZ5tWxZ+MsAk
--> ssh-ed25519 Cuo7gw Aqmu8pLyiO/pDMPBIyS/rEtIjo9vkVxeO62Cfgpqzww
-QVKtKVsVxNPTuTJxjF3/GpuG1H4WaWSQ7ZTDe6+N07I
--> ssh-ed25519 jo1MPA EbWT1F6gzDcjZYzErNE4dogwZoeYELJIfjWIpv+zIGA
-QkJy4Syp6RS5uDVSzA5i5jQg+Pz4cpXeB6vN172JY0E
--> ssh-ed25519 eyVEZQ SeFiCGTCMqeaSDh34oD+F647VSu/Bc77rWIRqFhhUDQ
-0W/7wBUknwy5i39Qa1hbRgT0TxBkCdPAhrTtM9GIcj0
--> ssh-ed25519 f31uNA ve3GgoSdEID5oL9h4kv6No0khnv2e2lWB89dT50z4js
-l8HXR2qR3ssZiyakt61VJ2peSoHU2efiw1xksHvDDU0
--> ^-grease
-a/B8KkEUBwVjH7xljqk8yDCXUQT0C9NByTX4wWr0Xo9EVRTAaqq5FyZBcevoh7TP
-sFGf0cuwYFTSlacLzxDyqP5q
---- qKYwheJPKeab/ETIBN9Ap9moif61kra2NtGe7YpZMnw
-�4��y�?U�(5i����,2��d�"O��c���@��}�a����.��
\ No newline at end of file
+-> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE
+6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI
+-> ssh-ed25519 xUMv2w SELe390ELo7Y2YPkSx8p9/2olfhZWlxDcwfwnFS3QVc
+t52BsiM/buEaR7hWJ1p1Q5EQ0mJuCfnPhE2LhgGr0hM
+-> ssh-ed25519 ph+d2g OIIYXOu0MV8YxSsp7f2ZYe7ubC3oMj6Kgk+HNPV74Bs
++TzAaEVFk9+EFSVr/W/8WVUG+Heoc490oVOznXhg9Cg
+-> ssh-ed25519 Cuo7gw Nra5cfKPzuZLNX2XfNv+3OwLdCTZO1FUU/KbBlVW5VY
+r5tMoKRbhUm1TIVhycsMfrtzpJlDrT8UktCnXl8gZ7A
+-> ssh-ed25519 jo1MPA HnjRxfr0WTD2e9ZgJ6COvKdIoktTZQRUHvpLGXyftio
+tEqo4HiNLdQVjzFa2Ajsj9zT/bNPnUKP4lj6RlPlEuA
+-> ssh-ed25519 RqjBDA zCrcr/H0+gyb66cUQtBks9K3WLbaOfAcnMkHAM8j2HQ
++gYIRP/SALEh90Rk6smzl54Tjaxs6zC08FhOQwU0LVo
+-> ssh-ed25519 eyVEZQ ++C61oVJZ6WT44cPMc+W874Ae4FwQkfEq3la6rJHJTg
+oBIvtSWanqMvdHcP14Pb3h3L//YwojtkydmHky0JWMU
+-> ssh-ed25519 f31uNA Xd8l5mbndDhG6B+Hoa1NemYEkCY4nfAzQoPCDMTL1GI
+d5NB9F4wzuaIN3tBeLzPcVUI0ZxPOFQh7oEIFuNC8VA
+-> r)W(w+{S-grease
+OccrqEtS0JFc/Q4CyxM8uTSTAY2zMtOQAdJ2YNBziCDWRv9VsVPfMoUdNK4gwotJ
+Aca1j5gPu1YMJQ
+--- uEiyoJMtmDp8UxB6CntFBrRYZtQs/MfWWoPnDU1RxWQ
+�B}z[�U����/��];$��+�/��5۫؛{e����?�`��0���N�
\ No newline at end of file

1
2
3

diff --git a/secrets/shared/git-send-email.age b/secrets/shared/git-send-email.age
index 27c47d7276021083e282e66d266e35d09b889d37..65f9ad9c9ba348fb8f6760ea26de4bb5de10b264 100644
Binary files a/secrets/shared/git-send-email.age and b/secrets/shared/git-send-email.age differ

1
2
3

diff --git a/secrets/shared/irc-pw.age b/secrets/shared/irc-pw.age
index 1a1d704620e3dcda46224d567ba2f39a6b1226eb..b19da76ce13f11d0f21accd6dfb174b7484f3c54 100644
Binary files a/secrets/shared/irc-pw.age and b/secrets/shared/irc-pw.age differ

1
2
3

diff --git a/secrets/shared/spotify.age b/secrets/shared/spotify.age
index 3914e8eb31d27ea8ab9e8e604bdc5037909c7e2a..1e06b23c0d4779a2702a0a4a3b63783a583991c2 100644
Binary files a/secrets/shared/spotify.age and b/secrets/shared/spotify.age differ

1
2
3

diff --git a/secrets/shared/ssh-config-work.age b/secrets/shared/ssh-config-work.age
index d5ec7a25a929d1795fd2fec7aed3b190a6603856..0642407b833b48e450776429fff2d157821fcb07 100644
Binary files a/secrets/shared/ssh-config-work.age and b/secrets/shared/ssh-config-work.age differ

1
2
3

diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age
index 4dfdc0aa30e59eb1da34ad02c414853b09d0759b..5e8bc36d8ed2d6c8a6f231f2f208c2e34655bb8a 100644
Binary files a/secrets/shared/ssh-config.age and b/secrets/shared/ssh-config.age differ

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age
index cb429333c42abb9decd771bb231989c9950ee11e..1685bd97ce71d47059588b1fbe46c7a195dc3ed0 100644
--- a/secrets/work/cifs.age
+++ b/secrets/work/cifs.age
@@ -1,12 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g gJuAvRgKZ+6ehBQyCNTunmig/KISAJnCYlOuzfBbvVk
-nDft9dvAZ0yfZ++5gogeGNpeZ+/lZPWq55AiJuZ75fw
--> ssh-ed25519 jo1MPA cEjtf6w0pYrqucz2RiE4ZKU5NTYYcfZCc/x8DylfrxQ
-a7zucSZ3r5iuoiuDOGqsdZKPtJImvxNECpY9oU2aw1I
--> ssh-ed25519 eyVEZQ PgAkkmsG71yet2D3YGhj7npiiRNmHdVhJSf5aQEdQAY
-T2FHjCMGy3cVM2DoSrpTG9mUzwEYmaQqYeG8mfgizOo
--> n7f-grease
-f9wMNntlF2Tg0Javc6ZA8o1J9unFH1lnE+0ahbwkWLRTvDkHDtFqipyk+/NdsaOW
-936dsytbmxeoHo+TDJD3RLBEv3FC7bj6Jqxvy/xTa0TxPdOiD00
---- XKujnaAhHN7bDG5+6pI08Ph3ckoYjLhoYETBNe0nnO8
-'ݪ����L�H��r�cF^W*��Q-I�(��L)�f
B�!t6.�?;�sI'����eel`�<>ej0!��Y�+߫\s
\ No newline at end of file
+-> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w
+PUD5yWZhyDKglSKqQI2naYyWghNHCAX1+6zFtFm3rbU
+-> ssh-ed25519 jo1MPA n/47VcYbxc8PXWp9ojHqndHZx9+lGX+ZYzyBn5johQ4
+VLlK88iztE78ZyAXctkxebOYQaIsR5YR2XAXTVTDfIg
+-> ssh-ed25519 RqjBDA QEBalTZhf7bYvjKup5rjIMdbzarQ/KxPPznCr1OGr1I
+IQ82Z/0AlZkdTG3XUEiLEKJ9acUAp3LGRj9Xihf7oZg
+-> ssh-ed25519 eyVEZQ XIeYz+BBM3Xrjup2DtpcebrH2OA4EkhVgR097RCANS8
+NST1VSTdhHHbE1Jv4A/rMQ/X9hvEam+E/5iAjVpHDSo
+-> D[-grease q& k' OC(uVqZ 2
+PFO2wKgnpoqhBVE6w19l1puBQrZ+8p6ial3KyTAlL0Cp1S+zv2PXEdvtpOTEh8EN
+F6qSPDT95Vw3ZSiPuxyiViYCM50frQ
+--- KQLcya1WW6duDWve9dwU/0JWr2+0soL8EUDIEjUBaSE
+��c�й1"ɭ=g�:�	.+�w��b�^AOd��u"�6����\�^��o��
�,���$����X]��q�*[�xE�
\ No newline at end of file

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

diff --git a/secrets/work/netrc.age b/secrets/work/netrc.age
index 9b4b4740376e6172fd8baa13d4bbc39735dc0064..9db4c57f7277f0b5f9c2d86dcae750521de2c569 100644
--- a/secrets/work/netrc.age
+++ b/secrets/work/netrc.age
@@ -1,14 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
-d84LBwZKEseLfzxeWoAK4U7yvujb4tcHlhpN7ekrTMo
--> ssh-ed25519 jo1MPA rrGisZS1Cxz1MPrDVXM6onH1c1dR7Okin5Nt0xKwLCY
-nm6d/qY8Nc/Sf/oYHlRkohlxrarK9YNVvOPLMQy0GKE
--> ssh-ed25519 eyVEZQ FzbjTRpUGtBADSjkghcbIMB54gfU9v5gdaRc0AIiU0g
-KMx7n20YT98fnWVnL85U0hIXBSZLjmtAkb1xAJJsjyY
--> ,Xl5x-grease
-IRMPRhKPrHEgzFPR7ina/RGj9ZrJBKjUPkvLHHeYbbqSTAVKaDvw7PB7PhKguZAS
-sz9zClcUOw7oVCJrdBtxh7yk1jbswBHuAVth8WFprw
---- XdvJ6QFD6qJN6DGHUNeSO+NugB0GVvt+ikLmo9a/AQs
-��gn�HZ2lYzb�h�r	T8�}���um�3yiCl��5���a�Jd%�ل�PO���}�$���w
-,I���D
-^7���-���X�}�b�'��#����d{^j��:�0����v4p�����O/��w��N�p� ��k
\ No newline at end of file
+-> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic
++LBspn84xqRv9Jsa+H3gLJZNGWE9lsFhVcoUllIGtYI
+-> ssh-ed25519 jo1MPA PEcjnR7QhqcjARicpeMagvQMRX1Xhc4puGn07bmkMwE
+0rIMuM1McW6lO9mt00krt3+OxpRv0+HXltHzkBBKP2A
+-> ssh-ed25519 RqjBDA bMrSJvi7XfsNdEbTM4Qz38xB1ydx10EEyXGThqqRUiQ
+FJQwSRYGx7ZcuynYl7Rebb52EtDrdZP6sQIfB9pMfx0
+-> ssh-ed25519 eyVEZQ zG+7GBK66PMEzhpuovR0sRPsTxW5RwRfQchmlZSTZXQ
+4PeSJavY8qloTKkAxKeyj5CJ3V1T9ZHErIiKrIkFFMk
+-> h=Z`uj-grease kB `'Rp
+wX/7XK6SQm9T
+--- FHh1BPVtevPq9TPDYpMPf2Kr2qhToYzwlqFgc7mW3is
++sq���{JV�Yb���̌��%�U
I�4/����pA��~*M���V����sƝH�RIWFj#ԩ+7���0�+��
+�q�|�}Ua?!EK��r58�1���	[2�ծt��f��/h27��V6M߹���8���F��<~
\ No newline at end of file

1
2
3

diff --git a/secrets/work/pip.conf.age b/secrets/work/pip.conf.age
index d79b6f9b30dde9fd2754463c2baf9b42e37e2406..c7758d4c9bd93db09449019d3d5ffafd4846b0b8 100644
Binary files a/secrets/work/pip.conf.age and b/secrets/work/pip.conf.age differ

1
2
3

diff --git a/secrets/work/pypirc.age b/secrets/work/pypirc.age
index 0952e0d302732dfec7302427bb79229039caf935..67d3fc72b0bc6fc6d2121e34812e857df7668ac0 100644
Binary files a/secrets/work/pypirc.age and b/secrets/work/pypirc.age differ