diff --git a/hosts/frues-pc/default.nix b/hosts/frues-pc/default.nix
index de21b49..313a5c7 100644
--- a/hosts/frues-pc/default.nix
+++ b/hosts/frues-pc/default.nix
@@ -10,8 +10,6 @@
 
   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 3f6a8a1..03783c4 100644
--- a/hosts/frues-port/default.nix
+++ b/hosts/frues-port/default.nix
@@ -47,9 +47,6 @@
 
   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/hosts/frues-port/hardware-configuration.nix b/hosts/frues-port/hardware-configuration.nix
index 62bd126..0a850c1 100644
--- a/hosts/frues-port/hardware-configuration.nix
+++ b/hosts/frues-port/hardware-configuration.nix
@@ -1,43 +1,44 @@
 # 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, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/5ea79d40-3025-41c3-9a74-0728706f33f7";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/761317bf-c727-4d12-b663-bc8eaa0227cc";
+    fsType = "ext4";
+  };
 
-  boot.initrd.luks.devices."luks-e7268192-e977-40fe-92d9-c1e2fb65fdc0".device = "/dev/disk/by-uuid/e7268192-e977-40fe-92d9-c1e2fb65fdc0";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A00C-17CE";
+    fsType = "vfat";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6F08-F913";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/5f19b076-bad1-4201-b13b-f4aa20b48c3a"; }
-    ];
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/f9c078c5-d71f-4373-8e11-c6240617e9c2";}
+  ];
 
   # 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.enp1s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo1.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;
 }
diff --git a/modules/core/bootloader.nix b/modules/core/bootloader.nix
index 9619060..8a1bfd6 100644
--- a/modules/core/bootloader.nix
+++ b/modules/core/bootloader.nix
@@ -1,15 +1,14 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   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;
 }