From 5848a669cac1b00f20d9231f26179b0ef6e1aaf6 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Tue, 14 Apr 2026 00:15:18 +0300 Subject: [PATCH] update --- flake.lock | 53 +++++++++++++++++++++++++++++++++++++++++- flake.nix | 1 - nixos/boot/default.nix | 40 ++++--------------------------- 3 files changed, 56 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index dd600f1..2ff9437 100644 --- a/flake.lock +++ b/flake.lock @@ -415,6 +415,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1666539104, + "narHash": "sha256-jeuC+d375wHHxMOFLgu7etseCQVJuPNKoEc9X9CsErg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e6df35f39651504249a05191f9a78d251707e22", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -486,6 +502,25 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" } }, + "oceanix": { + "inputs": { + "nixpkgs": "nixpkgs_5", + "utils": "utils" + }, + "locked": { + "lastModified": 1668158355, + "narHash": "sha256-1Z9Ijdnbs/GgmZgX1jDFbtszgAJ42/TGy8dH6IgkEpM=", + "owner": "LEXUGE", + "repo": "oceanix", + "rev": "6c75636d0361f777307cc94569e6491d5ed32d77", + "type": "github" + }, + "original": { + "owner": "LEXUGE", + "repo": "oceanix", + "type": "github" + } + }, "root": { "inputs": { "apple-fonts": "apple-fonts", @@ -496,6 +531,7 @@ "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_4", "noctalia": "noctalia", + "oceanix": "oceanix", "zen-browser": "zen-browser" } }, @@ -656,10 +692,25 @@ "type": "github" } }, + "utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1776091817, diff --git a/flake.nix b/flake.nix index 673467b..1906bf4 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,6 @@ }; 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 9c495d0..65ecf31 100644 --- a/nixos/boot/default.nix +++ b/nixos/boot/default.nix @@ -1,9 +1,7 @@ -{ config, pkgs, inputs, ... }: +{ config, pkgs, ... }: { - imports = [ inputs.oceanix.nixosModules.default ]; # - - boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2; # + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2; boot.kernelParams = [ "preempt=full" @@ -12,49 +10,19 @@ "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; }; }; }