Home

dotnix @main - refs - log -
- 
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
feat: genmaicha Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmXmdb4ACgkQuFOtpdp7 v3oYhQ//dSM4HCZNtCMUbNq8w4Lcm6RZ901x0n7NLKQQ5dYPbNQAS1DU2t8URFkC o8JrWOp+8ieZa88YsRHLmBMdrHnbrGK5TMxAcixFUwMhZJmjst59nW2Pf6qFRad3 5ffIFW695QpsA9aUC0xkjTOmrYxeOSWGYY6qPaKRXEtnT+k2bPUFc4CRSAOsgVtP EZtzJb5jglT4D+8rtvIaCNbGHVna1LsE6BBtS8lFMQ9XyUKMpzEa6sgNbEjEYXQ4 7ijoMzc9jy8LKk4Wpewr4wKw2t2VG7ZtDr9qhxYycGO2A8KC1yLYholblDIJigDs HK+JI5LWncDD6PrHwhsRTm+saWpo5oE9nSKtJ2LvJaFH8uvjBv03m4J4HPjoPUc2 zIk3uJvnCJ4foZbW89884P8uBv0jh7A77EuH7wSbTBr74pYKsUAB8VzNCnYo3XJU bW6oOfx8wPcFTDIZUUDzlfLIKo+zlhkp0gt6ZVTJBmmOCqBmxcU8tdMCaBnZ5ZFq CMnF7GVphNj7UCD5pLc0GNeRrAKBqXMUdMpTFp7Gh+qS/2W6nEVPZkLY10YhCP9G /xRygT07GNMUi2DZFxj9Gz7FA49zd/8n3XG2/JtRvwc/QvybwRk6entRzaKmcnrn PkLaChCdH/nGTEXKB/0b6+dzWWDKvghx/Qau6e9XHpuCJ8ri2Q0= =fInl -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
11 changed files, 175 additions(+), 85 deletions(-)
M flake.nixflake.nix
diff --git a/flake.nix b/flake.nix
index 5cc6df182cb712c7f9b4712caf92f16c916ab762..4f72bf741afbbcf650fe0e7957b970c22e88488e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -224,7 +224,15 @@             ./machines/matcha
             (commonConfig {})
           ];
         };
