diff --git a/machines/cadie.nix b/machines/cadie.nix index 7c7ad69..5efed45 100644 --- a/machines/cadie.nix +++ b/machines/cadie.nix @@ -12,6 +12,7 @@ Notes: pkgs, lib, nodes, + modulesPath, ... }: let # name of the server, sets teh hostname and record for it diff --git a/machines/earth.nix b/machines/earth.nix index ba2be39..c844371 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -13,6 +13,7 @@ Notes: lib, nodes, inputs, + modulesPath, ... }: let name = "earth"; diff --git a/machines/galatea.nix b/machines/galatea.nix index 8b77265..57f5390 100644 --- a/machines/galatea.nix +++ b/machines/galatea.nix @@ -13,6 +13,7 @@ Notes: lib, nodes, config, + modulesPath, ... }: let # name of the server, sets teh hostname and record for it diff --git a/machines/gir.nix b/machines/gir.nix index d46d153..09141db 100644 --- a/machines/gir.nix +++ b/machines/gir.nix @@ -12,6 +12,7 @@ Notes: pkgs, lib, nodes, + modulesPath, ... }: let # name of the server, sets teh hostname and record for it diff --git a/machines/glados.nix b/machines/glados.nix index 33db5f6..2b1987e 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -13,6 +13,7 @@ Notes: Each user has roughly 20gb os storage pkgs, lib, nodes, + modulesPath, ... }: let # name of the server, sets teh hostname and record for it diff --git a/machines/hardware/RM001.nix b/machines/hardware/RM001.nix index 0ecf097..8d1ff3d 100644 --- a/machines/hardware/RM001.nix +++ b/machines/hardware/RM001.nix @@ -13,6 +13,10 @@ ./_base.nix ]; + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = []; diff --git a/machines/hardware/RM007.nix b/machines/hardware/RM007.nix index 18e8b35..1b9c130 100644 --- a/machines/hardware/RM007.nix +++ b/machines/hardware/RM007.nix @@ -13,23 +13,20 @@ ./_base.nix ]; - boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod"]; + boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = []; boot.extraModulePackages = []; + boot.loader.grub.device = "/dev/sda"; + fileSystems."/" = { - device = "/dev/disk/by-uuid/c48817e1-036f-49a7-adae-f63fc6c03cd5"; + device = "/dev/disk/by-uuid/a6c96ea1-1e66-4ad3-aef6-dd7131c83530"; fsType = "ext4"; }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/76CE-C65E"; - fsType = "vfat"; - }; - swapDevices = [ - {device = "/dev/disk/by-uuid/eced30bd-b785-43e0-a202-cdaee7e0f4f7";} + {device = "/dev/disk/by-uuid/5408b486-62ce-45d9-bca5-b458e68ef7f4";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/machines/hardware/_base.nix b/machines/hardware/_base.nix index 02a9a68..ae8b77f 100644 --- a/machines/hardware/_base.nix +++ b/machines/hardware/_base.nix @@ -11,10 +11,6 @@ with lib; let has_ip = interface: (length config.networking.interfaces."${interface}".ipv4.addresses) != 0; in { config = { - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - assertions = [ { assertion = lists.any has_ip interfaces; diff --git a/machines/kitt.nix b/machines/kitt.nix index ab313de..881d14b 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -12,6 +12,7 @@ Notes: pkgs, lib, nodes, + modulesPath, ... }: let # name of the server, sets teh hostname and record for it diff --git a/machines/optimus.nix b/machines/optimus.nix index 9e80047..9cdcfbb 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -13,6 +13,7 @@ Notes: lib, nodes, arion, + modulesPath, ... }: let # name of the server, sets teh hostname and record for it diff --git a/machines/skynet.nix b/machines/skynet.nix index 4992f5d..bbe5676 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -13,6 +13,7 @@ Notes: Does not host offical sites lib, nodes, inputs, + modulesPath, ... }: let name = "skynet"; diff --git a/machines/vigil.nix b/machines/vigil.nix index d1f8f1c..ba4d464 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -12,6 +12,7 @@ Notes: pkgs, lib, nodes, + modulesPath, ... }: let name = "vigil"; diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 210db08..16fc41c 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -12,6 +12,7 @@ Notes: pkgs, lib, nodes, + modulesPath, ... }: let # name of the server, sets teh hostname and record for it diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index c32b42e..dba3493 100644 Binary files a/secrets/backup/restic.age and b/secrets/backup/restic.age differ diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index 1885e43..7e2c928 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,15 +1,16 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA UrkmIZL5xSVVJ//LVygMsIVjv9axkiGHQzYXytxB2Vk -EEI30Szqp55TKBUpHGhE0kG9MpiJbRYUatwjxI4uarY --> ssh-ed25519 4PzZog z4kmVHgbEbTAUK2n77K4kPep1JVKeOjJ/DsBbllwC2I -u4Cj9g0oAD08yeAh86koOQpAOnkGwDTtgQDf/i6uvSc --> ssh-ed25519 5Nd93w YKp+mkt1IJCd3upuXavalOs06kADebHehoI4EyGSJ3U -lsDewdeBFBGj+SyJCp6Eay6Ym1oervcy4k4YqWdvwbc --> ssh-ed25519 q8eJgg Zp0cx2VSagfaLWVNcThlrZDSWh00t9x7NWFNH22f3Cw -Beddl2WC2hX0iUNRlYPx0tYofpVLuvpA+1QKeXL+Ln4 --> ssh-ed25519 mKj+iw ZekINCT2/NuDprvxYC2NYaMJpy7eWFxKjz6DxX1+1U4 -OvwkA2dpaJWek5JwUNr+QFJDVTWzNaTVE8cILb+lcFk --> `^ZVU'F]-grease -bX85oZ2Oeg ---- +N65SzHOFt+I2pi7AqBvcIqKrpwK929+E3BFJeIvuTI -oxĥ8!"{YC: fnmogCz?'0iܞ(o-a U#s烏Qޛ0}B|Z \ No newline at end of file +-> ssh-ed25519 V1pwNA GYSbmrWHb3NJM8MrBn2HllMdHydtXvFI/27yCuWzfFA +VyayuPCLPv6sHa0YWF8PWIolG3tNSCtB5NqM+r3z2lk +-> ssh-ed25519 4PzZog ya1j0N8sjUwYmLDVagfGAsQHXpaBg+qpVYtdALzJD3A +Ad+ORHJ3U9OyJ+LHygjXq2yLauhFzPCPuXNx5/onH0E +-> ssh-ed25519 5Nd93w Q/iHoCAyDoqevYj5vQJ4BW1ROVZ9hpO5uKCmUVmFEkE +ucG0grsbKinz8f3v9iUDF1gb/tYArlkTneYEZc+q2xs +-> ssh-ed25519 q8eJgg T2kEFkeVrZFYCVgndnCHvstE6mNYbvqVUgcT+2JEBm4 +sOmDUGEB6gYf90t/xhEDJORMBck3E4bK7yY8eCxh3Es +-> ssh-ed25519 3pl/Kw 9WflDj4m5z4+I8+0sLL/VmqEnW/AiMZHHk4CnCplJVU +OwVHhRty3o3noQZerE2drU4FyciJLrIfYy5qrlb3coU +-> @ZM|>r-grease TMr!(t +vnQfaw8 +--- 3xV2ejaWvmMXQNbKPaVo/UzBvnRu6JT+3BwuwS4iV60 +Wa Ï$[;tOtnb4F̙";uK>!r_x3 ["9 +MN.b1C>n8 \ No newline at end of file diff --git a/secrets/bitwarden/api.age b/secrets/bitwarden/api.age index 8d4755f..1d1fa4e 100644 Binary files a/secrets/bitwarden/api.age and b/secrets/bitwarden/api.age differ diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index ea53a6b..766e15e 100644 Binary files a/secrets/bitwarden/details.age and b/secrets/bitwarden/details.age differ diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age index 4e0140b..de3b0d3 100644 --- a/secrets/discord/ldap.age +++ b/secrets/discord/ldap.age @@ -1,24 +1,22 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA /ywPcnDv9MT97QtCtZyDgwiu6PFqQ9/syRsVKJljO38 -aqgfEOOFxZ9sAZa3ma6XX1NIHHfUgExflj/wh7kMln4 --> ssh-ed25519 4PzZog diUivY//pDD5pO5DAOF/hpVFiy+UEPt//T2wSsb2hFs -8KilVjO5UOGqXzJ3DJl0Squh1KCBDLQz6Fp4P/+senI --> ssh-ed25519 5Nd93w udWVov8JSaEni4WuLH4Cj+/+gDNrtVKL6FjMcR61wzs -K//4c4SpggpOITVg5QY0vzaedQJrnfKJwaWvZyknlI0 --> ssh-ed25519 q8eJgg qHWmUmpkVNF3SZEnAgBU7EgF+q9eErnz+MldT0wwigk -MsEPbJof97Kz4emhNkZG34RZvJeC4Ky9OkncElfHumI --> ssh-ed25519 IzAMqA +NXHK30PSHgyl0gPbO/AJTdveI2qcSbRSaJnWlPBHAE -iBpfcn9BHFXgoc70cQA5u9KqW2IdAveyXM9rV79J4c0 --> ssh-ed25519 uZzB3g wD73v6MdXeeLGhOZBQcSi6/VLVtGBRk4UOwaFAJtsVo -KvGoCprdnry2gHwzTS+BfQ09DWawKKoA1q9QO0Z/n7k --> ssh-ed25519 Hb0ipQ hqMralxzBAmwwVz2t5ySnk3skhxUGr+NXjbm+ZSKVVw -/MMOfDiQtiwoAD5DJxQnjpkpi/3C3DLXTSwUOkF6CSc --> ssh-ed25519 IzAMqA yNEnWzWwhJSNsT1C8aFIiOYb7xXlKLcNL2mhisWhhmQ -9C5Iny+zpFc8wzYO5EUltD0nkHpJl6ADvDkexgHQGtE --> inJ-grease ( $$4~2,{ gN -FFbbRchWkZG7edNSxcs5qfJzAc8u8jhjOTBttADj6gqrfbsvU+md/ttHShow4MBd -IttH8tmx/5VOiSdUHDpdlTabog ---- 0z74mEAmADrq8gy7L7n/JPWCE7HdBsXDBGkOHvlpHe4 -tTX^sϷ(D?'l7t^e1|},RⰟ0Xl%(d*;D{7eIHR; x$zCɶk= 83҆ej]1CÃΟ -%J -lSt.lU]SR $֩ \ No newline at end of file +-> ssh-ed25519 V1pwNA JqIKLU1UKFknLQneMlCs59bZKyrjDMvhbOsqsl9NIFM +HV8eXdPdMJvQrm6vnP3FutvGbuztQ4ETRGsULxmiGMg +-> ssh-ed25519 4PzZog FrhwG6liee5jPg965xkHysd0OMZnRDVmfqdEz8jYD18 +P8OoT3trQiuL4PnJV2JWELxultHPap6YymqakDAdkL0 +-> ssh-ed25519 5Nd93w bCXAZAZmawgAAIHX0RAODnMIIlYJwLulGECtyjLoIz8 +Z1+pBzLNhAxDaDxQMwrRxsbXr1MwMbzKCtNSXYbCty8 +-> ssh-ed25519 q8eJgg nSHpZSbnyCveRm+sZvP8Z8IEof9g0k6Q17o+9/UyA2k +5w40Dac5yxYNSk+5QVMgx/DMvJPas7tIAd6JpNw5Gc8 +-> ssh-ed25519 IzAMqA Uvi/qrCNBwpI4cmM/5ohct7QBf8urLa0uQ4RCJtN5BQ +rKauhSYfsECiZcYbCqV7sQiD2BZcZHGbzkmtiYl2vTQ +-> ssh-ed25519 uZzB3g x2II/DSbKNhfTfLU6b9qAwyc1tI9jvtnizthdfdQYFQ +zcSeSHC5rTB5U5Q6j1z9OH+F3AWVv3Fd/QdXD1GTnbA +-> ssh-ed25519 Hb0ipQ n+qTpgqN+LK/Dze2YM61owDyG+t6r/mxYnmzXynAvH4 +UedIPtFGJUf/2oJSceV7ONsBSAxrlup9p9uTcjO0tRg +-> ssh-ed25519 IzAMqA WRSBBb/anTu0MANFS8//WAS9ZZd3CMzVauPLmrsKUFY +vySQ01H9I0WbbzsTRcLkEqFr3jgr4odcD+OTzPHWAkQ +-> _J"6$ ssh-ed25519 V1pwNA UXCtW/uWXP002XutZRASnipkdx5BPvAptnkcA4u6Umk -Q0ZzUutU5YdWaJcJ/NTUZyi0nhxumtBNBESPIs/tRcM --> ssh-ed25519 4PzZog Wm/5lKSYqbx3kv41FUv8a3VmYnN8CQ38O7aARc7ekXg -l1xdP0knjaPaasyPG+QXeZiO8oD6bvuIOTUuq+RB3Yk --> ssh-ed25519 5Nd93w M1O7v80UVWi5AWv47/7AfjXupd2/a5pNVyKQVGLQ6n0 -F+lJEC85kp+XTUs0lPqxLoy8OQcVKG1FgtSrzGl2VAs --> ssh-ed25519 q8eJgg GKsdNuEvRm4smkUtmXVOiktmFb5xKQblDqV5X1hEwHs -96R4vPwy5qb5dp/9l2IyaaUPXQm2FCHpY7lS128+Y0w --> ssh-ed25519 uZzB3g oLsuYklLEY4+MOoZP2e8OzDFGwTdTZAhAP6ROSln/wY -x1KQ2S+lZkc7t7PzNOD8qgG1TjGSHZk37d0zIOddDeE --> ~R-grease -qDnx0FzAYcsTuP0CY2r1fFEYNQU3dET8595+uLkU3JZdzXzlRyCtQJ8/LiZRWc7K -uYyAtas8LQ ---- +/4k+N0aOwHHX43C3KPxml4pBLWGzcXVvZB4OSpVHSg -[ARuGGtF= \)HajD>N&Lgrg5ֆIT/Syc]eҮ4xQc3XGӬӰmPhwt#E,>"⬨\Uɺ{VVWt \ No newline at end of file +-> ssh-ed25519 V1pwNA 3xVivB4xipuNNBxyslXGV3vvTpoUW+dJ4ko3BCaL6Ww +uf0vupoHHgigGx35t1Ajx9bxW9lGgQNORZAFochgQ+c +-> ssh-ed25519 4PzZog G3nnCeYZJqLWtBZgx7vqSR5ox6pmSIdcQJG8/BM0VV8 +mueQh4e8Put1oRWhwNlv/lf1cbBE3Xhf9/lCp3I2x3s +-> ssh-ed25519 5Nd93w J/qlxbg/RBUiYF1gJe6LLa+9cjvwuaHKYVk9TJZdg0I +oJr8A8V4HSydQ79U9iURqY9OIDfVAsENhd7pjfQ1FF0 +-> ssh-ed25519 q8eJgg x4i4QZFi/UNkgH4y1o5hqxdXMcuZTBhUAO1W6MyopA4 +Im9X1zdVtlIPI6z+159OGF7sYh2y9LioHJkDUv1xMUc +-> ssh-ed25519 uZzB3g D6Pz5qaqqNS2vqyUviaN0Zr2HK63Zwibd1gVevmmf1U +SpDpOVWsB77efvOl3mU3rA7OFyvBfRyTUfE09thjosA +-> U!-grease < jUlw? Xr E4V +OlBVgV7g2GXh9W9SEVPo3vC9+8Nsh7Z8J8iHCLKbMUxwMsrwKjsr0n0npFMYSPDM +UB5FVlfP5MBRzTX/qoIVtD0MRQ +--- agZCfMDCN3L7aumr3nNsCD3wiXp6ESBnLJpiysnmffw +>z7WO2*8}JNzHWb/ kDP&.AY]}cY>-vĆmԹ n=qGO.iwFGҸ?0C@&kgw5uaNnL 3nŤa^uH y痁|ՠZvFnB \ No newline at end of file diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index a1db3dd..9d7081e 100644 Binary files a/secrets/gitlab/ldap_pw.age and b/secrets/gitlab/ldap_pw.age differ diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index 5bc243f..9acc865 100644 Binary files a/secrets/gitlab/pw.age and b/secrets/gitlab/pw.age differ diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index e36bd38..a8a2a88 100644 --- a/secrets/gitlab/runners/runner01.age +++ b/secrets/gitlab/runners/runner01.age @@ -1,16 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA EHlg17AzeBr3+X9U/43BhY8CeLKO1iV9hDfkJYjZ1AU -ZL7y/JAP3uDqQebxvCSagTfkHeA2Nt48gDl4mpxD9RM --> ssh-ed25519 4PzZog Qn4RRo6tvMzGtNJm+14kJlI45LZm9ELinKYbzqQo8wM -cpPFG1H6FnKm31du6HzOiNUTYGS1jhSce+DlcGJvPSw --> ssh-ed25519 5Nd93w bkSMYuu8lGE/5wkLYYC3tUNmjz40YQs4lBK+XTH1ljs -wmDJ9YywboBGKhEJLI39lV7rthL5PrtKt2oYoZec30g --> ssh-ed25519 q8eJgg nv5HLBPzmKzQ7S1heWZ/MKL+2ld7h5xX0ib6zwI74mw -CPrtsZvE5Lc9D2UQ1Um1MWf8kDH2dFUHB8t3TE7QpDs --> ssh-ed25519 yvS9bw xStD/2bXqHHyYkrlmslW3/F/YRFA1ZvFAUJLOkOidBU -4T6zJR4NoN5F6DWKWLCFw27iOCZAi2xXNzaTs4EVYFg --> `+rr(-grease 5%=!{ 56y@" -t3EQrEvbW0U9X81vIfmSDgavBImzJX966w ---- zufFrtdon0GkwCQKSR/8EOgcHVj54PE9ZwouYnLq1gE -8+eFJPz^|8WYߠ'ITP5.]: -xSRg}!d]$Ԯf l#O=P 1gBT4#9 \ No newline at end of file +-> ssh-ed25519 V1pwNA oqRPeFJJk0DjIFaRpQr8bi8CxXL7U+YJBi3nFQd3KXg +Fp4XHTJ03MedOdxWAUFJrpKyi43wjBncwI2CbQeoK30 +-> ssh-ed25519 4PzZog mxa3ro0hDH8i+rjM+pA18pO0TBgS1LutsHyKofrhzFw +Qf/WHL+Azf8cEP0eMO0/u2qBe9e7k6ZSMX7Rrb6EvyQ +-> ssh-ed25519 5Nd93w h19z0I935uv5ilOFo12/W7FXf68bv/VqvzV3DefTSnY +1LYZVgojvwP1uhyMukJslWb1KGZgkNmA9wum3mEhqwg +-> ssh-ed25519 q8eJgg ZV8/Lykez7O6kIOIFkB1O5vVearQPLtfdUGdmGP07CA +4xXHV/jHE+Qy3o7gadXeRtD2c8oj5i7AbknhDw4U/C0 +-> ssh-ed25519 yvS9bw OslG9MLs8PGBsSH44mYmdI8+AKdE0FWIsd8TKCGF3Tc +z4Gjp4tRzKyA2mP4vXEws6aGzhHz14/+qV6yPTPLP0M +-> &-grease h<( +jubJmEEW9zZW148P1SXFcn8GXCF746vCe4SqaZYykoB6uCLyCA +--- 67gsQxaQDev5B12g8OC3aQmPC2zQ5i3bKLZ1mLldNS0 +$j jY",G<)UO@Lt7%D2khe}Zs JcR٧6tϜ=mh-K{y4G d6+ \ No newline at end of file diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 843cdfd..5037d59 100644 Binary files a/secrets/gitlab/runners/runner02.age and b/secrets/gitlab/runners/runner02.age differ diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 2a2bd55..2361d6b 100644 Binary files a/secrets/gitlab/secrets_db.age and b/secrets/gitlab/secrets_db.age differ diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index 657413b..c80aa1e 100644 Binary files a/secrets/gitlab/secrets_jws.age and b/secrets/gitlab/secrets_jws.age differ diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index 6d6dc6d..c2671ae 100644 Binary files a/secrets/gitlab/secrets_otp.age and b/secrets/gitlab/secrets_otp.age differ diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index f75ff3d..cf0f4df 100644 Binary files a/secrets/gitlab/secrets_secret.age and b/secrets/gitlab/secrets_secret.age differ diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index 7aadbe1..2f6e586 100644 --- a/secrets/ldap/details.age +++ b/secrets/ldap/details.age @@ -1,25 +1,25 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA vBLzhFXIVLjx/E87Vv4rt7pT3xfHSFFoMLeXqQY36AQ -q061dSatWhvkmzYzoxxaMMNIADg2NcCRx3TvN26Vez8 --> ssh-ed25519 4PzZog T/XpNEvofWxgxrC+AOXQwmbebg9TkgMFo3hX2il7iCA -ThauQgVUuNQgTnwv6PnU3AsAjvDK94yTSF7uP7ATMjg --> ssh-ed25519 5Nd93w 2vLzrHNhbQWXCuMN7ryo8FnxKEl9sAG3xay+XYSX4SA -xf0/H6WYyx5CsGVP9H7jn7obFsIsI/6oS2bK6TNpY4M --> ssh-ed25519 q8eJgg IpkdkUjb9Re3AXCjMUZjy66o//SF7ccvRUG9KDOqDnE -GiS/ZBi+6LL1nNmSYF7g6jN6LQsbY4cUZolbrfGwxoU --> ssh-ed25519 IzAMqA Yk56RDAO5cSCz20SZEdlj5ZkDgism94rvHHOwQIyxnU -vy0wm5ltrgiq7dPTvtbfT5KvCzuq4Wqy/JhMMaF54TE --> ssh-ed25519 uZzB3g iM8/1r4t6WwhjVY+UC+Gv5MlqIaVuNy/k6HIba9Goic -kdIYCVAZi91WNX8wVv7P829itGeo3u8u9mVLp8PT3Cs --> ssh-ed25519 Hb0ipQ QM19G97+g9s92c1XHOWsuo7/ocVpp8SGk5pqjhF7Hmg -3OJB0vtimF/46tdXQIjPeBg3rpiuIbgPldk+dadm3Vk --> ssh-ed25519 IzAMqA iuluQkLa6gZXnK+ABjXFeP4/T3iAIDA56x4opXpKXDE -tRn6rsyspJV3PqQMgyawKBE150otAOO8w+ahM+HVaxs --> ssh-ed25519 IzAMqA evjiB4r6bHRKKTL5otFxulCMJ5IE1hoxGEalE2IBFWQ -Hhb2IIfax0rPKwrm0TcY1/GDCPne8NDujmygxHSu6g8 --> <=b-grease T"l EkF@3| g8 -RsgO4JwboDQlCD9CFUO096OtGlkBBEK93VdAfbAjmkeDzN2folUWjK87i3YexzeT -o9I ---- eyjVGczhvmjvkEvfjZy2RUH64a8lgw8saF567SPmnSw -"Hv( ?UѨ*&S*]о-o`< ->GfZf FKԶdFGe€*Ì,.L6s|.C{o^4w Hy"PZ'iAu&S< 4Y!e*ގÇ{5:})sڧaS0>.[I[,|~'Xy*s^D4yyK`BV!f⑲Ur AHKdBš \ No newline at end of file +-> ssh-ed25519 V1pwNA zMkh60zn/8ObLhvB8Q9/oaWBZXNzAwlU168GYcDY2ls +s0DPfyxCDaF5xcrVyronY4Q1UFuREAOYbLgh/WfQQtQ +-> ssh-ed25519 4PzZog /uCmpBSGpoTFizG2tdwLECh15H224qbprEeKezwrpgE +Z/6zknr6Rs8nIR6ThVLOfiUbSZW/5RBIhhroVH0WoCQ +-> ssh-ed25519 5Nd93w OW/04Qof1pyyzAItOCqdxZuoXKR6pJ7mA+GcwdJ2HGU +qQYtC4kmdsEY1JBnvYOEiHs6B90/vonIp5PXUyYuGpI +-> ssh-ed25519 q8eJgg uRy3C4oQzwfx1tLXJ0ockqYr02r3iU1aeO4QwA7Gpw0 +4yrdYFsLhvemSFeaF4dGWHFiSpZNOcv4JN22jBwzZx0 +-> ssh-ed25519 IzAMqA ymg0G4uO6nn0oVEG1QUbYiyETH4H8Noy1hfQJM3cwlE +eGmPkdVT5BFUOQ5qTxqw5AMUWeEoZMvDR32mGUwVaLU +-> ssh-ed25519 uZzB3g VKzSYHVMKmca2tp764NlCG3PwO6iqnu3foNkCEDe6Eg +Pbu+/EJGagbGn87yZo+wuXb3Bg4XuViRVHaxVkdl7uY +-> ssh-ed25519 Hb0ipQ L931VdnJ/ICVN4GZKQcw8J/dtg0N+mnjVIc94AmEPBc +R3jysqgnbUkRGbhgKkFRY1YljC66tIv4RG3jeS+nC4M +-> ssh-ed25519 IzAMqA Dje+6YLUNwxt0GlkA6bxqZpmDI9R0X4SqMDZ71OMdVc +pokqJIbeRTP/kQ9H1Wopbz03k3TPSSfYmr8yO8roT5c +-> ssh-ed25519 IzAMqA GIesGXjActWMv/mR5kaBQOf2U77ZRjTxpIVHWw/7UQU +jC5f8u+mRY7AS+yG/kv7J/nPcsrp3lZ7ZFWeUVf3+6A +-> p{-grease v;*pҪU T.zf28dCf r'6GbEz^ +as)+_0jÕ]XG-UV0{L U~+%"Z΍&ǔjsN*@ \ No newline at end of file diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index 60fc130..35114e4 100644 Binary files a/secrets/ldap/pw.age and b/secrets/ldap/pw.age differ diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 37f26c5..7f4cd79 100644 Binary files a/secrets/nextcloud/pw.age and b/secrets/nextcloud/pw.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e25ba05..42180ad 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -20,7 +20,7 @@ let wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEehcrWqZbTr4+do1ONE9Il/SayP0xXMvhozm845tonN root@wheatly"; kitt = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPble6JA2O/Wwv0Fztl/kiV0qj+QMjS+jTTj1Sz8k9xK root@kitt"; gir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINL2qk/e0QBqpTQ2xDjF7Cv4c92jJ53jW2fuu88hAF/u root@gir"; - neuromancer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7NRDOGzSO4XVEezMS/9pI3chKbOH0fw2aikLRvea2P root@neuromancer"; + neuromancer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEFAs6lBJSUBRhtZO3zGKhEIlWvqnHFGAQuQ//9FdAn6 root@neuromancer"; skynet = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAIFPXJswth8H1k8+zrg8vCnPkfG1hIIa3wR9DBmjpB5 root@skynet"; earth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMpvgQcvK7iAm0QrIp5qSvUJzDhOrSBN9MJn9JUSI31I root@earth"; cadie = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACcwg27wzzFVvzuTytcnzRmCfGkhULwlHJA/3BeVtgf root@cadie"; diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 965f5b5..f0ae4c7 100644 Binary files a/secrets/stream_ulfm.age and b/secrets/stream_ulfm.age differ diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index 5422757..710bd9a 100644 Binary files a/secrets/wolves/details.age and b/secrets/wolves/details.age differ