From e306d6a8e62b59d6b45d209fa6ba0693c82a90e6 Mon Sep 17 00:00:00 2001
From: Pedro Rey Anca <contact@peprolinbot.com>
Date: Tue, 9 Jul 2024 00:16:25 +0200
Subject: [PATCH 1/2] Add frues-port hardware-configuration

---
 hosts/frues-port/hardware-configuration.nix | 51 ++++++++++-----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/hosts/frues-port/hardware-configuration.nix b/hosts/frues-port/hardware-configuration.nix
index 0a850c1..62bd126 100644
--- a/hosts/frues-port/hardware-configuration.nix
+++ b/hosts/frues-port/hardware-configuration.nix
@@ -1,44 +1,43 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/761317bf-c727-4d12-b663-bc8eaa0227cc";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/5ea79d40-3025-41c3-9a74-0728706f33f7";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A00C-17CE";
-    fsType = "vfat";
-  };
+  boot.initrd.luks.devices."luks-e7268192-e977-40fe-92d9-c1e2fb65fdc0".device = "/dev/disk/by-uuid/e7268192-e977-40fe-92d9-c1e2fb65fdc0";
 
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/f9c078c5-d71f-4373-8e11-c6240617e9c2";}
-  ];
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/6F08-F913";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/5f19b076-bad1-4201-b13b-f4aa20b48c3a"; }
+    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

From 73a9b4d16c1a6b40ebd5790731d1b5ce42d41859 Mon Sep 17 00:00:00 2001
From: Pedro Rey Anca <contact@peprolinbot.com>
Date: Tue, 9 Jul 2024 00:24:39 +0200
Subject: [PATCH 2/2] Fix bootloader configurations

---
 hosts/frues-pc/default.nix   |  2 ++
 hosts/frues-port/default.nix |  3 +++
 modules/core/bootloader.nix  | 11 ++++++-----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/hosts/frues-pc/default.nix b/hosts/frues-pc/default.nix
index 313a5c7..de21b49 100644
--- a/hosts/frues-pc/default.nix
+++ b/hosts/frues-pc/default.nix
@@ -10,6 +10,8 @@
 
   hardware.ckb-next.enable = true;
 
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
   boot.initrd.kernelModules = ["amdgpu"];
   services.xserver.videoDrivers = ["amdgpu"];
   hardware.graphics.extraPackages = with pkgs; [
diff --git a/hosts/frues-port/default.nix b/hosts/frues-port/default.nix
index 03783c4..3f6a8a1 100644
--- a/hosts/frues-port/default.nix
+++ b/hosts/frues-port/default.nix
@@ -47,6 +47,9 @@
 
   powerManagement.cpuFreqGovernor = "performance";
 
+  boot.loader.efi.canTouchEfiVariables = false; # For the next option
+  boot.loader.grub.efiInstallAsRemovable = true;
+
   boot = {
     kernelModules = ["acpi_call"];
     extraModulePackages = with config.boot.kernelPackages;
diff --git a/modules/core/bootloader.nix b/modules/core/bootloader.nix
index 8a1bfd6..9619060 100644
--- a/modules/core/bootloader.nix
+++ b/modules/core/bootloader.nix
@@ -1,14 +1,15 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi";
-    };
     grub = {
       efiSupport = true;
       device = "nodev";
       useOSProber = true;
     };
+    efi.canTouchEfiVariables = lib.mkDefault true;
   };
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }