From a31020a9eac25099b615cf1c8d084d8a2a3b580a Mon Sep 17 00:00:00 2001 From: Xinyang Li Date: Sun, 30 Jul 2023 01:15:35 +0800 Subject: [PATCH] massicot: fix bugs --- machines/massicot/default.nix | 8 ++++++++ machines/massicot/hardware-configuration.nix | 2 +- machines/massicot/networking.nix | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/machines/massicot/default.nix b/machines/massicot/default.nix index ebe8e33..78b06f0 100644 --- a/machines/massicot/default.nix +++ b/machines/massicot/default.nix @@ -6,6 +6,13 @@ ./networking.nix ]; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + boot.loader.grub = { + enable = true; + efiSupport = true; + } + environment.systemPackages = with pkgs; [ git ]; @@ -32,6 +39,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPBcSvUQnmMFtpftFKIsDqeyUyZHzRg5ewgn3VEcLnss" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIInPn+7cMbH7zCEPJArU/Ot6oq8NHo8a2rYaCfTp7zgd" ]; + hashedPassword = "$y$j9T$JOJn97hZndiDamUmmT.iq.$ue7gNZz/b14ur8GhyutOCvFjsv.3rcsHmk7m.WRk6u7"; }; } \ No newline at end of file diff --git a/machines/massicot/hardware-configuration.nix b/machines/massicot/hardware-configuration.nix index 2cb3a29..5d6574a 100644 --- a/machines/massicot/hardware-configuration.nix +++ b/machines/massicot/hardware-configuration.nix @@ -18,7 +18,7 @@ fsType = "ext4"; }; - fileSystems."/boot" = + fileSystems."/boot/efi" = { device = "/dev/disk/by-uuid/06F4-7777"; fsType = "vfat"; }; diff --git a/machines/massicot/networking.nix b/machines/massicot/networking.nix index b93990a..ec0bd4d 100644 --- a/machines/massicot/networking.nix +++ b/machines/massicot/networking.nix @@ -9,5 +9,5 @@ networking = { address = "fe80::1"; interface = "eth0"; }; - nameservers = [ "2a00:1098:2b::1" "2a00:1098:2c::1" "2a01:4f9:c010:3f02::1"] + nameservers = [ "2a00:1098:2b::1" "2a00:1098:2c::1" "2a01:4f9:c010:3f02::1"]; }; \ No newline at end of file