-        "sencha" = nixpkgs.lib.nixosSystem {
+        "genmaicha" = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            home-manager.nixosModules.home-manager
+            agenix.nixosModules.default
+            ./machines/genmaicha
+            (commonConfig {})
+          ];
+        };        "sencha" = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             home-manager.nixosModules.home-manager
I → machines/genmaicha/default.nix
diff --git a/machines/genmaicha/default.nix b/machines/genmaicha/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..74670c970eb1dd5178c41f944dc16a4dcfb4eb9c
--- /dev/null
+++ b/machines/genmaicha/default.nix
@@ -0,0 +1,37 @@
+{pkgs, ...}: let
+  username = "jolheiser";
+in {
+  imports = [./hardware.nix ../common/gui];
+  
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelParams = ["quiet" "splash"];
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
+
+  hardware = {bluetooth.enable = true;};
+
+  networking = {
+    hostName = "genmaicha";
+    networkmanager.enable = true;
+    firewall.enable = true;
+  };
+
+  services = {
+    blueman.enable = true;
+    openssh.enable = true;
+    pcscd.enable = true;
+  };
+
+  virtualisation.docker.enable = true;
+
+  users.users."${username}" = {
+    extraGroups = ["wheel" "docker" "storage"];
+    isNormalUser = true;
+  };
+
+  system.stateVersion = "22.11";
+}
I → machines/genmaicha/hardware.nix
diff --git a/machines/genmaicha/hardware.nix b/machines/genmaicha/hardware.nix
new file mode 100644
index 0000000000000000000000000000000000000000..8820810b7c984210b8dcba41cb3d81c6d7476679
--- /dev/null
+++ b/machines/genmaicha/hardware.nix
@@ -0,0 +1,39 @@
+# 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")
+    ];
+
+  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/90652083-df9c-42df-8c8a-8d979a3e1e0c";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B03F-3B27";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/2034b9e4-011b-4715-a7a2-5f5445dc2849"; }
+    ];
+
+  # 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.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.agesecrets/personal/dex-tailscale.age
diff --git a/secrets/personal/dex-tailscale.age b/secrets/personal/dex-tailscale.age
index 79f21d25dda737ff0bc886be83c1cd89057dbbeb..0ebcc973c8e93add0bbd08528dc34c0d43997443 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 vkz4Nnq6kuBmMTIuShTMHgQl5dE/XNSyNeQ1v8BjSVo
-rQyDr+LjMXcBpKdwmBsWTP4CWn2LkE1gF9C2pDYn8GM
--> ssh-ed25519 f31uNA 1X5dITPS0gPV9Ty+rIVYdLSfsllIainzsfDekPGZJko
-K511Nbp24wC/yibcMwXzyc03qheEm8CYz0lsP14rRH8
--> J(DU)G-grease UpDl ^h; ) K
-GfsSxESiw4cjyibN5vt3Hh9tj63kM3oObhfpH+DiBTQQt/2gSkOZ3XGUQI4
---- P09LRVc2jc0MtLcDfWO3i8tjFVs/Wp5k6pho5C74KLk
-ݭ#����Q��i%T� �f=aYר�=;P�v�8]���m�nq8�n��?Ϳ �9u�P#�P
\ No newline at end of file
+-> ssh-ed25519 E8j6/g vAy+af8RY6WSSFppO5hvyUUl8olYZr55mcU+7IbReDQ
+dcsOkcaerSGdSDOlATeKdtm5xt0/lmYyfMaKPffTyW0
+-> ssh-ed25519 f31uNA o3zFRKGtnlIXnUmbQ8A3Wx8z0KhDLuTslpG/Y1yojgM
+sdaqhaIeEgMRhPGp+dh7rA4CeMgnZgzroNGfjR0gmDU
+-> D6#-grease |/
+ykf8gtcCTwvKDj9wZIRDMErOV5pxBu2jPoQCYXvIvTuzb2824p45jj7pXAXQnGb8
+KCUPqiCrVlJAPBY0wG1oVFdcznoVcxR86Kp6+8KQbfaztHHWDeisVVQHumes
+--- zVrXOOYUx8FTQh4JgzRFi5iwlv5RCNvmjlnsWawVZio
+I���ք���bh���7S�5\)�T� ��gVN�&�)�!�]"�)��ȫ�~�����~+DR61
\ No newline at end of file
M secrets/personal/dex.agesecrets/personal/dex.age
diff --git a/secrets/personal/dex.age b/secrets/personal/dex.age
index d6ff53879123cd5969c3659be104b484fa221906..8c70b98b2c8bc272bec77d76c74b5770289456b1 100644
Binary files a/secrets/personal/dex.age and b/secrets/personal/dex.age differ
M secrets/personal/restic-env.agesecrets/personal/restic-env.age
diff --git a/secrets/personal/restic-env.age b/secrets/personal/restic-env.age
index bd913d088e8cf03d4c02952d47084a78f6bc31ff..91cc58ad13d53c7ac4f50676583d7495af86187a 100644
Binary files a/secrets/personal/restic-env.age and b/secrets/personal/restic-env.age differ
M secrets/personal/restic-pass.agesecrets/personal/restic-pass.age
diff --git a/secrets/personal/restic-pass.age b/secrets/personal/restic-pass.age
index d130979306bba017676a6dc156c7878d57d9635a..9b8d2405cec48484e83390331881543c35bb5961 100644
--- a/secrets/personal/restic-pass.age
+++ b/secrets/personal/restic-pass.age
@@ -1,11 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g IxilZcPJYM7QuBM+2/NTzzv4YNJVI41FvmTlkL+KoUw
-P7RK+wlfEdBeGVIU52QG43sRDJ9KxF0/6TarT9W+wbc
--> ssh-ed25519 f31uNA pQCg9BCiIk//YdV3AHr3w2Y84K6MwH/HK/k7w4EapQQ
-9EySD+N5XEz/w4AyRBsLioYhr6PaPOkckMLhE7LONdk
--> M-grease d_4>8< / 1V($
-yc2NhRg1u6HU1bAVVTqdi4qKyHdPINhhZt7HUPubLWR0KJyPb2Aaz6c66UmMu8La
-49kh/q2eAcgQ+GVOHUSc6ZYEf+WD
---- YX4Fl76QjEubDmrpQcVx1ihZiVY2hQJhzrnIlxNlEHw
-�{��t��i��Hљ��xŦ��At+epVJ�ˬ��L��pY�
-L��
\ No newline at end of file
+-> ssh-ed25519 E8j6/g dfl/4KK/wqfqGNVy7w3TVCCAWaE0YxjwANbpmvOFCRM
+a/Co9DjgJoJsyZ8ebbyHq+9gUoAjFjDcY68tJKT0oMU
+-> ssh-ed25519 f31uNA XIEqeJH9o2VvsvrDwCEYRC41u4uWnobQdPs/XvjawB0
+ASivR07dKjB5CCmFXop1Hl5vPrPcqfDibvwQ1yDNpDI
+-> 8]nH&]-grease *1e7s tx3fO;f
+8pZu2pEc9uYt62q3R8Y6NC1/8nNfXIWjji+/4guk+m88cxSSIc7Rm/Z8TVURp1Uv
+8JBVSfFr1xmRrWwk2g4HeUtK4Ghl
+--- RfLghaQKCaoEkyEeCg8zkyE0E7XaMQ7WuPxUhpy8EAw
+jgR���ul�d���	��PO�غ7V�X0��]o�xi(�K%υ-��
\ No newline at end of file
M secrets/personal/restic-repo.agesecrets/personal/restic-repo.age
diff --git a/secrets/personal/restic-repo.age b/secrets/personal/restic-repo.age
index 5a81ece3687b04d8e1751d2f62cc10670f26b8cc..39b6e50fd74d66813a70832e63b92d7cbee72c74 100644
--- a/secrets/personal/restic-repo.age
+++ b/secrets/personal/restic-repo.age
@@ -1,11 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g /mv0fp9Xhz82GMijyXu4zKyNsW11q2fxJ6zD3MU6O2Q
-6o/t8ahIXklhZ3ILUfOKiGns74qhny+80dcrFu/+tNY
--> ssh-ed25519 f31uNA DuKL8kZ2xuwICNLHzoOirxfzbzh3zHR6qW4LPnMhgCk
-GNsyRaJlIxJjL2Ccnn5hkRzLrDr/pvbNrVidf9646dQ
--> Ztf-grease v
-rvC+ciAnVae8fNwFllFCMyxjSXHx391gDjXnrf1TWl/UXaIpwvlcbPeSPedig52U
-6bQM9Z3UW+zfAugHBb2q3BukVSkDFfFw8RAAxHbC1sleAbFAsgtCSjCjG0tn+irI
-dxE
---- 7K9dTBILUGSBVi0dsn48ImjpAALL+8fR+eoPMo6Pbvw
-5w�)@+Fn��jg�_����I��xNӤ"��]/2V�BO/� ����҈g������w�d.���@�3tV���^�w���`���0н��t
\ No newline at end of file
+-> ssh-ed25519 E8j6/g 8mQIrdq9+2IO0soFvk1PZAKclsd3YFkzRoOFSIhFphg
+HNbCouDyNyQg+XZjqF9kxl4NdmozUONR7uZNtWVy3Bs
+-> ssh-ed25519 f31uNA O4Q9xhdfO5ilINIMhgHMkbn+Oj6foNd36IOUnb7sUhA
+n50F9NRILPjqIf5bqT7XyvWTglXZ/EX5PlgAiWzzd9U
+-> H~.VkE-grease q
+S9uqhqtphSeIISQ4hLz/Rj0rjwFDQK1vleObXv1xf9JGdHC8IVrfoHJxsUhaZYEB
+K4wS1uqMF5O2YdizcChPPneTjbgTJyTEs9yzOfFe
+--- VVS63elGrpOtZwMVOdyTTrIEUlrJCG0jZCom/wT/U+U
+�����FYH�����H�U��&T��-8�F:j��S�g)�E9��~�&?D4�V��h�$e�PKwQ��협܋Ep�!�uF�3!����
\ No newline at end of file
M secrets/secrets.nixsecrets/secrets.nix
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index a6c13a815ba34cb84f25e7e751b2361c45a6eb5d..19f62082ef0f6f4ab510b6b29224be91038e5f49 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,12 +1,13 @@
 let
   jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS";
   matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1";
