diff --git a/hosts/backwards/modules/git/gitconfig b/hosts/backwards/modules/git/gitconfig index 7610f2e..093916a 100644 --- a/hosts/backwards/modules/git/gitconfig +++ b/hosts/backwards/modules/git/gitconfig @@ -4,6 +4,3 @@ [url "git@github.com:"] insteadOf = https://github.com/ - -[url "git@codeberg.org:"] - insteadOf = https://codeberg.org/ diff --git a/hosts/backwards/modules/ssh/default.nix b/hosts/backwards/modules/ssh/default.nix index 214f184..4bce9ab 100644 --- a/hosts/backwards/modules/ssh/default.nix +++ b/hosts/backwards/modules/ssh/default.nix @@ -35,11 +35,6 @@ in identityFile = "/home/alex/.ssh/alex.backwards-git.ppp.pm"; }; - "codeberg.org" = { - hostname = "codeberg.org"; - identityFile = "/home/alex/.ssh/alex.backwards-codeberg.org"; - }; - "*" = { forwardAgent = false; addKeysToAgent = "no"; @@ -136,19 +131,6 @@ in owner = "alex"; group = "users"; }; - - "alex.backwards-codeberg.org" = { - file = ../../../../secrets/backwards/alex.backwards-codeberg.org.age; - path = "/home/alex/.ssh/alex.backwards-codeberg.org"; - owner = "alex"; - group = "users"; - }; - "alex.backwards-codeberg.org.pub" = { - file = ../../../../secrets/backwards/alex.backwards-codeberg.org.pub.age; - path = "/home/alex/.ssh/alex.backwards-codeberg.org.pub"; - owner = "alex"; - group = "users"; - }; }; }; } diff --git a/hosts/pinwheel/modules/git/gitconfig b/hosts/pinwheel/modules/git/gitconfig index 01687e2..7aa744e 100644 --- a/hosts/pinwheel/modules/git/gitconfig +++ b/hosts/pinwheel/modules/git/gitconfig @@ -5,8 +5,5 @@ [url "git@github.com:"] insteadOf = https://github.com/ -[url "git@codeberg.org:"] - insteadOf = https://codeberg.org/ - [url "gitea@git.ppp.pm:"] insteadOf = https://git.ppp.pm/ diff --git a/hosts/pinwheel/modules/ssh/default.nix b/hosts/pinwheel/modules/ssh/default.nix index 14f5488..6c30537 100644 --- a/hosts/pinwheel/modules/ssh/default.nix +++ b/hosts/pinwheel/modules/ssh/default.nix @@ -31,11 +31,6 @@ identityFile = "/home/alex/.ssh/alex.pinwheel-github.com"; }; - "codeberg.org" = { - hostname = "codeberg.org"; - identityFile = "/home/alex/.ssh/alex.pinwheel-codeberg.org"; - }; - "git.ppp.pm" = { hostname = "git.ppp.pm"; identityFile = "/home/alex/.ssh/alex.pinwheel-git.ppp.pm"; @@ -99,19 +94,6 @@ group = "users"; }; - "alex.pinwheel-codeberg.org" = { - file = ../../../../secrets/pinwheel/alex.pinwheel-codeberg.org.age; - path = "/home/alex/.ssh/alex.pinwheel-codeberg.org"; - owner = "alex"; - group = "users"; - }; - "alex.pinwheel-codeberg.org.pub" = { - file = ../../../../secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age; - path = "/home/alex/.ssh/alex.pinwheel-codeberg.org.pub"; - owner = "alex"; - group = "users"; - }; - "alex.pinwheel-git.ppp.pm" = { file = ../../../../secrets/pinwheel/alex.pinwheel-git.ppp.pm.age; path = "/home/alex/.ssh/alex.pinwheel-git.ppp.pm"; diff --git a/hosts/tadpole/modules/ssh/default.nix b/hosts/tadpole/modules/ssh/default.nix index 0f217c0..55d5d37 100644 --- a/hosts/tadpole/modules/ssh/default.nix +++ b/hosts/tadpole/modules/ssh/default.nix @@ -28,11 +28,6 @@ in identityFile = "/home/alex/.ssh/alex.tadpole-git.ppp.pm"; }; - "codeberg.org" = { - hostname = "codeberg.org"; - identityFile = "/home/alex/.ssh/alex.tadpole-codeberg.org"; - }; - "*" = { forwardAgent = false; addKeysToAgent = "no"; @@ -114,19 +109,6 @@ in owner = "alex"; group = "users"; }; - - "alex.tadpole-codeberg.org" = { - file = ../../../../secrets/tadpole/alex.tadpole-codeberg.org.age; - path = "/home/alex/.ssh/alex.tadpole-codeberg.org"; - owner = "alex"; - group = "users"; - }; - "alex.tadpole-codeberg.org.pub" = { - file = ../../../../secrets/tadpole/alex.tadpole-codeberg.org.pub.age; - path = "/home/alex/.ssh/alex.tadpole-codeberg.org.pub"; - owner = "alex"; - group = "users"; - }; }; }; } diff --git a/secrets/backwards/alex.backwards-codeberg.org.age b/secrets/backwards/alex.backwards-codeberg.org.age deleted file mode 100644 index 3cca77d..0000000 Binary files a/secrets/backwards/alex.backwards-codeberg.org.age and /dev/null differ diff --git a/secrets/backwards/alex.backwards-codeberg.org.pub.age b/secrets/backwards/alex.backwards-codeberg.org.pub.age deleted file mode 100644 index 6e28844..0000000 --- a/secrets/backwards/alex.backwards-codeberg.org.pub.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Pu0HWg eK/pdhmsF334C7rSuYsRnXCtenmlT2hOXpfW5CQEARY -odooTLu8ZQUZjCeVPZYOA6Vgb470cosE1Q1iBkE9Kc0 --> ssh-ed25519 +oNaHQ nJU52SSZ9v3+8NuXR6coSHosEYrs7T8GeZYzV/quOU4 -IV5YduRGdJLy93gVwfYmwvldRXoXXX3QvAsH3ljBadw ---- 3gJg9NFmqHCrgcvgnYOeSY1H4klPEyzI+07IlKCOItc -\5ܤ}yA_J {p +ꜞ+JeLW 7=S*ɐ}fPқ!X73\`SizW<4PbZIhH61'ybmCmE \ No newline at end of file diff --git a/secrets/pinwheel/alex.pinwheel-codeberg.org.age b/secrets/pinwheel/alex.pinwheel-codeberg.org.age deleted file mode 100644 index e1d6066..0000000 Binary files a/secrets/pinwheel/alex.pinwheel-codeberg.org.age and /dev/null differ diff --git a/secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age b/secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age deleted file mode 100644 index a75f0d7..0000000 --- a/secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 vxPbZg IKvbUY2e3wCrphoiFOKJYxyWvj4DjMlW1yv1VrZ/kBk -8sS9cNUsb8NtPHD5iKx8dfcgKxLObcZDfWJohduWEl4 --> ssh-ed25519 +oNaHQ nIY6nLvP+HIUlCumO/MxGoBGfutwfwv4zlvsLCuu2C8 -eFqY9TaVsYoKulu5e++WI1zYzoBinEVUJt/lDan+ttQ ---- 67CbghCaK4yhjqH6vHEUzfeFth9PmX8h+qTKHocKGzk -iF0V517~w&մ>1b化gc6Fbsn5hk6W?0@ |C mG1. -0#wA]!s% p \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 31067ed..c3e6df1 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -17,8 +17,6 @@ in { "pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ]; "pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ]; - "pinwheel/alex.pinwheel-codeberg.org.age".publicKeys = [ pinwheel alex ]; - "pinwheel/alex.pinwheel-codeberg.org.pub.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-git.ppp.pm.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-git.ppp.pm.pub.age".publicKeys = [ pinwheel alex ]; @@ -45,16 +43,12 @@ in { "backwards/restic-password.age".publicKeys = [ backwards alex ]; "backwards/restic-cloud-sync-key.age".publicKeys = [ backwards alex ]; "backwards/restic-cloud-sync-repository.age".publicKeys = [ backwards alex ]; - "backwards/alex.backwards-codeberg.org.age".publicKeys = [ backwards alex ]; - "backwards/alex.backwards-codeberg.org.pub.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.pub.age".publicKeys = [ backwards alex ]; "backwards/wireless-network-secrets.age".publicKeys = [ backwards alex ]; "tadpole/root.tadpole.age".publicKeys = [ tadpole alex ]; "tadpole/root.tadpole.pub.age".publicKeys = [ tadpole alex ]; - "tadpole/alex.tadpole-codeberg.org.age".publicKeys = [ tadpole alex ]; - "tadpole/alex.tadpole-codeberg.org.pub.age".publicKeys = [ tadpole alex ]; "tadpole/alex.tadpole-git.ppp.pm.age".publicKeys = [ tadpole alex ]; "tadpole/alex.tadpole-git.ppp.pm.pub.age".publicKeys = [ tadpole alex ]; "tadpole/gitea-dbpassword.age".publicKeys = [ tadpole alex ]; diff --git a/secrets/tadpole/alex.tadpole-codeberg.org.age b/secrets/tadpole/alex.tadpole-codeberg.org.age deleted file mode 100644 index e7262a4..0000000 Binary files a/secrets/tadpole/alex.tadpole-codeberg.org.age and /dev/null differ diff --git a/secrets/tadpole/alex.tadpole-codeberg.org.pub.age b/secrets/tadpole/alex.tadpole-codeberg.org.pub.age deleted file mode 100644 index 843b43f..0000000 Binary files a/secrets/tadpole/alex.tadpole-codeberg.org.pub.age and /dev/null differ