summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2026-03-19 14:31:47 +0100
committeradikro <adikro@disroot.org>2026-03-19 14:31:47 +0100
commit9f58250cacc5a42a7d251eaa7d845ce143b98cfb (patch)
treefa8e4a3fd38ca8df30dd6b9af266bb6586832b48
parent9fffd3d5e1b6b554c5a06f2fc15190e8ee3a2f66 (diff)
ssh fixes
-rw-r--r--.sops.yaml3
-rw-r--r--flake.lock60
-rw-r--r--os/core/ssh.nix2
-rw-r--r--secrets.yaml71
4 files changed, 56 insertions, 80 deletions
diff --git a/.sops.yaml b/.sops.yaml
index c797ba1..b73f940 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,5 +1,4 @@
keys:
- - &admin_gpg EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94
- &admin_age age1g9xlgzxxvgfgq6a05jxy2e7zf8t4qgw6wjpjmvyhvzlnu8fmye6s8qx702
- &host_szpont age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww
- &host_thinkpad age12htxy05mlkaqx7q6m5wufkqnnvhmhe4nfsr5ljlwkdk0u59f7ujq7537fw
@@ -15,5 +14,3 @@ creation_rules:
- *host_thinkpad
- *host_pendrive
- *host_laptop
- pgp:
- - *admin_gpg
diff --git a/flake.lock b/flake.lock
index ae57a7c..f42c97d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -275,11 +275,11 @@
]
},
"locked": {
- "lastModified": 1773810247,
- "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=",
+ "lastModified": 1773898372,
+ "narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7",
+ "rev": "ecf019baf47df009937b5f8c4604cee10f410a76",
"type": "github"
},
"original": {
@@ -375,11 +375,11 @@
]
},
"locked": {
- "lastModified": 1773792437,
- "narHash": "sha256-xjL22RjFqfN3D4dglBt0PTEFLl1rvN60f6LtHX8kQJs=",
+ "lastModified": 1773878753,
+ "narHash": "sha256-yfJ3Vj0kqvJ+F5E1QtGfYgCFDncEe2vmYcDK+ofUrmQ=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "7f54fc34e0ff994dff6494f074979ad6e4a0eba4",
+ "rev": "14408dc1b61b6112a79d4b2e5e10e658e18bd554",
"type": "github"
},
"original": {
@@ -391,11 +391,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1773789001,
- "narHash": "sha256-V4hVxVeHk+ZdlaRpssBu6q9G3++WwxBco5MZVTL9E/I=",
+ "lastModified": 1773878059,
+ "narHash": "sha256-2AygdMsagzsmMZfmayQ8Zr8M/Ac8lGiCm+eXL2/+TKw=",
"owner": "neovim",
"repo": "neovim",
- "rev": "1d776d909f54dd6298710d50f72e25972b6755bf",
+ "rev": "19715e6e8a7145c8d4da39c9ebc2b09da5be74e7",
"type": "github"
},
"original": {
@@ -416,11 +416,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1773848336,
- "narHash": "sha256-fWAuQtxkD6j6KP7xtUgJZzVfRYLxhTJ1DeBG4vAFO7Q=",
+ "lastModified": 1773889880,
+ "narHash": "sha256-cu23CGP+mD2wKPKaoGM7evZ1dXfjd+cjryqqqx2HloE=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "ea96ac8a3effd1eb372f57b782c857d391c48439",
+ "rev": "63767d4572eb2e3da5e68f68de77d8f2cdeca8dd",
"type": "github"
},
"original": {
@@ -472,11 +472,11 @@
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
- "lastModified": 1773794880,
- "narHash": "sha256-Ta6qtvm9JFGvJBQMCi/MtWsC7JT0fgUFQxgFg0hqQoo=",
+ "lastModified": 1773908601,
+ "narHash": "sha256-pQH/gHrWGWryi7U2zGfmfQM0sj3td55P+6xha6WNzKw=",
"owner": "KaylorBen",
"repo": "nixcord",
- "rev": "6a503af15e1cb2b0b2e4acdc7c7e8f25ab6251a2",
+ "rev": "a0510db678515727f3e10b3dfcce7709f483aa9c",
"type": "github"
},
"original": {
@@ -581,11 +581,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1773734432,
- "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
+ "lastModified": 1773821835,
+ "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
+ "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"type": "github"
},
"original": {
@@ -597,11 +597,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1773734432,
- "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
+ "lastModified": 1773821835,
+ "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
+ "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"type": "github"
},
"original": {
@@ -655,11 +655,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1773866737,
- "narHash": "sha256-gWrYAWSEUzFD1aig3z+zeFCqHrfjkm0Tj66eZmCIcVA=",
+ "lastModified": 1773916145,
+ "narHash": "sha256-mpyGbs7cIgPXJzwojlOSXK19/7BJIXwjn4qK3UjeaoY=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "1a83b2d5d9a23041f9ddb170a21cefb8f02e0e45",
+ "rev": "26cd386170669ed6a79f44d1b618db6c79bd7b69",
"type": "github"
},
"original": {
@@ -821,11 +821,11 @@
]
},
"locked": {
- "lastModified": 1773698643,
- "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=",
+ "lastModified": 1773889674,
+ "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044",
+ "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5",
"type": "github"
},
"original": {
@@ -953,11 +953,11 @@
]
},
"locked": {
- "lastModified": 1773863913,
- "narHash": "sha256-RMHYN+xPD02UyDKp/ZlbzDypzd8dugLTJLl3CBqcNV0=",
+ "lastModified": 1773910498,
+ "narHash": "sha256-JwXYw4phtJ/PljzxX46NQROcaUqoloBlXOZ7PxFoYsg=",
"owner": "Alexays",
"repo": "Waybar",
- "rev": "b77b1818f63492870f2e467d913d90d23d1c4c14",
+ "rev": "6cb68737e64a851797a26566c7859b53eb2fd8bc",
"type": "github"
},
"original": {
diff --git a/os/core/ssh.nix b/os/core/ssh.nix
index 6f5cf51..52b7c32 100644
--- a/os/core/ssh.nix
+++ b/os/core/ssh.nix
@@ -23,7 +23,7 @@ in
};
};
- programs.ssh.startAgent = false;
+ programs.ssh.startAgent = true;
services.gnome.gcr-ssh-agent.enable = false;
users.users.${username}.openssh.authorizedKeys.keys = [ "${keys.main} adikro@disroot.org" ];
diff --git a/secrets.yaml b/secrets.yaml
index f75b028..8573a7b 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -14,70 +14,49 @@ sops:
- recipient: age1g9xlgzxxvgfgq6a05jxy2e7zf8t4qgw6wjpjmvyhvzlnu8fmye6s8qx702
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrMXIvNzNpNVpzNHRCa2RZ
- ejJuN1NqeWVJR0pYZHhlKy9IbVN3VnlReHc0CmxvME9jWHQ0U2FMaEtxSUhmSXBO
- anV0UVlCUGpFU2Z0UHZORWd2V3lkaHcKLS0tIFN1dHVXSWpXU1FwWkVBSHpVR0xX
- RDBCM0laREFMSEQwUnZBSG9WSXJnR1EKTX2Z37TvWke5GbMd/gg7xiJguqpEhQ//
- KnOYXE+G187+MnmrvRHs0S/3ZemCpi+1EXesjRhrDnwDw4zuerp2gw==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHRVJVNW1qaVJvUEQ0UHV0
+ bE1zY0VyeDlpK0VhUWhCTnU2T0JZM01hOEdvCjBtNWRhNFNWa0s4aHRMUVgvNUM3
+ blpZZDdGb3NzeVgzampyRkVCRmdPZXMKLS0tIE8yRzN0TXl1enNVaFBTc3R1VXVI
+ eWZ2ak9zQ3ovclBGVWZVaitHZ0lQV2MKNESZYp4qoEFeMFo0cS7Nkzu3VVRa7WZJ
+ tDge83b812ikeK2YM10XmGZxpO+QbHLO+RxE7mA4YrU00Ar2AHR+Wg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtQjJlYlRmOXFPbW40SE5E
- bGZYRU5jZUtlaktwMlNFNFlFeGxsdGREV2d3CmFOOHJ6OXpCR0tGc2d5NFBPc0E4
- UUxQa0F2d1VkZUE4WlZFNkRTb1R0Rm8KLS0tIGpLZmtVcEtXSUFqR083K0tBdVpW
- WHVtaWNFZmE1WDNCeWJCRG5DazEyd2cKgNf3Bfi9fGlEg3Lm+3DrKfbqQZFQ/tF3
- p/mRaW/e8bs0DNLZ5aXOkqyvDj3ZcSc2HVO3/2IV36xCwKvE4dt0fA==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrdzl3MEd4cTloTXA1ZlFo
+ ODgrS09ZRVR3bStiL0pQeEtRV2hrYWRZemxBCjZjcXhoNlhqMlVLNytOYkErYnND
+ RERNQ0V0THpSMkJiMVZyOFp6SUQyNUEKLS0tIEF0ZVJjMlkzQTgraE1RekFJcGN6
+ MStHSVZWWDhOaVZZS2ptV05LUVQzcW8KLHINhvhr0xIFt4PaRJJLLBpmqgoxaKyw
+ pE6T4DTdUrvq12rDg2lnKg8alUDMY5lvhRDz7uZYnWyxUGELqLRiJg==
-----END AGE ENCRYPTED FILE-----
- recipient: age12htxy05mlkaqx7q6m5wufkqnnvhmhe4nfsr5ljlwkdk0u59f7ujq7537fw
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzcm1iL0RqSzVreGVjM1Jn
- cVBaNzMzNW1QbUQxS1RBekNGcUFwNFhua1FFCm92dlAxOENZQWxJSm5CY3pVVlds
- MDczaWhtMFVYTy8rb0lTaTVvQUVUTE0KLS0tIE5OQXJVbUhrYk1vZnhFanJlMWJp
- WmhsNW5yOUhJUzhWcTZaR1dpNWZPNzQKmqtetzxPXD1yQgYeTx9+2AC1vUcybQAY
- 5wvHj3+3KKsmcbZNU2cjqNwGawBtNR6DGB1CzG3WrxQcw87mEeF4Lw==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvdjJidkZOK2llQ1pyakNO
+ S0FsSU8wNlpqa0NqRXBqeTRMZkdJbkphN0NrCi91UmdhZ1daRTY2SXdaSFNsYTE3
+ WkVnTnAwaWp2SW1yS0FvNzFJNG1CRWsKLS0tIDRNK2xPN2RtRDFMMktRYS9ZOWY5
+ dEMwVWpnZDNvVGxQdElSSG00VURzTUEKAg/WNRSoYB9ArmM9nX6Alz7YPPqUdjkg
+ TRq3bwClQkLm/L8HquNwfFigqeTPvz2aXV9Ujlf5r3zZq4IXhEZRDA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnRzRYYVhzRWdoOVFsUlNS
- WlpvWFQ0blpvT3pQWGxmS3o4VTFaZzZHclg0CkZ5TTYyRlh2SUYvR0lFS0Y5akVP
- RCtVazFrbnJJMTlkQ0JHaUFGaW1FancKLS0tIHNFQjVGdVJ5T05MZ003aVFYYzBx
- M0Q3aHkyQVl1U1pTelZvd3lsZ05aS0kKJPISkMgt80GfT3Hq7SYXO04gNAVdgd5x
- XM4LZi9iQygvDoJc92f0XGartTKvyQ34dRSVz4DbPHGo3r9af1RZOA==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNbnFIREc2U1ZITFZuYTR4
+ cE82TjBxVWpkc1VOQlp4a1pRaWU3NEZmZWw0CnI3cjEvRjJ1bWU0eW4rNXhVeGpJ
+ UXRhMUlxb0tLcUc0NWlDM1BEUzJtdVUKLS0tIGJhNjBWWmtGTUZYT2dxcGNEdHRO
+ VkkwbThtZUFsMFBoRmwxd1VtU1hkNkkKNMQ9jzxjCYqOUn6CRl9o2bjaE1CdwyxS
+ 6e2vZ2CD/cj3u2iQfjohxWeDmDmmiJmxMM1VJbDEnjGjP6L+omFpug==
-----END AGE ENCRYPTED FILE-----
- recipient: age1m4u7n6mt5d3jv39lf4aedr9gqu3khl4sahuqx5n5h7v48gkyc9zqkp9qs8
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIRXlWZFUrT1F6TkRLaUVJ
- ODRUSWNNVHpERlF6K1E4OVhjcm9aemlZem13CnpmdDRJWktmR01VWDloQlZHdHZP
- YmorUXJRUFVjblFqcDZyL2QrcE8vTWcKLS0tIEswK3BsbVpEYmtHeUovUG9QQWNr
- UERYN1p6OTNuaVFyQXZ3ellWK2ZoKzAKFFUxlkWZm+O+X0JkV4Gi2N/vDMNXnmM5
- zgQTFmPjAMe5hKNHXk7smhKdEhRocb8IsQtTWIKlx0zJOfjllvquMw==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1bTVvaEVFQ2tjUVNUaWRH
+ S0VoRWNHTFZ6Rnhyb054cHJTZnV4TGlIYkFvCmhXVU5pd2orRlErV04yTFBlR0Fz
+ SGp4NkxNTG1XeTdzWXBPb1dzNFkwZUkKLS0tIE44bGZHb3RVTVVhaC9VVE1LWFVV
+ YlM4bDBaVGFWVlFVS2t2aGpqS2lLQ1kKGEAW2a7IQaQwxr3AyArhYPNU23skM94s
+ 2fIPMKVgfYEA7lf2ViJ7kfbPxGSGrhOFcyc5U6lgB/hFa1HuGXSCow==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-03-06T22:04:13Z"
mac: ENC[AES256_GCM,data:LuJ93avw8+YwfEMo4jYaWuPR+FJHkJIuBNfXLm39aO/7z5YHzZt7Dg4V08IM1zhVdSBtIl/cw4PYBnp8/rKMpdx5XsmOGJ2l8i1JrQk1XckouQIWXodG4SoLBHxoCQ0vlnythlVptBlNK9yCDqynQs6xtZwO1nmOFSGPagsCDcw=,iv:V9RYOAVqgXA1zHTInFQKwixW0sO0CEGUo63SlCyoxeE=,tag:4BC8hAyVVKkSwpWdtfqJ0A==,type:str]
- pgp:
- - created_at: "2026-03-17T21:13:34Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQIMA/mKtLqB941HAQ/+PRnBkhlEdhI6PsmuPTyiKfkfo/yypmx2+sYsqsaMMRgx
- ko2jaaD96MOE0SBD+TtwyTaq+oJzWhOvogH3GKbT2AxAc7PXIOEOc8XjABE0Fsly
- fGwVynBKQjAzrmA+Y1mqSQEERmvTqwOOMr+tVotzHAd61x6UpavjKqj/c0DgjLqt
- RBftYPbMZ1834v8xz2uMY8/jAcfR292MJfL/YyJsxoVnVp5lQVWXLV2KXo9ToSNG
- ku5cqWonTbZaMWDlgxL4a5chbtqwUaeuRa//zdlv1QXRKPfAsG/jGaZ8Khgw3uBK
- Es6K7jAhvbQ7dSlZLiYXDqyjlu6oeD7s5kOViGZluHJA6WYzE+fu2iBH2U4h7TlW
- vyg53OeoiF/ZVNaFYY6cZ2dhRG+U/01Xpcr6Q64QESrdZiaJWUHGuPKnI48YYHbV
- J9mt6ngfrUJeHEqYiX/S/ugMzm/hgmdy8kjE18b8KEwixu2ed0J1jZ1Hg1546Bto
- ErqXxXSizFDtpS89f8J/vkfubfSJL0PKn1gkX+I5RvFctOVdkfrIkZOnDpLakAIz
- KTM4R2XRMXr0wnYrZZmZFN3i1Qjqi1VWCKGl3D0iZ4kbHk/wycu6JPuw2k5Icc9Z
- euJeBV9bgw619pB7cf+tF6KVJDNkSW25KF+180kxvY1qf6/u7wqhdUsA7aAwmO3S
- XgGZZ74zJc7Pg0A+qiCy1CXRqpi3Eox8j8fAqVWMq136ZDErmmGjc1hM42SvVJyI
- M/RBT7hwQZgSMMtwOTbPVjsMkZVK2Ltli1n9apaPaGJfCdJxz7o8fEn/1oZq4J4=
- =TG0y
- -----END PGP MESSAGE-----
- fp: EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94
unencrypted_suffix: _unencrypted
version: 3.12.1