Home

dotnix @main - refs - log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
feat: earlgrey Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmX4lMAACgkQuFOtpdp7 v3rpwA//bpGDi2l5XOPD+THbChWrm9Ng2rHiEZSs7HjKz4IzAiEQAssZ+gvVUaY5 gfYcB7Uo2heT5QMeu4TgZouyxWJeOknVtWZ1SYytLD2OrcHs2whJRHRl6D3b/peR sS3rQoY4kkef/xTYBk9zR17wpRwTkZPZqO/M6Cy2mlF71acAqxFNvuvgoVXV4Pg7 m+d54kWrNowJ7jJnS8Zg1XMMA1AZf28zXkLyvVyYhUT6upuFTf512mGHXg4gJxnw xy8NR8QudWhhdpfLeS7SoGT5qtKPYPwADeZWUMcOLhtkz7DR2m6/ttmo/peaEu20 Hr4t+3GYrovpfuaXS4V9qsktdKss/4YfVtfC3f6S07jxIPaK2KEuk6bbZtGZHvNX awLJRfMqGgbB8UG6hbpTl/E9FyzaKNZPUoW4cuuVShj+pDybCBTv3qMvFKXmEOkX 7BRqHgXbx953n47xdo2xEyqwAFC6jrlzyx3hv341tyrhAcMidhUefqilaMUhv/+i sih2hzFLr7PQrAJvYdiQGv/me7+Wg0+RMYuwN89GNel8KcdztS3mTndSRSgiR94l +4N6VO6erG16EZzuXeaWVgyn5EyZpmrd/jgwJkmfpGfwR3F97tITfZU201p0nqR0 y/sFWYQUak0y3/evF+T5fY+NTc0Hsu+bHig45Bka2p5S/xU4LoI= =NAH0 -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
8 months ago
14 changed files, 203 additions(+), 34 deletions(-)
M .git-age.yaml -> .git-age.yaml
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
M .gitattributes -> .gitattributes
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
M flake.nix -> flake.nix
diff --git a/flake.nix b/flake.nix
index 42d7e07835f4b024e58a4676381caca1c9c52f2d..50b132e138ceaad1dcc8fe9e812193860cabb3e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -214,6 +214,15 @@               ./machines/chai
             ];
         };
 {
+        ];
+          system = "x86_64-linux";
+          modules =
+            workModules
+            ++ [
+              ./machines/earlgrey
+            ];
+        };
+{
   outputs = {
           system = "x86_64-linux";
           modules =
D machines/chai/cifs.nix
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
M machines/chai/hardware.nix -> machines/chai/hardware.nix
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 = [];
I machines/common/cifs.nix
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
I machines/earlgrey/default.nix
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";
+}
I machines/earlgrey/hardware.nix
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;
+}
M secrets/personal/dex-tailscale.age -> secrets/personal/dex-tailscale.age
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,17 @@
 age-encryption.org/v1
+-> ssh-ed25519 E8j6/g HFKa0iZ+3BjzgXcWImvZ8pDxqSXaU3ArmfUzHSDWUAc
+LcyBupbwCAdyLLoDDpGSSUvTwVsl6dfWKsWuG58FKR4
+age-encryption.org/v1
 -> ssh-ed25519 E8j6/g 3YEltKNS2GZeGUIGuhVxQAs5bv5TpHtExTDGLRE46XU
+age-encryption.org/v1
 3g5T+txUu8pJEyrIKRSuvOafYToXw4e0+e3EGYqO/4Q
+age-encryption.org/v1
 -> ssh-ed25519 f31uNA 16B+bom6u8H/7Ow+1m0JOMjH0biZeHQi4/6ao7Yfmz0
+age-encryption.org/v1
 O8yaDavuZhZrp/hdiidDXVXHbD9b6G5wUWN6Ic3lmek
+age-encryption.org/v1
 -> xIu.+T?!-grease D5 iK}#} N,P?<&
+age-encryption.org/v1
 FPClNBflmHpIAS1WTSZw+cydtHuitkQKBVPV1RzF5zmp1FL/HlOh5A
+age-encryption.org/v1
 --- guw/iQCkuXH+6Se6s0V5jCJ36aE0HBEoA4JnXiEZ864
-�k2�Ȭ��z�Me�PE�KxaFϾ��zF$�r�Z����2��ը��5b�]*|x]�
\ No newline at end of file
M secrets/personal/dex.age -> secrets/personal/dex.age
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,15 @@
 age-encryption.org/v1
+-> ssh-ed25519 E8j6/g lRoy/4CSW9cQCzG6LdrZNgxfxkxqIP4vqWVM2BFioWc
+Td8VAfUM0WiNBobkFt/G6C9rto4RownaCBIFsoNPAdk
+age-encryption.org/v1
 -> ssh-ed25519 E8j6/g Oy3ytCKUvsVd+MZ1QmGFcqCK1I7gPv5W2GpTY0IKllY
