diff --git a/flake.nix b/flake.nix index 10e873f..673467b 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; + oceanix.url = "github:LEXUGE/oceanix"; copetch.url = "github:elwrcl/copetch"; home-manager = { url = "github:nix-community/home-manager"; @@ -51,11 +52,13 @@ system = system; specialArgs = { inherit inputs system; + oceanix = inputs.oceanix; zen-browser = inputs.zen-browser; nix-cachyos-kernel = nix-cachyos-kernel; }; modules = [ + inputs.oceanix.nixosModules.default chaotic.nixosModules.default home-manager.nixosModules.home-manager { diff --git a/nixos/boot/default.nix b/nixos/boot/default.nix index 65ecf31..9c495d0 100644 --- a/nixos/boot/default.nix +++ b/nixos/boot/default.nix @@ -1,7 +1,9 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: { - boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2; + imports = [ inputs.oceanix.nixosModules.default ]; # + + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2; # boot.kernelParams = [ "preempt=full" @@ -10,19 +12,49 @@ "mitigations=off" "usbcore.autosuspend=-1" "transparent_hugepage=always" - ]; + ]; # boot.loader = { timeout = 5; efi = { canTouchEfiVariables = true; efiSysMountPoint = "/boot"; - }; + }; # systemd-boot = { enable = true; configurationLimit = 15; consoleMode = "max"; editor = false; + }; # + }; + oceanix = { + enable = true; + + entries = { + "NixOS (systemd-boot)" = { + path = "/EFI/systemd/systemd-bootx64.efi"; + }; + "NixOS (Limine)" = { + path = "/EFI/limine/BOOTX64.EFI"; + }; + }; + uefi = { + output = { + provideConsoleGop = true; + directGopRendering = true; + resolution = "1366x768"; + ignoreTextInGraphics = true; + }; + + quirks = { + releaseUsbOwnership = true; + requestBootVarRouting = true; + }; + }; + + misc.boot = { + showPicker = true; + timeout = 5; }; }; }