+  genmaicha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhyzwMV0eoS8RSAcUvLkPhbXoR9/06cLoBmUVyb9DTw";
   sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am";
   chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM";
   masala = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0bnlygiFqNwl0mHxcD+t78bTsn1NcHm6L2B4le4FtS";
   dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53";
 
-  all = [jolheiser matcha sencha chai masala dragonwell];
+  all = [jolheiser matcha genmaicha sencha chai masala dragonwell];
 in {
   "shared/ssh-config.age".publicKeys = all;
   "shared/ssh-config-work.age".publicKeys = all;
M secrets/shared/gist-pw.agesecrets/shared/gist-pw.age
diff --git a/secrets/shared/gist-pw.age b/secrets/shared/gist-pw.age
index ab8a09b2d0f6824b98fab5c7ea0bb52494bfe75c..36fd5e2602971d77eabd9a6c914182038066a3e1 100644
--- a/secrets/shared/gist-pw.age
+++ b/secrets/shared/gist-pw.age
@@ -1,18 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU
-zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM
--> ssh-ed25519 xUMv2w VvMh9TxfZfSSN9iB6BDaOUyV2FgvQWj+oUEoi5jOzFI
-AHlnXqzgAyFbXL8rgypA5Dv83xKMlbxtMFKKt5TA674
--> ssh-ed25519 Cuo7gw I/c93mKH8DXsIOwE50GchLlPGC/HdwPJmgzR7YCOz14
-unK9udxesAbkrdseOF0dwtH4hdqSX12LobMTx9r3uC0
--> ssh-ed25519 jo1MPA NF3tbxtJovgNKQrxPrbd/sI/mk6N/hO42s/xqklncV4
-J3j4m7kaDovwaGMvRfiBy3PwnDFNE9T2+VCzz3BhCSc
--> ssh-ed25519 JBrabQ gDu/pIE1R7GlghQ64JOc4zrga/vbit9H+A2qa5S+7Eo
-AbxvIU3Ond734Nn2hy/H5fpl5ENwOoXDvY0FLHPRkjU
--> ssh-ed25519 f31uNA oUjeGgYTZ1QhyDgPEstR30MO9fzA5qloHOMRHdAy/C0
-hpbi4sH4m6ywV0k57KFwm8gd0RPxWfxyDHMaIbMn9Qo
--> kFQ^jK5-grease 0[_!\wZ9 !Hr @E
-XAb/4Yy9qqDJSrL37tR3rrtXDK6hPhzPEEtZVES9M/wxsA
---- a7kumv2O/NXVjxCPegwthcJM0H7Z/4rRCE7liF4qGn8
-d�a�
-+Rh��D	��?��܇�/�z v2��J:w�������^C�
\ No newline at end of file
+-> ssh-ed25519 E8j6/g 4pa1+Kv6okUf9f4RQ6emsx7EP5hffxBkD6xslCIdEEg
+zFXvfaoPKYVp2Wd542wBzUSg1d3XbS7vZ5I+dYxJAlc
+-> ssh-ed25519 xUMv2w HLSesrDg2QlVJkbnRpHM49xqmVLxrZxlSVnEcTH0yiw
+22BItODQ6JFWQyixbXIie40a5HTIKvrZGvzeF5oza1I
+-> ssh-ed25519 ph+d2g LRwOgvYcnkI/Cio+AyoyZydhaqc3k5xLU+Id184DfVs
+tbOyR5DkMtRz+omTTxu7ULPc3zlBC0vLsanXoXKTpl0
+-> ssh-ed25519 Cuo7gw K6A2w7tArNtEyvT2tAMwhnBqmguiY42roUf1CcvawBE
+yZ7aj6Lx6YYIt2+EjNTPIDFh/7CHMdqYUlNf6BMxFO0
+-> ssh-ed25519 jo1MPA PM8H1hzC7orlIDqgozUjkeASrVY1UirDrF5P2m5YjT0
+7x5X5r4qAd9NUht7JYnK4BmNUujKwHe1/Tki6kklSw8
+-> ssh-ed25519 JBrabQ M/DMUPsfWZ/jq67UaUFh/eJA3WdPCa9nurgzSlg7ETY
+n/xI0dSXm11wpF6ow+J3gX5PUFaf0repV8rY020p6C0
+-> ssh-ed25519 f31uNA 7QyiI8TBqAdLRrrJscE0QgTptt31U7vYw9zJixSGDn8
+UEaLthMzVSmRmGBTHjIgHbsZLW4ao5MtWwu3aCTibZ0
+-> k-grease m 3B06Q8 /
+Iq9rEyysZgbHjl2IY/dXAto
+--- uDTo9W0ViyGtXuYuTARNLdUe6kMbq00Dx2qciuUR1jg
+P�.��Mι<P�j��)��7Px���l�l)[-��{��~�d\��5�
\ No newline at end of file
M secrets/shared/git-send-email.agesecrets/shared/git-send-email.age
diff --git a/secrets/shared/git-send-email.age b/secrets/shared/git-send-email.age
index 632cac1f80ecc59fcd381abcdc83a3d18d46f0e1..44ee650837b4fee0d1983bce9c1325f5c5455cea 100644
Binary files a/secrets/shared/git-send-email.age and b/secrets/shared/git-send-email.age differ
M secrets/shared/irc-pw.agesecrets/shared/irc-pw.age
diff --git a/secrets/shared/irc-pw.age b/secrets/shared/irc-pw.age
index 4cc17df22a3d79f9f337430d53a1da0442eaf149..e979a20b5456a920eed87232db6985b1e188cd78 100644
--- a/secrets/shared/irc-pw.age
+++ b/secrets/shared/irc-pw.age
@@ -1,18 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE
-Cva3JJ1W6Lgfj+O/QNxEWMpYbCFiTuTc+X5xZZw54uY
--> ssh-ed25519 xUMv2w F9mWX2Nd01z56bo1NgtKq++u9b5flpF5qE5ihBbn5GU
-urQudyxjM9Fk71bKTol6aY8KnTD8hyAlv4561cfbo6I
--> ssh-ed25519 Cuo7gw xK29blvGUDpc+nIwIBeWzrvVWb3lOT6e5ocLl+1IvxM
-z+ZIHcU8DIhwwxkBG/MKc/fzslmiOkVLv+8mDKewI9o
--> ssh-ed25519 jo1MPA ElgoPZ5citinilxgl7gf5yVc3tTWaSxFyH9YdKZaUmQ
-prdCBsRnpe4dlyl3dqcVRlnPBmaJMLL67GEdS5+J7O0
--> ssh-ed25519 JBrabQ nW6N7fkIoP1wiY722YfHtL4nQY64syVIXao6jmwte1c
-hrCuAFPRw9G9LXXMv9ne1fAs2jdG2yUsKCZc2mhrD84
--> ssh-ed25519 f31uNA 37JlfsoGmzT+I88zASArfvotLOMBypejraBqs5gvURY
-MDG7OlRguH20EuqMnpf3Z+6/ue4MDymmEbMtcS2LgBQ
--> 0u~Nv{E^-grease
-NDxjcP11XXW/aWYh38yiOGOrmXkuO2pXVLIWi8YCTTSQxkQ76dzfV9uGP2qieaap
-YFqg01EjxSyDkjo
---- MVu78w96WIW6Id6ef3k03fexGFPUVUHJ+hsel4egZe0
-!�`^��i��z=6{Vk�D��
�m����[ �� �6���׀����Ol
\ No newline at end of file
+-> ssh-ed25519 E8j6/g e42ZUe0+1QIrld/3QpBfITo1ucNM/Ba3cDOChtJFjhM
+jiQUu7JXZTyYusG3Y97IN6IP9vwvFm0M2Vf3y05Szns
+-> ssh-ed25519 xUMv2w Enl3lBcnnxwiyORWm3eGKp0PgEAp3FhAy+KaUdDGXmQ
+GFwHnNAMZVb/3906iU0USvWJLq5+pE43jSnfzsRHOCk
+-> ssh-ed25519 ph+d2g C6uE19iiy+tC2en6SNHav/6nE77r64ZD4lMKiFL7ehk
+1C84ShjZZSOugDkFyxWVEw9hYv2V0v65zldfDfSohMo
+-> ssh-ed25519 Cuo7gw d1BBtXxwS8gsZ/fo0cb5usgyOQF5Xmpf0rv8eD6SD0w
+kIq+TPHyppqQCT1pHmephV45HmovrYM3gr0Ka9nEyI0
+-> ssh-ed25519 jo1MPA GFd1U8DXWynaHh6wNmeMYdmONyzvHgQLqy6GhqmGq0E
+xbm7zfaGX01If0Raw1p0vXl9WvKUYMUbrYwUeBa1gp8
+-> ssh-ed25519 JBrabQ t1DA/m7eH32VC3fzlyp7XoD+ojYz7rYzezopIWgBwjI
++WPHgMpRSWif+yX/HJTj62Fpt966VWpTESClpYa81Bc
+-> ssh-ed25519 f31uNA MpVDIEzydq0HxewtdNJtCch7J6QASs/tToBjUn2AsDM
+wvaMswNdc0MrOOddQLgy8YQ+FwyFSK7qMqIqIB3gcpU
+-> S-grease hZ$V3~ A.eQ;g
+wLffrDN0dr3wQddbh013evf+AfYmZg+5CkdO0QiqdAsR2c4i4A34euDLgqc80VA3
+f95cievgO4fGX6iyw7gNkHI2PZbIuKUXxJ0W4fBucnJr7fgMnZ48A5qsvbaQmsVi
+
+--- X8FmgyMVSMKm16twn5tbNosqdoVRrVF1oC/GqyJq8wA
+�\�� ұv�k_�;Ѐ7�LG��\�;���p-9}�q6k�x#��B��
\ No newline at end of file
M secrets/shared/spotify.agesecrets/shared/spotify.age
diff --git a/secrets/shared/spotify.age b/secrets/shared/spotify.age
index dc8bfdded70b57af50c5f6a9a9eb8c60048269e7..44083ed9144b6cf6ba4154e16277dd491902be47 100644
Binary files a/secrets/shared/spotify.age and b/secrets/shared/spotify.age differ
M secrets/shared/ssh-config-work.agesecrets/shared/ssh-config-work.age
diff --git a/secrets/shared/ssh-config-work.age b/secrets/shared/ssh-config-work.age
index b1136f4500f174ef4dd9bccf61f4ff94574babf9..85219e7a8f3c566c1db8ff304ec5d51e07c22340 100644
Binary files a/secrets/shared/ssh-config-work.age and b/secrets/shared/ssh-config-work.age differ
M secrets/shared/ssh-config.agesecrets/shared/ssh-config.age
diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age
index 4b5543428a45ccce693b1ea5cabb21b807629e6d..d2e7bab8f0998f2c68220e5d861a20222b3e8fa5 100644
Binary files a/secrets/shared/ssh-config.age and b/secrets/shared/ssh-config.age differ
M secrets/work/cifs.agesecrets/work/cifs.age
diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age
index b322859d5599de36fe176c046cee52e0cf79a70a..b43303fac7c1fb94c683ee99eeadc4692fdb2ce0 100644
--- a/secrets/work/cifs.age
+++ b/secrets/work/cifs.age
@@ -1,11 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g JoEEhC3cHsaddOD/6wYur000ZXMtyUOBxx8OdwIh6nc
-/YSVnJVTZPzU2hU3iy3ME1R66GzA7OQ3NWlgx7w7kkc
--> ssh-ed25519 jo1MPA Cft9zAzbd8p8+OyVLMTRQsI7b7/LZZYSWMQPDf2tTBE
-oXBW+w8+4chm0Dj4HKX4J3EiFh50Gfsr5pCGbwNDx+w
--> ssh-ed25519 JBrabQ YDAu5lMYMkgT1TBCfy6GD4VKNjFwbokn+xvcTeVlaxg
-TE/rEzwVr+FiR5jhdCGegOiQd0V2tKRjdhYrs5YnJAo
--> 1CVDqRl5-grease ` <W"cM ",tb
-CcwaQlpTYqvwaQ
---- cZ4FKOKuv0tKASJDROaKQ+5nVFJzXVyXRdZs11pU890
-�$�+o���7�ĖRK���-�O�7D^��۶�� ُ��^z��.z2ѥ̛�g�7У��z_�}1�g&Fq�W-ė�
\ No newline at end of file
+-> ssh-ed25519 E8j6/g a3iNrhHzWllxwuiLlWC/Kr2yZRWJXj/Pzra1WTt/7x8
+uPUGpLZljwbynQsGy+k7MWx0JSgODDIr860tqA/5tTo
+-> ssh-ed25519 jo1MPA LNoUbjzTyuifxYv8KSkZkRi7/lDPyEZzBaT+bSMaDWs
+0iX6q+g4CL0lDyfbXqNYSQNIxSaqv6pV4BkiBHc7HPU
+-> ssh-ed25519 JBrabQ 4EqCrpf0F1wP1E5B+kjORPp6S5b76mU+tCT2lo8YICQ
++qhvk4su/ncLQ+AZahwY0rEfcDNKz6okhTKDUkf2ngU
+-> +j'O-grease 3.\vM *_U9@ >'
+tCSv9itp7WA1KdgL+6NGaWO39YVJ2950QQlgMfsbLwBzEwpJn0UweN78EyCc93lA
+
+--- NvYh4rq6M99G1/q2+CFm5jOPL/8MDjtp97KEgICGFX4
+҇i�����M7�
+6�&�L뱛}�}���Ij��@ʼ_�
+f�	�$�:`�:点hn&^E���p�22�]0:��� �
\ No newline at end of file
M secrets/work/netrc.agesecrets/work/netrc.age
diff --git a/secrets/work/netrc.age b/secrets/work/netrc.age
index b17cbdf4d839aec38ed6180a71698fda8e24177c..5c812f8d4c1e48727eedf83b6578deabcd66bb59 100644
--- a/secrets/work/netrc.age
+++ b/secrets/work/netrc.age
@@ -1,12 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g uc5q95TtleinoAXuUQ5Z39TfZoJmgE57sl85Vulfzxw
-Zu7qaT9GpW3m5ZIsp6A0E88kFcknMdJadgiQFADOUto
--> ssh-ed25519 jo1MPA YeTQvafosU8W0Ya8pc0b4+c6CeCvBWEKFwJnjfw0B1A
-dwwllbDifpu1x9Rn6DsGHgbGqqOc7GZeDUEdiPye5jY
--> ssh-ed25519 JBrabQ 43n9QwF7MPXNVgsAntQxxzLzlyGhpv7ZfW2Yzvvn0iE
-70i88nY8N5roLOz2e+Ke6AOcUQHp1gpSTI58It/zHws
--> d.rgT26Z-grease ![wAs=
-1zKWBJ2kgSBiYgwiExmCdHomuhrZEIRxDLOFfxL4Ior5QHo5yC673WM8a0wvZ7N3
-jzZyOtIb6sg+yQmpjrcbYPYXLB9eIQ
---- roMl8ATpxg5/hZ3+VmxmWNx/VmRDBPWN7RZfVlI2c+c
-3��ƿ5p�O�{#xL� IE���<}��"g'qWVW���$��U /�|�5���$G|����4m-b�I�����԰؞�F�I�;^���"ی�Fb���0��U��`'ߛ��7��Z�j�m���X)�b\��-sd�X����
\ No newline at end of file
+-> ssh-ed25519 E8j6/g 7ODlmFBfDKBTFyHc3rozESD2wZQ34L+wPmz9KFkboFI
+giXB/VrJICd0X1gK/hbVNjhUC7QBX2n0zbX7RupUR3c
+-> ssh-ed25519 jo1MPA jsTO80EEYllvJqWT7rloJjpbyalQDyV5rfA5jVPdLGo
+3XvuQMCuL/hqQgjqegBjUUn/ChhszRcfG77R7Fg//9E
+-> ssh-ed25519 JBrabQ VbKy8KoIeraG1fpLZgbgXw6zDTriLJWdZ7Tn2MFAaDA
+9rSqN3+AxNHaGjjHqZ1+A2JnUMNFrcZtcfmZzuKx0ww
+-> AS-grease /(o )~ %_Ev7e+? wU+
+uQh8J1qQ
+--- wM8dFDL9SWC5KpO5CE6raawORMQESMmpiMCsT5UnjoY
+����Lā���V�e\�6y����������J��x��y����$Z�"�����p�PO���
X�Y�A�Jj����Y�q/2�$����Th���j��^e�bd����/�������?:�r�['����@pm���M4���.�Q���;��
\ No newline at end of file
M secrets/work/pip.conf.agesecrets/work/pip.conf.age
diff --git a/secrets/work/pip.conf.age b/secrets/work/pip.conf.age
index 0929ea12827b9a270aea247ad0899265c8e0d9a8..d3efdf8dcf2095f2062b7453ed996330a485becd 100644
Binary files a/secrets/work/pip.conf.age and b/secrets/work/pip.conf.age differ
M secrets/work/pypirc.agesecrets/work/pypirc.age
diff --git a/secrets/work/pypirc.age b/secrets/work/pypirc.age
index ea2d082caaadd361d8fce8662a5a1a3ed5f0d0ce..d8b1d7bd21c93124a6d0a2f1f2487433c2e31023 100644
Binary files a/secrets/work/pypirc.age and b/secrets/work/pypirc.age differ