geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Fix/reorganize profile variants

Browse source
This commit is contained in:
Geoffrey Frogeye 2023-11-30 19:01:55 +01:00
parent 224f769324
commit bc4676dec0
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
curacao/hardware.nix
View file

@ -1,8 +1,15 @@
{ lib, ... }: { lib, ... }:
{ {
imports = [ imports = [
"${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/dell/g3/3779" <nixos-hardware/dell/g3/3779>
]; ];
boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; # UEFI works here, and variables can be touched
boot.loader = {
efi.canTouchEfiVariables = lib.mkDefault true;
grub = {
enable = true;
efiSupport = true;
};
};
} }

22
curacao_usb/os.nix
View file

@ -1,30 +1,22 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
# This whole folder is DEBUG
imports = [ imports = [
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22.tar.gz"}/module.nix" ../os
../curacao/options.nix
../curacao/hardware.nix
./disko.nix ./disko.nix
]; ];
nixpkgs.config.allowUnfree = true;
networking.hostName = "curacao_usb"; networking.hostName = "curacao_usb";
boot = { # It's a removable drive, so no touching EFI vars
# nixos-hardware use latest kernel by default. It has been set a while ago, we maybe don't need it anymore? # (quite a lot of stuff to set for that!)
kernelPackages = pkgs.linuxPackages; boot.loader = {
# Pinebook supports UEFI, at least when tow-boot is installed on the SPI
loader = {
# EFI Variables don't work (no generation appears in systemd-boot)
efi.canTouchEfiVariables = false; efi.canTouchEfiVariables = false;
# systemd-boot crashes after booting, so GRUB it is
grub = { grub = {
enable = true;
efiSupport = true;
efiInstallAsRemovable = true; efiInstallAsRemovable = true;
device = "nodev"; device = "nodev";
}; };
}; };
};
} }

4
pindakaas/hardware.nix
View file

@ -1,8 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
# First commit before 23.05 release date: <nixos-hardware/pine64/pinebook-pro>
"${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/pine64/pinebook-pro"
]; ];
boot = { boot = {
@ -10,6 +9,7 @@
kernelPackages = pkgs.linuxPackages; kernelPackages = pkgs.linuxPackages;
# Otherwise it will not show stage1 echo and prompt # Otherwise it will not show stage1 echo and prompt
# UPST
kernelParams = ["console=tty0"]; kernelParams = ["console=tty0"];
# Pinebook supports UEFI, at least when tow-boot is installed on the SPI # Pinebook supports UEFI, at least when tow-boot is installed on the SPI