From 36a61df8be36a4e03d84d93d183096b94603a852 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Wed, 12 Oct 2022 09:54:19 +0200 Subject: [PATCH] Updated keys --- flake.lock | 48 ++++++++++++++++++------------------ lib/default.nix | 1 - machines/lisa/hardware.nix | 16 ++++++------ machines/newton/hardware.nix | 12 ++++----- users/status.nix | 2 +- 5 files changed, 39 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index fb3c3cd..b7e4ec9 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1664252078, - "narHash": "sha256-VI3nLGVn/OEMRTqf7cNYP+FSkXMGf6BmqB8h1KgWawQ=", + "lastModified": 1664505005, + "narHash": "sha256-WC/zzeFTYCAIWHCHKree7Qi88y2tQg6UphQvNB8ZWtY=", "owner": "JulienMalka", "repo": "Linkal", - "rev": "35784370e386f6a10796beace212877134f351b5", + "rev": "a8b36f2689f4a8c29b2317e7f47f2e3932990d07", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1664176858, - "narHash": "sha256-SIF3XyX22GQ2u4AAq5qsVeLZ/2fHSlBX+8hd5IGQ3+Y=", + "lastModified": 1665248803, + "narHash": "sha256-pYbr0Wz7DmdWgu9qv6JJ/SViXj0rT0LMoQ9tDw/VUH4=", "owner": "neovim", "repo": "neovim", - "rev": "6596f7e136b7ceba2a94c708e2a179ec60b6d048", + "rev": "edc8a1f04631b021f9c5e79f7162e34f7c3299db", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1664180387, - "narHash": "sha256-5fT/Nnv4QWVASqjMBKuHZKSFV+YHVH5jbTRakvQivuw=", + "lastModified": 1665303549, + "narHash": "sha256-T/xd5ts1KbnsT4spT/HlX4dAVe2sW8g67cxHiVN18UQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b7c02b63405cfc346b1faecc0602aeb7aaf79ee7", + "rev": "cdc0f8dd7950513026c83348e41436d20aaeee41", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs-22_05_2": { "locked": { - "lastModified": 1664201777, - "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=", + "lastModified": 1665279158, + "narHash": "sha256-TpbWNzoJ5RaZ302dzvjY2o//WxtOJuYT3CnDj5N69Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14", + "rev": "b3783bcfb8ec54e0de26feccfc6cc36b8e202ed5", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1664107978, - "narHash": "sha256-31I9XnIjXkUa62BM1Zr/ylKMf9eVO5PtoX2mGpmB7/U=", + "lastModified": 1665132027, + "narHash": "sha256-zoHPqSQSENt96zTk6Mt1AP+dMNqQDshXKQ4I6MfjP80=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72783a2d0dbbf030bff1537873dd5b85b3fb332f", + "rev": "9ecc270f02b09b2f6a76b98488554dd842797357", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nur": { "locked": { - "lastModified": 1664251460, - "narHash": "sha256-oLlMQAkyfVsk3bZ54PlUQTUlx/rXCYL/GUn6WyogoN0=", + "lastModified": 1665340251, + "narHash": "sha256-rrSpCQcK9dl7+dYSAImY+AGh62Hr+K6mEZhoBKdfOP4=", "owner": "nix-community", "repo": "NUR", - "rev": "7e29a69db6154fa793ed9331f6b08c55ed8841c6", + "rev": "a2f9ca03146cd9b332ef835f51696fad01b37bdb", "type": "github" }, "original": { @@ -285,11 +285,11 @@ "nixpkgs-22_05": "nixpkgs-22_05_2" }, "locked": { - "lastModified": 1664204020, - "narHash": "sha256-LAey3hr8b9EAt3n304Wt9Vm4uQFd8pSRtLX8leuYFDs=", + "lastModified": 1665289655, + "narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "912f9ff41fd9353dec1f783170793699789fe9aa", + "rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "unstable": { "locked": { - "lastModified": 1664106353, - "narHash": "sha256-HMJP80+DSxFySpWyuxz5+iNozS3+dVt0b4n6YMIU5/8=", + "lastModified": 1665259268, + "narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79d3ca08920364759c63fd3eb562e99c0c17044a", + "rev": "c5924154f000e6306030300592f4282949b2db6c", "type": "github" }, "original": { diff --git a/lib/default.nix b/lib/default.nix index 488f16e..d27435b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -40,7 +40,6 @@ in nodePackages = prev.unstable.nodePackages; linkal = inputs.linkal.defaultPackage."${system}"; }) - inputs.neovim-nightly-overlay.overlay ]; } ]; diff --git a/machines/lisa/hardware.nix b/machines/lisa/hardware.nix index 72994e1..d6ace68 100644 --- a/machines/lisa/hardware.nix +++ b/machines/lisa/hardware.nix @@ -8,7 +8,7 @@ boot.extraModulePackages = [ ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - fileSystems."/" = + fileSystems."/" = { device = "zroot/root"; fsType = "zfs"; @@ -19,20 +19,20 @@ device = "/dev/disk/by-uuid/4E38-3626"; fsType = "vfat"; }; -swapDevices = []; + swapDevices = [ ]; -boot.initrd.network = { + boot.initrd.network = { enable = true; ssh = { enable = true; port = 2222; hostKeys = [ /boot/initrd-ssh-key ]; - authorizedKeys = lib.splitString "\n" - (builtins.readFile (pkgs.fetchurl { - url = "https://github.com/JulienMalka.keys"; - sha256 = "sha256-ZTQpJO5/z/RIzvNpLBHv2GyCn8cvWsN5Hx3pd6s7RYY="; - })); + authorizedKeys = lib.splitString "\n" + (builtins.readFile (pkgs.fetchurl { + url = "https://github.com/JulienMalka.keys"; + sha256 = "sha256-1cbFnmpSt74KKcAthJswmBEFVR6cn9oVClK/Pu33OKQ="; + })); }; postCommands = '' diff --git a/machines/newton/hardware.nix b/machines/newton/hardware.nix index 61c0578..9d651ee 100644 --- a/machines/newton/hardware.nix +++ b/machines/newton/hardware.nix @@ -12,17 +12,17 @@ { path = "/boot-1"; devices = [ "/dev/disk/by-id/ata-WDC_WD20EFRX-68EUZN0_WD-WCC4M1TVUVJV" ]; } { path = "/boot-2"; devices = [ "/dev/disk/by-id/ata-WDC_WD20EFRX-68EUZN0_WD-WCC4M7UDRLSK" ]; } ]; - boot.initrd.network = { + boot.initrd.network = { enable = true; ssh = { enable = true; port = 2222; hostKeys = [ /boot-1/initrd-ssh-key /boot-2/initrd-ssh-key ]; - authorizedKeys = lib.splitString "\n" - (builtins.readFile (pkgs.fetchurl { - url = "https://github.com/JulienMalka.keys"; - sha256 = "sha256-ZTQpJO5/z/RIzvNpLBHv2GyCn8cvWsN5Hx3pd6s7RYY="; - })); + authorizedKeys = lib.splitString "\n" + (builtins.readFile (pkgs.fetchurl { + url = "https://github.com/JulienMalka.keys"; + sha256 = "sha256-1cbFnmpSt74KKcAthJswmBEFVR6cn9oVClK/Pu33OKQ="; + })); }; postCommands = '' diff --git a/users/status.nix b/users/status.nix index 21b2317..4ef6665 100644 --- a/users/status.nix +++ b/users/status.nix @@ -8,7 +8,7 @@ openssh.authorizedKeys.keyFiles = [ (pkgs.fetchurl { url = "https://github.com/JulienMalka.keys"; - sha256 = "sha256-ZTQpJO5/z/RIzvNpLBHv2GyCn8cvWsN5Hx3pd6s7RYY="; + sha256 = "sha256-1cbFnmpSt74KKcAthJswmBEFVR6cn9oVClK/Pu33OKQ="; }) ]; };