ayame: Fix installation issues

This commit is contained in:
PapaTutuWawa 2021-07-30 10:29:14 +02:00
parent 487b79d71f
commit 8c16b5d4fc
2 changed files with 15 additions and 16 deletions

View File

@ -36,7 +36,7 @@ in {
boot = { boot = {
loader = { loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = false;
grub = { grub = {
enable = true; enable = true;
efiInstallAsRemovable = true; efiInstallAsRemovable = true;
@ -70,18 +70,18 @@ in {
xserver.videoDrivers = [ "modesetting" "fbdev" ]; xserver.videoDrivers = [ "modesetting" "fbdev" ];
}; };
systemd.services = { #systemd.services = {
rfkill-workaround = { # rfkill-workaround = {
enable = true; # enable = true;
description = "Work around rfkill having the Wifi blocked at boot"; # description = "Work around rfkill having the Wifi blocked at boot";
before = [ "network.target" ]; # before = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
serviceConfig = { # serviceConfig = {
Type = "oneshot"; # Type = "oneshot";
ExecStart = "rfkill unblock all"; # ExecStart = "rfkill unblock all";
}; # };
}; # };
}; #};
fileSystems = { fileSystems = {
"/" = { "/" = {
@ -94,7 +94,6 @@ in {
}; };
}; };
swapDevices = [ swapDevices = [
# TODO: Replace by UUID { device = "/dev/disk/by-uuid/cf3b1e1c-c245-4452-ad49-68ac72369e77"; }
{ device = "/dev/disk/by-label/swap"; }
]; ];
} }

View File

@ -2,7 +2,7 @@ pkgs:
import (builtins.fetchTarball { import (builtins.fetchTarball {
url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; url = "https://github.com/nix-community/NUR/archive/master.tar.gz";
sha256 = "1p0qa9bs8k0jhkdkyvxfcpi2hz2n8d61c63ps7mavk9z3zgnx20j"; sha256 = "0znxac6j1139l777lfjm6y19px5xbdk3jcwcynwbmg5yafn8az0n";
}) { }) {
inherit pkgs; inherit pkgs;
} }