From 5b6f322984940cd268744b8d4d10c05263a36a53 Mon Sep 17 00:00:00 2001 From: Christopher James Hayward Date: Tue, 15 Jun 2021 10:45:54 -0400 Subject: [PATCH] Fix bad boot loader --- README.org | 18 ++++++++++-------- hosts/acernitro/configuration.nix | 16 +++++++++------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/README.org b/README.org index 6d0ddb7..ecde71a 100644 --- a/README.org +++ b/README.org @@ -285,9 +285,9 @@ Deploy this configuration with ~nixos-rebuild switch --flake /etc/dotfiles/#acer This configuration is nearly identical to the default, except for a few key differences: ++ Enables sound + Applies the desired hostname + It adds support for =UEFI= systems -+ Uses an OS Prober to detect dual-boot + Enables support for wireless networking #+BEGIN_SRC nix :noweb yes :tangle hosts/acernitro/configuration.nix @@ -295,20 +295,22 @@ This configuration is nearly identical to the default, except for a few key diff { config, pkgs, inputs, ... }: { - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.efiSupport = true; - boot.loader.grub.useOsProber = true; - boot.loader.grub.device = "/dev/sda"; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; time.timeZone = "America/Toronto"; networking.hostName = "acernitro"; - networking.useDHCP = false; networking.firewall.enable = false; - networking.interfaces.ens3.useDHCP = true; networking.wireless.enable = true; networking.wireless.userControlled.enable = true; + networking.useDHCP = false; + networking.interfaces.enp6s0f1.useDHCP = true; + networking.interfaces.wlp0s20f3.useDHCP = true; + + sound.enable = true; + services.openssh.enable = true; + services.printing.enable = true; programs.mtr.enable = true; programs.fish.enable = true; diff --git a/hosts/acernitro/configuration.nix b/hosts/acernitro/configuration.nix index a7929e5..be7a651 100644 --- a/hosts/acernitro/configuration.nix +++ b/hosts/acernitro/configuration.nix @@ -2,20 +2,22 @@ { config, pkgs, inputs, ... }: { - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.efiSupport = true; - boot.loader.grub.useOsProber = true; - boot.loader.grub.device = "/dev/sda"; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; time.timeZone = "America/Toronto"; networking.hostName = "acernitro"; - networking.useDHCP = false; networking.firewall.enable = false; - networking.interfaces.ens3.useDHCP = true; networking.wireless.enable = true; networking.wireless.userControlled.enable = true; + networking.useDHCP = false; + networking.interfaces.enp6s0f1.useDHCP = true; + networking.interfaces.wlp0s20f3.useDHCP = true; + + sound.enable = true; + services.openssh.enable = true; + services.printing.enable = true; programs.mtr.enable = true; programs.fish.enable = true;