diff --git a/.git-age.yaml b/.git-age.yaml index 997548f4caea9807dcbfa36287098cdc6dd2bdab..d706490e027d9821d44691bfef9840f38fcc5200 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -1,6 +1,6 @@ apps/gui/firefox/work.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 -machines/common/cifs.nix: +machines/chai/cifs.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 machines/dragonwell/dex.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index bbc97fa42c1f6d7afaf88e58bfdb63e79ac49ab2..afc1751bdb9012673c9509044ad8e268ce26e400 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ # Age apps/gui/firefox/work.nix filter=git-age diff=git-age -machines/common/cifs.nix filter=git-age diff=git-age +machines/chai/cifs.nix filter=git-age diff=git-age machines/dragonwell/dex.nix filter=git-age diff=git-age diff --git a/flake.nix b/flake.nix index 50b132e138ceaad1dcc8fe9e812193860cabb3e4..42d7e07835f4b024e58a4676381caca1c9c52f2d 100644 --- a/flake.nix +++ b/flake.nix @@ -214,15 +214,6 @@ ./machines/chai ]; }; darwin.follows = ""; - inputs = { - system = "x86_64-linux"; - modules = - workModules - ++ [ - ./machines/earlgrey - ]; - }; - darwin.follows = ""; nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db"; system = "x86_64-linux"; modules = diff --git a/machines/chai/cifs.nix b/machines/chai/cifs.nix new file mode 100644 index 0000000000000000000000000000000000000000..194f004730ef6fbc807787b4c893f375f4ddb7fc Binary files /dev/null and b/machines/chai/cifs.nix differ diff --git a/machines/chai/hardware.nix b/machines/chai/hardware.nix index d6aaec73129f2ff6bb9694f9e8d14c9f7130bfa3..ea5a40b4f3023e6ca01fa606e7ba59f276b47610 100644 --- a/machines/chai/hardware.nix +++ b/machines/chai/hardware.nix @@ -4,7 +4,7 @@ lib, modulesPath, ... }: { - imports = [(modulesPath + "/installer/scan/not-detected.nix") ../common/cifs.nix]; + imports = [(modulesPath + "/installer/scan/not-detected.nix") ./cifs.nix]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; diff --git a/machines/common/cifs.nix b/machines/common/cifs.nix deleted file mode 100644 index 9a72e86d7350754b2c22e6433a4aa1eb28d4b224..0000000000000000000000000000000000000000 --- a/machines/common/cifs.nix +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> X25519 c4mfhguoo3d3c4S2+D6rfLc/iOWDyiZSgcx7iHGB00Y -0GGSiSO6bQ6YTYGv+RC75Azwndft793YbqeMNSVjPjU ---- FzPgP+ISlehyKEs8+LJioURo7uPsevy8xrWQxcssF7A -1S:Qu)M+%/DNQu_-Vʃ+& }hbWñ`y6Z}m"|AI b ?Ļ\ck_,ҎŏfBsOޖeTXֱo3siG *!TVBɐ4Hr9Yͣ*1v -" ҫw-yKiTg{$}q'| ^\~7j_Q " [ +[,i='Lv~ 66+QSau@G$0N"U \ No newline at end of file diff --git a/machines/earlgrey/default.nix b/machines/earlgrey/default.nix deleted file mode 100644 index 5cba3994a98496754b7cc8f7227dbe63a199ee18..0000000000000000000000000000000000000000 --- a/machines/earlgrey/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{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"; -} diff --git a/machines/earlgrey/hardware.nix b/machines/earlgrey/hardware.nix deleted file mode 100644 index aac7688fdbbfc1dda2869cfac580272f6bb01135..0000000000000000000000000000000000000000 --- a/machines/earlgrey/hardware.nix +++ /dev/null @@ -1,40 +0,0 @@ -# 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..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; -} diff --git a/secrets/personal/dex-tailscale.age b/secrets/personal/dex-tailscale.age index 1f45c0f0a2696da1d72b8304388334bcb13780ea..156373e84098b5b96d7ff671433ae3bd5530ce6b 100644 --- a/secrets/personal/dex-tailscale.age +++ b/secrets/personal/dex-tailscale.age @@ -1,10 +1,16 @@ age-encryption.org/v1 +-> ssh-ed25519 E8j6/g 3YEltKNS2GZeGUIGuhVxQAs5bv5TpHtExTDGLRE46XU +age-encryption.org/v1 -> ssh-ed25519 E8j6/g HFKa0iZ+3BjzgXcWImvZ8pDxqSXaU3ArmfUzHSDWUAc +age-encryption.org/v1 LcyBupbwCAdyLLoDDpGSSUvTwVsl6dfWKsWuG58FKR4 +age-encryption.org/v1 -> ssh-ed25519 f31uNA en9whJKk3OymAdjK4t6cAK9ll1rOw0H+MFyJ459zNQk +age-encryption.org/v1 GcTcl5Dv66eP85q5ckECROc9KlWLoL/q1BppeeMtnIA +age-encryption.org/v1 -> lDpUBe<-grease )|9 T3 [E/3N_c- +age-encryption.org/v1 tONI1/ErGae8xx/kGH/5GGjQ1Wft/pWkmeql/hWYhkvHuaJiIZsHcNYdPa3QWdA9 +age-encryption.org/v1 gajB9zwiEB9k ---- GVU3qkwpyhO1Lb+l/c9VNedBZir5u4TQwHESpMzWnv4 -2 2 #h]`C B,e44=\C Ne ~)6 \ No newline at end of file diff --git a/secrets/personal/dex.age b/secrets/personal/dex.age index a8c3506b71c13d27ccdbbafbd45b11f7a9898b46..dd60748e75d59dfc30490cbcbec5cf5f3c3b920a 100644 --- a/secrets/personal/dex.age +++ b/secrets/personal/dex.age @@ -1,9 +1,15 @@ age-encryption.org/v1 +-> ssh-ed25519 E8j6/g Oy3ytCKUvsVd+MZ1QmGFcqCK1I7gPv5W2GpTY0IKllY +XYnQcYAWnHAq0J7/9gS4KPEgYveAxmHjq9I8gexUZ58 +age-encryption.org/v1 -> ssh-ed25519 E8j6/g lRoy/4CSW9cQCzG6LdrZNgxfxkxqIP4vqWVM2BFioWc +age-encryption.org/v1 Td8VAfUM0WiNBobkFt/G6C9rto4RownaCBIFsoNPAdk +age-encryption.org/v1 -> ssh-ed25519 f31uNA zSrq8vvb6m4OgM3SgckfkjKBywsAXWp+l8VMa5eoHx0 +age-encryption.org/v1 YGV5W9NeGVWTrld7WnpymtZxf+Fjszr1By/TFs+CSk4 +age-encryption.org/v1 -> DV5h_-grease B' +age-encryption.org/v1 6apd32tU7QBcqxlsGxzlY6rVghplLDqi2gr21QS9BSxoqwH4 ---- TuBTBf9xCHgxy8hMR7qi5m89kqLlWkEIf1baUho7qkw ->:2}dԁN}1WPUaU 3 5_`\^AO%i`J84{o5}pX!dwc8ƑZvN3pz8C&@( \ No newline at end of file diff --git a/secrets/personal/restic-env.age b/secrets/personal/restic-env.age index 52128ca4c7b4fa974c14a301fd1ee4f534e75a66..19ba73de7fa6eed7abaf5fd62e0a3a3ba5a5f7fd 100644 Binary files a/secrets/personal/restic-env.age and b/secrets/personal/restic-env.age differ diff --git a/secrets/personal/restic-pass.age b/secrets/personal/restic-pass.age index 50ed4610ddca908e1fc4e3eb19c1855918f7a56d..81a2dd54e3abb8179e87c5cdce5162df0ca531ac 100644 --- a/secrets/personal/restic-pass.age +++ b/secrets/personal/restic-pass.age @@ -1,10 +1,16 @@ age-encryption.org/v1 +-> ssh-ed25519 E8j6/g vJ44QXH609Gdz21eaPJYfSl7LnGYIlH+OyXsgqN7FVc +age-encryption.org/v1 -> ssh-ed25519 E8j6/g 8G6eRsnRs0V6UU0haRdsrDTdIPPkCs4Za28QPIggNDo +age-encryption.org/v1 MUrKL5W5C+jp3Wf9YTqcTnPlDPd6K1ehOQpvistc9FA +age-encryption.org/v1 -> ssh-ed25519 f31uNA WbcuiNfaVxct1uZnMi9ZLcmNkTrcovcnrnRn4P1wHm8 +age-encryption.org/v1 IWwi8uZjA5k0kr07/SlC1GOzV85XjvHJqeTzWX4CWA8 +age-encryption.org/v1 -> gnOdn-grease ]2DTmO^ N6 q=f%DXM +age-encryption.org/v1 B0OfIBLLfNo30z1AqfUBNoH6WryEUdkTFEQDllC1wFX/gZrEcjBRHzR6Onmh9LUx +age-encryption.org/v1 0VmEMsacAXgdQS4d4/zZNeeHc4Gm7AjfirsWUUD9aoc ---- 9IyFn99ehW6OUklLg5B+pZDoVCEEKu5/nXehgIlZlJ4 -"_"+10C͆pbPvfB tb4zP \ No newline at end of file diff --git a/secrets/personal/restic-repo.age b/secrets/personal/restic-repo.age index 82a027c3ab1e6f2fd4277bb02b5fc11987869b2d..b88c9510a561b86496eea462302eae6275594ced 100644 Binary files a/secrets/personal/restic-repo.age and b/secrets/personal/restic-repo.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 01c1bd64a8e5669c5b3c59f806ddf24a8d8e2ac3..ae3e5b2acce8e5e2dc5fa5fe3cdb473e1a65aae4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -4,11 +4,10 @@ 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 earlgrey masala dragonwell]; + all = [jolheiser matcha genmaicha sencha chai masala dragonwell]; in { "shared/cachix.age".publicKeys = all; "shared/ssh-config.age".publicKeys = all; @@ -17,13 +16,13 @@ "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 earlgrey masala]; - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; + matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; let - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; + matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; + matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; + "work/cifs.age".publicKeys = [jolheiser chai masala]; "personal/restic-env.age".publicKeys = [jolheiser dragonwell]; "personal/restic-pass.age".publicKeys = [jolheiser dragonwell]; "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; diff --git a/secrets/shared/cachix.age b/secrets/shared/cachix.age index 36c7b4928c64a723e44c782cf248208bc7f2bacf..cd68a719f6e588e3790a833333916e118b045657 100644 Binary files a/secrets/shared/cachix.age and b/secrets/shared/cachix.age differ diff --git a/secrets/shared/gist-pw.age b/secrets/shared/gist-pw.age index 33346f0352553d6f21989944e4cfd4caaa5f5b57..620d61b0e39a810f3e337b6fa7ade6df05a731b2 100644 --- a/secrets/shared/gist-pw.age +++ b/secrets/shared/gist-pw.age @@ -0,32 +1,37 @@ age-encryption.org/v1 -> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE 6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI +-> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE -> ssh-ed25519 xUMv2w SELe390ELo7Y2YPkSx8p9/2olfhZWlxDcwfwnFS3QVc +-> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE t52BsiM/buEaR7hWJ1p1Q5EQ0mJuCfnPhE2LhgGr0hM +-> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE -> ssh-ed25519 ph+d2g OIIYXOu0MV8YxSsp7f2ZYe7ubC3oMj6Kgk+HNPV74Bs +-> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE +TzAaEVFk9+EFSVr/W/8WVUG+Heoc490oVOznXhg9Cg +-> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE -> ssh-ed25519 Cuo7gw Nra5cfKPzuZLNX2XfNv+3OwLdCTZO1FUU/KbBlVW5VY +-> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE r5tMoKRbhUm1TIVhycsMfrtzpJlDrT8UktCnXl8gZ7A -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI age-encryption.org/v1 -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI -> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI 6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI -> ssh-ed25519 xUMv2w SELe390ELo7Y2YPkSx8p9/2olfhZWlxDcwfwnFS3QVc -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI t52BsiM/buEaR7hWJ1p1Q5EQ0mJuCfnPhE2LhgGr0hM -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI -> ssh-ed25519 ph+d2g OIIYXOu0MV8YxSsp7f2ZYe7ubC3oMj6Kgk+HNPV74Bs -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI +TzAaEVFk9+EFSVr/W/8WVUG+Heoc490oVOznXhg9Cg -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI -> ssh-ed25519 Cuo7gw Nra5cfKPzuZLNX2XfNv+3OwLdCTZO1FUU/KbBlVW5VY -age-encryption.org/v1 +6+pwnJukJINFvaufsR4U5h6gix0oucJfBZb1VHiobnI r5tMoKRbhUm1TIVhycsMfrtzpJlDrT8UktCnXl8gZ7A --> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE +-> ssh-ed25519 xUMv2w SELe390ELo7Y2YPkSx8p9/2olfhZWlxDcwfwnFS3QVc --> ssh-ed25519 E8j6/g yOzrQhCHvSIqeiuN3L//sGC1r0nJuxCS75P+fICuiEE +-> ssh-ed25519 xUMv2w SELe390ELo7Y2YPkSx8p9/2olfhZWlxDcwfwnFS3QVc age-encryption.org/v1 -B}z[U/];$+/5۫؛{e?`0N \ No newline at end of file diff --git a/secrets/shared/git-send-email.age b/secrets/shared/git-send-email.age index 65f9ad9c9ba348fb8f6760ea26de4bb5de10b264..27c47d7276021083e282e66d266e35d09b889d37 100644 Binary files a/secrets/shared/git-send-email.age and b/secrets/shared/git-send-email.age differ diff --git a/secrets/shared/irc-pw.age b/secrets/shared/irc-pw.age index b19da76ce13f11d0f21accd6dfb174b7484f3c54..1a1d704620e3dcda46224d567ba2f39a6b1226eb 100644 Binary files a/secrets/shared/irc-pw.age and b/secrets/shared/irc-pw.age differ diff --git a/secrets/shared/spotify.age b/secrets/shared/spotify.age index 1e06b23c0d4779a2702a0a4a3b63783a583991c2..3914e8eb31d27ea8ab9e8e604bdc5037909c7e2a 100644 Binary files a/secrets/shared/spotify.age and b/secrets/shared/spotify.age differ diff --git a/secrets/shared/ssh-config-work.age b/secrets/shared/ssh-config-work.age index 0642407b833b48e450776429fff2d157821fcb07..d5ec7a25a929d1795fd2fec7aed3b190a6603856 100644 Binary files a/secrets/shared/ssh-config-work.age and b/secrets/shared/ssh-config-work.age differ diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age index 5e8bc36d8ed2d6c8a6f231f2f208c2e34655bb8a..4dfdc0aa30e59eb1da34ad02c414853b09d0759b 100644 Binary files a/secrets/shared/ssh-config.age and b/secrets/shared/ssh-config.age differ diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age index 1685bd97ce71d47059588b1fbe46c7a195dc3ed0..cb429333c42abb9decd771bb231989c9950ee11e 100644 --- a/secrets/work/cifs.age +++ b/secrets/work/cifs.age @@ -1,18 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w -PUD5yWZhyDKglSKqQI2naYyWghNHCAX1+6zFtFm3rbU --> ssh-ed25519 jo1MPA n/47VcYbxc8PXWp9ojHqndHZx9+lGX+ZYzyBn5johQ4 +age-encryption.org/v1 VLlK88iztE78ZyAXctkxebOYQaIsR5YR2XAXTVTDfIg +age-encryption.org/v1 -> ssh-ed25519 RqjBDA QEBalTZhf7bYvjKup5rjIMdbzarQ/KxPPznCr1OGr1I +age-encryption.org/v1 IQ82Z/0AlZkdTG3XUEiLEKJ9acUAp3LGRj9Xihf7oZg +age-encryption.org/v1 -> ssh-ed25519 eyVEZQ XIeYz+BBM3Xrjup2DtpcebrH2OA4EkhVgR097RCANS8 +age-encryption.org/v1 NST1VSTdhHHbE1Jv4A/rMQ/X9hvEam+E/5iAjVpHDSo -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w age-encryption.org/v1 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w -> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w PUD5yWZhyDKglSKqQI2naYyWghNHCAX1+6zFtFm3rbU -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g KsxAe6APMEcXUPMbuRxbdnZOwI9RYZfGtcsjBa1Zw1w -> ssh-ed25519 jo1MPA n/47VcYbxc8PXWp9ojHqndHZx9+lGX+ZYzyBn5johQ4 +'ݪLHrcF^W*Q-I(L)f B!t6.?;sI'eel`<>ej0!Y+߫\s \ No newline at end of file diff --git a/secrets/work/netrc.age b/secrets/work/netrc.age index 9db4c57f7277f0b5f9c2d86dcae750521de2c569..9b4b4740376e6172fd8baa13d4bbc39735dc0064 100644 --- a/secrets/work/netrc.age +++ b/secrets/work/netrc.age @@ -1,18 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic -+LBspn84xqRv9Jsa+H3gLJZNGWE9lsFhVcoUllIGtYI --> ssh-ed25519 jo1MPA PEcjnR7QhqcjARicpeMagvQMRX1Xhc4puGn07bmkMwE +age-encryption.org/v1 0rIMuM1McW6lO9mt00krt3+OxpRv0+HXltHzkBBKP2A +age-encryption.org/v1 -> ssh-ed25519 RqjBDA bMrSJvi7XfsNdEbTM4Qz38xB1ydx10EEyXGThqqRUiQ +age-encryption.org/v1 FJQwSRYGx7ZcuynYl7Rebb52EtDrdZP6sQIfB9pMfx0 +age-encryption.org/v1 -> ssh-ed25519 eyVEZQ zG+7GBK66PMEzhpuovR0sRPsTxW5RwRfQchmlZSTZXQ +age-encryption.org/v1 4PeSJavY8qloTKkAxKeyj5CJ3V1T9ZHErIiKrIkFFMk -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic age-encryption.org/v1 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic -> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic +LBspn84xqRv9Jsa+H3gLJZNGWE9lsFhVcoUllIGtYI -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g XNekqB8IluL0bwSKawwWZLM9xPgDXXvFGFImXhxupic -> ssh-ed25519 jo1MPA PEcjnR7QhqcjARicpeMagvQMRX1Xhc4puGn07bmkMwE +gnHZ2lYzbhr T8}um3yiCl5aJd%لPO}$w +,ID +^7-X}b'#d{^j:0v4pO/wNp k \ No newline at end of file diff --git a/secrets/work/pip.conf.age b/secrets/work/pip.conf.age index c7758d4c9bd93db09449019d3d5ffafd4846b0b8..d79b6f9b30dde9fd2754463c2baf9b42e37e2406 100644 Binary files a/secrets/work/pip.conf.age and b/secrets/work/pip.conf.age differ diff --git a/secrets/work/pypirc.age b/secrets/work/pypirc.age index 67d3fc72b0bc6fc6d2121e34812e857df7668ac0..0952e0d302732dfec7302427bb79229039caf935 100644 Binary files a/secrets/work/pypirc.age and b/secrets/work/pypirc.age differ