+age-encryption.org/v1
 XYnQcYAWnHAq0J7/9gS4KPEgYveAxmHjq9I8gexUZ58
+age-encryption.org/v1
 -> ssh-ed25519 f31uNA QlpT+c0vPzdLnO86YkIx9vfLg3H0bnHh4IAaUdIatlo
+age-encryption.org/v1
 eTsLC0Y4CTrsC2yxO8hgQxORSkUAINj++K/aEOly2Hw
+age-encryption.org/v1
 -> h-grease eLUzO}
+age-encryption.org/v1
 /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
M secrets/personal/restic-env.age -> secrets/personal/restic-env.age
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
M secrets/personal/restic-pass.age -> secrets/personal/restic-pass.age
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,17 @@
 age-encryption.org/v1
+-> ssh-ed25519 E8j6/g 8G6eRsnRs0V6UU0haRdsrDTdIPPkCs4Za28QPIggNDo
+MUrKL5W5C+jp3Wf9YTqcTnPlDPd6K1ehOQpvistc9FA
+age-encryption.org/v1
 -> ssh-ed25519 E8j6/g vJ44QXH609Gdz21eaPJYfSl7LnGYIlH+OyXsgqN7FVc
+age-encryption.org/v1
 bZ2m/Z0PLtvEAe8mN1w2BKRJ9IlUloGFjqzDC+aPnNo
+age-encryption.org/v1
 -> ssh-ed25519 f31uNA j6nFenIYytjtCg5QKn7hcmUwhc67KI52Eri8+j1te2Q
+age-encryption.org/v1
 vVpqmJ3ilkCff4lD6nVlouiZRlqXKkA5Weo+TZtpHYU
+age-encryption.org/v1
 -> 1cou-grease tIV
+age-encryption.org/v1
 8F7BqbUT
+age-encryption.org/v1
 --- pxluaWPdPVE1fulpg5CjTeZnH2qdM2pUZwiy7WSk6qA
