From 269f1db1550e8ca1c972214a315b15b90ed2723b Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 1 May 2023 10:54:40 +0200 Subject: [PATCH 1/2] Solo key broke :( --- home-manager/modules/ssh/default.nix | 4 ++-- users/erwin/home.nix | 2 +- users/erwin/work.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/modules/ssh/default.nix b/home-manager/modules/ssh/default.nix index 5b71b2b..9e2909f 100644 --- a/home-manager/modules/ssh/default.nix +++ b/home-manager/modules/ssh/default.nix @@ -5,8 +5,8 @@ with lib; let cfg = config.eboskma.programs.ssh; var = config.eboskma.var; - personalKey = "~/.ssh/id_ed25519_sk"; - horusKey = "~/.ssh/id_ed25519_sk_horus"; + personalKey = "~/.ssh/id_ed25519"; + horusKey = "~/.ssh/id_ed25519"; in { options.eboskma.programs.ssh = { enable = mkEnableOption "activate ssh"; }; diff --git a/users/erwin/home.nix b/users/erwin/home.nix index 30bc38d..7789a0b 100644 --- a/users/erwin/home.nix +++ b/users/erwin/home.nix @@ -78,7 +78,7 @@ in name = "Erwin Boskma"; email = "erwin@datarift.nl"; # signingKey = "EE7ADEFE1D943C7B"; - signingKey = "~/.ssh/id_ed25519_sk"; + signingKey = "~/.ssh/id_ed25519"; signingKeyFormat = "ssh"; }; gpg.enable = true; diff --git a/users/erwin/work.nix b/users/erwin/work.nix index 7264f18..e89cc16 100644 --- a/users/erwin/work.nix +++ b/users/erwin/work.nix @@ -50,7 +50,7 @@ in enable = true; name = "Erwin Boskma"; email = "erwin@horus.nu"; - signingKey = "~/.ssh/id_ed25519_sk"; + signingKey = "~/.ssh/id_ed25519"; signingKeyFormat = "ssh"; }; gpg.enable = true; From f30b856d7ee196c3b2eaff30b7abf42186935a59 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 4 May 2023 09:22:02 +0200 Subject: [PATCH 2/2] Update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'disko': 'github:nix-community/disko/77a54e53cc353045b026aa814798cafaee9779ac' (2023-04-28) → 'github:nix-community/disko/ecd71c0c3be3692539ce435d8a4317937fe3ea14' (2023-05-04) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/b04a264d5f566ce27e1d62eeae3eabaaa8e942ef' (2023-04-29) → 'github:nix-community/emacs-overlay/42a2a718bdcbe389e7ef284666d4aba09339a416' (2023-05-04) • Updated input 'home-manager': 'github:nix-community/home-manager/c4f3a3707104999d5b6fe4c4e5c3833980a92513' (2023-04-28) → 'github:nix-community/home-manager/514c0a71f47cb80282742d7e4b6913c2c0582c2d' (2023-05-03) • Updated input 'microvm': 'github:astro/microvm.nix/b2627f159e8b54e4f6af7edc88b64fa3736819c9' (2023-04-21) → 'github:astro/microvm.nix/dc58e7a2250ddabb6e3c3d94283122b97c496d27' (2023-05-03) • Updated input 'nil': 'github:oxalica/nil/4dcb73894281644d4d29ffa337eff88d1d7ffd1a' (2023-04-29) → 'github:oxalica/nil/e74b767a43d86a1997cf4df3c5d15ff3e769d6f2' (2023-05-01) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3006d2860a6ed5e01b0c3e7ffb730e9b293116e2' (2023-04-07) → 'github:NixOS/nixos-hardware/7dc46304675f4ff2d6be921ef60883efd31363c4' (2023-05-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37' (2023-04-28) → 'github:nixos/nixpkgs/1a411f23ba299db155a5b45d5e145b85a7aafc42' (2023-05-02) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/0bb45c519ebd64f6b4223e1bb6b4e08df80834ca' (2023-04-29) → 'github:oxalica/rust-overlay/2265f87e8f23890258a11593e15df755804fc9d6' (2023-05-04) • Updated input 'sops': 'github:Mic92/sops-nix/4a330ead6a990365c9bb48f30523ac048fb6d8ae' (2023-04-26) → 'github:Mic92/sops-nix/4f308f76633f81253a12b80e7b05b80d325005b2' (2023-04-30) • Updated input 'sops/nixpkgs-stable': 'github:NixOS/nixpkgs/ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c' (2023-04-22) → 'github:NixOS/nixpkgs/db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36' (2023-04-30) --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 2e98c43..077b45d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1682674689, - "narHash": "sha256-+JJ92RA7PjHyMYfHs0OfNb0bEA6oKw24Fs9vYou81o0=", + "lastModified": 1683184628, + "narHash": "sha256-neWVhOZzTjXyMLFDjAyHhYhz4tO9XpuKA9WDm0hrQE4=", "owner": "nix-community", "repo": "disko", - "rev": "77a54e53cc353045b026aa814798cafaee9779ac", + "rev": "ecd71c0c3be3692539ce435d8a4317937fe3ea14", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1682737663, - "narHash": "sha256-gXEP1Sy9LrQdD2y7sqQUumJvqiRWX3CJpEEJ9JOBUro=", + "lastModified": 1683170309, + "narHash": "sha256-+APLd91AIU491eFp4qf66jnRacFfSqhwW438LNJUlls=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b04a264d5f566ce27e1d62eeae3eabaaa8e942ef", + "rev": "42a2a718bdcbe389e7ef284666d4aba09339a416", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1682712853, - "narHash": "sha256-XWgurvKeJsCLOVZZyR2HlPt56mIjbSgoh/Mi6s5RQS4=", + "lastModified": 1683153724, + "narHash": "sha256-wiQ8pBYbbPklLngAz5w3VvwmpLqTNroKc7um56iCLHo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c4f3a3707104999d5b6fe4c4e5c3833980a92513", + "rev": "514c0a71f47cb80282742d7e4b6913c2c0582c2d", "type": "github" }, "original": { @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1682097095, - "narHash": "sha256-ecIKDVpayjIDEdxWCSHmG4yJQ21/nKZkhFNlLzwttWU=", + "lastModified": 1683150901, + "narHash": "sha256-wQuvrVytBm1AEhNh8fPrj/1Zjk34GYPWd6vGUmLu9YE=", "owner": "astro", "repo": "microvm.nix", - "rev": "b2627f159e8b54e4f6af7edc88b64fa3736819c9", + "rev": "dc58e7a2250ddabb6e3c3d94283122b97c496d27", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1682748903, - "narHash": "sha256-G7YoOWf/dGfxqJUdwtG0HtHyT4kbZNqrLe5eFOT2u6k=", + "lastModified": 1682962768, + "narHash": "sha256-T6iBqa9+KsVbcjNivRWXi2kXP90S+NJLp2qVah7I1w8=", "owner": "oxalica", "repo": "nil", - "rev": "4dcb73894281644d4d29ffa337eff88d1d7ffd1a", + "rev": "e74b767a43d86a1997cf4df3c5d15ff3e769d6f2", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1680876084, - "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", + "lastModified": 1683009613, + "narHash": "sha256-jJh8JaoHOLlk7iFLgZk1PlxCCNA2KTKfOLMLCa9mduA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", + "rev": "7dc46304675f4ff2d6be921ef60883efd31363c4", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682692304, - "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=", + "lastModified": 1683014792, + "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37", + "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1682173319, - "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", + "lastModified": 1682817260, + "narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", + "rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1682734733, - "narHash": "sha256-oAoNMgWQveSF1Vv16OJ2GVU+BGGdzazTHpPu/VKy/BQ=", + "lastModified": 1683166725, + "narHash": "sha256-AiWkKkt9jSyMRAl+hYo3Mau9uNRsFnCQDD+vtH5hbS8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0bb45c519ebd64f6b4223e1bb6b4e08df80834ca", + "rev": "2265f87e8f23890258a11593e15df755804fc9d6", "type": "github" }, "original": { @@ -424,11 +424,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1682539132, - "narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=", + "lastModified": 1682823324, + "narHash": "sha256-KNu3OAqVyoKwnDP+gqptjQYCnZXxEwXccR89c0r1/8k=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae", + "rev": "4f308f76633f81253a12b80e7b05b80d325005b2", "type": "github" }, "original": {