From a36e20fe5ec818f2aaac892b0cd17cd332c77c57 Mon Sep 17 00:00:00 2001 From: oomfie Date: Sun, 15 Dec 2024 19:44:43 +0300 Subject: [PATCH] test --- Hosts/rose/hardware-configuration.nix | 12 ++++++------ Modules/NixOS/Core/Bootloader/grub.nix | 15 +++++++++++++++ flake.nix | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 Modules/NixOS/Core/Bootloader/grub.nix diff --git a/Hosts/rose/hardware-configuration.nix b/Hosts/rose/hardware-configuration.nix index 0a7f9d2..100157e 100644 --- a/Hosts/rose/hardware-configuration.nix +++ b/Hosts/rose/hardware-configuration.nix @@ -14,20 +14,21 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/406eb55d-7eea-42ba-8af1-878617c40b6c"; + { device = "/dev/disk/by-uuid/a131d4b9-a6b6-4ba1-bfbe-3af7372bebf5"; fsType = "btrfs"; - options = [ "subvol=@" "compress=zstd" ]; }; - boot.initrd.luks.devices."luks-2fdce7f8-f538-4671-90e8-476ae26ea069".device = "/dev/disk/by-uuid/2fdce7f8-f538-4671-90e8-476ae26ea069"; + boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/add1d6d9-37af-4fd1-8f7b-30b617fc2310"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/EE1F-3752"; + { device = "/dev/disk/by-uuid/3595-2885"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/c9d28d0a-5682-4f6d-b0d9-0c252c9cd958"; } + ]; # 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 @@ -35,7 +36,6 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s20f0u5.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/Modules/NixOS/Core/Bootloader/grub.nix b/Modules/NixOS/Core/Bootloader/grub.nix new file mode 100644 index 0000000..e96bcae --- /dev/null +++ b/Modules/NixOS/Core/Bootloader/grub.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, inputs, ... }: +{ + +boot.loader = { + efi = { + canTouchEfiVariables = true; + #efiSysMountPoint = "/boot/efi"; # ← use the same mount point here. + }; + grub = { + efiSupport = true; + #efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work for your system + device = "nodev"; + }; + }; +} diff --git a/flake.nix b/flake.nix index 17f03e9..fb1001c 100755 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ outputs = { self, nixpkgs, nixpkgs-stable, home-manager, arkenfox, lobster, styl systemSettings = { timezone = "Asia/Riyadh"; # Select Timezone locale = "en_US.UTF-8"; # Select Locale - kernel = pkgs.linuxPackages_latest; # Kernel + kernel = pkgs.linuxPackages_xanmod_latest; # Kernel Nvidia-driver = "beta"; swap = "zram"; # downloadmoreram.com (Legal disclaimer if this domain exists then thats based) audio = "pipewire"; # Audio system