-W͑N�h;�4[=�:��KI�&��-���U��p�졒�U�G8�~s�3
\ No newline at end of file
M secrets/personal/restic-repo.age -> secrets/personal/restic-repo.age
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
M secrets/secrets.nix -> secrets/secrets.nix
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";
 
-let
+  matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1";
 in {
   "shared/cachix.age".publicKeys = all;
   "shared/ssh-config.age".publicKeys = all;
@@ -16,11 +17,12 @@   "shared/spotify.age".publicKeys = all;
   "shared/irc-pw.age".publicKeys = all;
   "shared/gist-pw.age".publicKeys = all;
   "shared/git-send-email.age".publicKeys = all;
+  matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1";
 let
-
+  matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1";
   jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS";
-  "work/pypirc.age".publicKeys = [jolheiser chai masala];
+  "work/pypirc.age".publicKeys = [jolheiser chai earlgrey masala];
-  "work/cifs.age".publicKeys = [jolheiser chai 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];
M secrets/shared/cachix.age -> secrets/shared/cachix.age
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
M secrets/shared/gist-pw.age -> secrets/shared/gist-pw.age
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,29 +1,39 @@
 age-encryption.org/v1
 -> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
+age-encryption.org/v1
+6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI
+-> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
 KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
+-> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
 -> ssh-ed25519 xUMv2w z987wPGwVyvrXFZP28tWzA1h+XNq1HnCACMfoj+iHns
+-> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
 qwa2313UF7q2IFvagMmu7mgtNjtqEz/qEjyo0Zbiwfc
+-> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
 -> ssh-ed25519 ph+d2g a1c+MOauSJvc1erF+EzTCsdO3N+IGKm2boxRvrIz5AQ
+-> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
 fFFqyvybedblBsWAOxb/19GOJ5uo+V9BZ5tWxZ+MsAk
+-> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
 -> ssh-ed25519 Cuo7gw Aqmu8pLyiO/pDMPBIyS/rEtIjo9vkVxeO62Cfgpqzww
+-> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
 QVKtKVsVxNPTuTJxjF3/GpuG1H4WaWSQ7ZTDe6+N07I
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 age-encryption.org/v1
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 -> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 -> ssh-ed25519 xUMv2w z987wPGwVyvrXFZP28tWzA1h+XNq1HnCACMfoj+iHns
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 qwa2313UF7q2IFvagMmu7mgtNjtqEz/qEjyo0Zbiwfc
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 -> ssh-ed25519 ph+d2g a1c+MOauSJvc1erF+EzTCsdO3N+IGKm2boxRvrIz5AQ
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 fFFqyvybedblBsWAOxb/19GOJ5uo+V9BZ5tWxZ+MsAk
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 -> ssh-ed25519 Cuo7gw Aqmu8pLyiO/pDMPBIyS/rEtIjo9vkVxeO62Cfgpqzww
-age-encryption.org/v1
+KYAqiNDEvarCtBmiJd5mZe7hVRbbDe4KWPw94429ZFs
 QVKtKVsVxNPTuTJxjF3/GpuG1H4WaWSQ7ZTDe6+N07I
--> ssh-ed25519 E8j6/g NawvXKKlXnRyQSP7AzltDWCKFyYs/JBM0W1HciTDchQ
+-> ssh-ed25519 xUMv2w z987wPGwVyvrXFZP28tWzA1h+XNq1HnCACMfoj+iHns
+�B}z[�U����/��];$��+�/��5۫؛{e����?�`��0���N�
\ No newline at end of file
M secrets/shared/git-send-email.age -> secrets/shared/git-send-email.age
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
M secrets/shared/irc-pw.age -> secrets/shared/irc-pw.age
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
M secrets/shared/spotify.age -> secrets/shared/spotify.age
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
M secrets/shared/ssh-config-work.age -> secrets/shared/ssh-config-work.age
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
M secrets/shared/ssh-config.age -> secrets/shared/ssh-config.age
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
M secrets/work/cifs.age -> secrets/work/cifs.age
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,14 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g gJuAvRgKZ+6ehBQyCNTunmig/KISAJnCYlOuzfBbvVk
+age-encryption.org/v1
 nDft9dvAZ0yfZ++5gogeGNpeZ+/lZPWq55AiJuZ75fw
+age-encryption.org/v1
 -> ssh-ed25519 jo1MPA cEjtf6w0pYrqucz2RiE4ZKU5NTYYcfZCc/x8DylfrxQ
+age-encryption.org/v1
 a7zucSZ3r5iuoiuDOGqsdZKPtJImvxNECpY9oU2aw1I
+age-encryption.org/v1
 -> ssh-ed25519 eyVEZQ PgAkkmsG71yet2D3YGhj7npiiRNmHdVhJSf5aQEdQAY
+age-encryption.org/v1
 T2FHjCMGy3cVM2DoSrpTG9mUzwEYmaQqYeG8mfgizOo
+age-encryption.org/v1
 -> n7f-grease
+age-encryption.org/v1
 f9wMNntlF2Tg0Javc6ZA8o1J9unFH1lnE+0ahbwkWLRTvDkHDtFqipyk+/NdsaOW
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g gJuAvRgKZ+6ehBQyCNTunmig/KISAJnCYlOuzfBbvVk
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g gJuAvRgKZ+6ehBQyCNTunmig/KISAJnCYlOuzfBbvVk
 age-encryption.org/v1
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g gJuAvRgKZ+6ehBQyCNTunmig/KISAJnCYlOuzfBbvVk
 -> ssh-ed25519 E8j6/g gJuAvRgKZ+6ehBQyCNTunmig/KISAJnCYlOuzfBbvVk
+F6qSPDT95Vw3ZSiPuxyiViYCM50frQ
+--- KQLcya1WW6duDWve9dwU/0JWr2+0soL8EUDIEjUBaSE
+��c�й1"ɭ=g�:�	.+�w��b�^AOd��u"�6����\�^��o��
�,���$����X]��q�*[�xE�
\ No newline at end of file
M secrets/work/netrc.age -> secrets/work/netrc.age
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,18 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
-d84LBwZKEseLfzxeWoAK4U7yvujb4tcHlhpN7ekrTMo
--> ssh-ed25519 jo1MPA rrGisZS1Cxz1MPrDVXM6onH1c1dR7Okin5Nt0xKwLCY
+age-encryption.org/v1
 nm6d/qY8Nc/Sf/oYHlRkohlxrarK9YNVvOPLMQy0GKE
+age-encryption.org/v1
 -> ssh-ed25519 eyVEZQ FzbjTRpUGtBADSjkghcbIMB54gfU9v5gdaRc0AIiU0g
+age-encryption.org/v1
 KMx7n20YT98fnWVnL85U0hIXBSZLjmtAkb1xAJJsjyY
+age-encryption.org/v1
 -> ,Xl5x-grease
+age-encryption.org/v1
 IRMPRhKPrHEgzFPR7ina/RGj9ZrJBKjUPkvLHHeYbbqSTAVKaDvw7PB7PhKguZAS
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
 age-encryption.org/v1
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
 -> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
 d84LBwZKEseLfzxeWoAK4U7yvujb4tcHlhpN7ekrTMo
-age-encryption.org/v1
+-> ssh-ed25519 E8j6/g kMV8oOZ0VaMZpgXsITy926b2tz4gPkdFWCPBTjrHZws
 -> ssh-ed25519 jo1MPA rrGisZS1Cxz1MPrDVXM6onH1c1dR7Okin5Nt0xKwLCY
+--- FHh1BPVtevPq9TPDYpMPf2Kr2qhToYzwlqFgc7mW3is
++sq���{JV�Yb���̌��%�UI�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
M secrets/work/pip.conf.age -> secrets/work/pip.conf.age
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
M secrets/work/pypirc.age -> secrets/work/pypirc.age
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